Update UI to cope with new status bar changes

Change-Id: I689e156f166b4f3a40a6da02dd5bf178e8ee89c1
Reviewed-on: http://gerrit.dmdirc.com/1480
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

@@ -82,7 +82,8 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
     @Override
     public void onLoad() {
         ((SwingController) PluginManager.getPluginManager()
-                .getPluginInfoByName("ui_swing").getPlugin()).getStatusBar().addComponent(panel);
+                .getPluginInfoByName("ui_swing").getPlugin())
+                .getSwingStatusBar().addComponent(panel);
         IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
 
         readConfig();
@@ -142,7 +143,8 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
     @Override
     public void onUnload() {
         ((SwingController) PluginManager.getPluginManager()
-                .getPluginInfoByName("ui_swing").getPlugin()).getStatusBar().removeComponent(panel);
+                .getPluginInfoByName("ui_swing").getPlugin())
+                .getSwingStatusBar().removeComponent(panel);
         IdentityManager.getConfigIdentity().removeListener(this);
         
         ActionManager.removeListener(this);

src/com/dmdirc/addons/ui_dummy/DummyController.java

@@ -30,6 +30,7 @@ import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.plugins.Plugin;
+import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.ui.interfaces.ChannelWindow;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -57,7 +58,7 @@ public final class DummyController extends Plugin implements UIController {
      * Creates a new instance of DummyController.
      */
     public DummyController() {
-        // Do nothing
+        StatusBarManager.getStatusBarManager().registerStatusBar(new DummyStatusBar());
     }
     
     /** {@inheritDoc} */
@@ -66,8 +67,14 @@ public final class DummyController extends Plugin implements UIController {
         return mainWindow;
     }
     
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Should not be used externally - use the
+     * {@link com.dmdirc.ui.core.components.StatusBarManager} instead.
+     */
     @Override
+    @Deprecated
     public StatusBar getStatusBar() {
         return new DummyStatusBar();
     }

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -65,6 +65,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.ui.interfaces.ChannelWindow;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -178,8 +179,14 @@ public class SwingController extends Plugin implements Serializable,
         return me;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Should not be used externally - use the
+     * {@link com.dmdirc.ui.core.components.StatusBarManager} instead.
+     */
     @Override
+    @Deprecated
     public StatusBar getStatusBar() {
         return getSwingStatusBar();
     }
@@ -692,6 +699,7 @@ public class SwingController extends Plugin implements Serializable,
                 mainFrameCreated.set(true);
                 statusBar = me.getStatusBar();
                 errorDialog = new ErrorListDialog(me);
+                StatusBarManager.getStatusBarManager().registerStatusBar(statusBar);
             }
         });
 

src/com/dmdirc/addons/ui_swing/components/statusbar/FeedbackNag.java

@@ -85,7 +85,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
         dismiss.addActionListener(this);
         addMouseListener(this);
 
-        controller.getStatusBar().addComponent(this);
+        controller.getSwingStatusBar().addComponent(this);
     }
 
     /**
@@ -117,7 +117,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
     public void mouseReleased(MouseEvent e) {
         if (e.getButton() == 1) {
             FeedbackDialog.showFeedbackDialog(controller.getMainFrame());
-            controller.getStatusBar().removeComponent(this);
+            controller.getSwingStatusBar().removeComponent(this);
         }
         checkMouseEvent(e);
     }
@@ -163,6 +163,6 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
         if (e.getSource() == show) {
             FeedbackDialog.showFeedbackDialog(controller.getMainFrame());
         }
-        controller.getStatusBar().removeComponent(this);
+        controller.getSwingStatusBar().removeComponent(this);
     }
 }

src/com/dmdirc/addons/ui_web/WebInterfaceUI.java

@@ -30,6 +30,7 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.addons.ui_web.uicomponents.WebMainWindow;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
 import com.dmdirc.config.prefs.PreferencesInterface;
+import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.ui.interfaces.ChannelWindow;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -95,7 +96,7 @@ public class WebInterfaceUI implements UIController {
             new DMDircRequestHandler(),
             new DynamicRequestHandler(this),
         });
-        
+
         try {
             webServer.start();
         } catch (Exception ex) {
@@ -103,6 +104,8 @@ public class WebInterfaceUI implements UIController {
         }
 
         windowManager = new WebWindowManager(this);
+
+        StatusBarManager.getStatusBarManager().registerStatusBar(new WebStatusBar());
     }
 
     public WebWindowManager getWindowManager() {
@@ -124,8 +127,14 @@ public class WebInterfaceUI implements UIController {
         return new WebMainWindow();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Should not be used externally - use the
+     * {@link com.dmdirc.ui.core.components.StatusBarManager} instead.
+     */
     @Override
+    @Deprecated
     public StatusBar getStatusBar() {
         return new WebStatusBar();
     }

src/com/dmdirc/addons/ui_web/uicomponents/WebStatusBar.java

@@ -71,10 +71,6 @@ public class WebStatusBar implements StatusBar {
         // Do nothing
     }
 
-    public boolean isVisible() {
-        return true;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void setMessage(String iconType, String newMessage) {

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -84,7 +84,8 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener,
     @Override
     public void onLoad() {
         ((SwingController) PluginManager.getPluginManager()
-                .getPluginInfoByName("ui_swing").getPlugin()).getStatusBar().addComponent(panel);
+                .getPluginInfoByName("ui_swing").getPlugin())
+                .getSwingStatusBar().addComponent(panel);
         IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
         updateCache();
 
@@ -97,7 +98,8 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener,
     @Override
     public void onUnload() {
         ((SwingController) PluginManager.getPluginManager()
-                .getPluginInfoByName("ui_swing").getPlugin()).getStatusBar().removeComponent(panel);
+                .getPluginInfoByName("ui_swing").getPlugin())
+                .getSwingStatusBar().removeComponent(panel);
         ActionManager.removeListener(this);
     }