From 30de17325501a6370950c744fd4be1fbbe6306c2 Mon Sep 17 00:00:00 2001
From: Vassiliy Kudryashov <Vassiliy.Kudryashov@jetbrains.com>
Date: Wed, 27 Feb 2013 15:28:46 +0400
Subject: [PATCH] IDEA-101547 Please add a clock in fullscreen mode!
 After-review: move initialization if ClockPanel from IdeRootpane to
 IdeFrameImpl

---
 .../src/com/intellij/openapi/wm/impl/IdeFrameImpl.java   | 9 +++++----
 .../src/com/intellij/openapi/wm/impl/IdeRootPane.java    | 2 --
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
index 034732dc5a3f..4cf38f90b3cd 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
@@ -49,10 +49,7 @@ import com.intellij.openapi.wm.WindowManager;
 import com.intellij.openapi.wm.ex.LayoutFocusTraversalPolicyExt;
 import com.intellij.openapi.wm.ex.StatusBarEx;
 import com.intellij.openapi.wm.ex.WindowManagerEx;
-import com.intellij.openapi.wm.impl.status.EncodingPanel;
-import com.intellij.openapi.wm.impl.status.InsertOverwritePanel;
-import com.intellij.openapi.wm.impl.status.PositionPanel;
-import com.intellij.openapi.wm.impl.status.ToggleReadOnlyAttributePanel;
+import com.intellij.openapi.wm.impl.status.*;
 import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeFrame;
 import com.intellij.ui.*;
 import com.intellij.ui.mac.MacMainFrameDecorator;
@@ -374,6 +371,9 @@ public class IdeFrameImpl extends JFrame implements IdeFrame, DataProvider {
       statusBar.addWidget(readOnlyAttributePanel, "after Encoding");
     }
 
+    final ClockPanel clockPanel = new ClockPanel();
+    statusBar.addWidget(clockPanel, "after " + MemoryUsagePanel.WIDGET_ID);
+
     final InsertOverwritePanel finalInsertOverwritePanel = insertOverwritePanel;
     Disposer.register(project, new Disposable() {
       public void dispose() {
@@ -381,6 +381,7 @@ public class IdeFrameImpl extends JFrame implements IdeFrame, DataProvider {
         statusBar.removeWidget(positionPanel.ID());
         statusBar.removeWidget(notificationArea.ID());
         statusBar.removeWidget(readOnlyAttributePanel.ID());
+        statusBar.removeWidget(clockPanel.ID());
         if (finalInsertOverwritePanel != null) statusBar.removeWidget(finalInsertOverwritePanel.ID());
 
         ((StatusBarEx)statusBar).removeCustomIndicationComponents();
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java
index bcde70075ada..45b4782c11dc 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java
@@ -35,7 +35,6 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.wm.*;
-import com.intellij.openapi.wm.impl.status.ClockPanel;
 import com.intellij.openapi.wm.impl.status.IdeStatusBarImpl;
 import com.intellij.openapi.wm.impl.status.MemoryUsagePanel;
 import com.intellij.ui.JBColor;
@@ -257,7 +256,6 @@ public class IdeRootPane extends JRootPane implements UISettingsListener {
     }
 
     myStatusBar.addWidget(myMemoryWidget);
-    myStatusBar.addWidget(new ClockPanel(), "after " + MemoryUsagePanel.WIDGET_ID);
     myStatusBar.addWidget(new IdeMessagePanel(MessagePool.getInstance()), "before " + MemoryUsagePanel.WIDGET_ID);
 
     setMemoryIndicatorVisible(myUISettings.SHOW_MEMORY_INDICATOR);