Fix some deprecations

Change-Id: If06484cea112fafe8e75423a1381f484f6d902e5
Reviewed-on: http://gerrit.dmdirc.com/3279
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -22,12 +22,14 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.ErrorListener;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ProgramError;
+import com.dmdirc.ui.IconManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -35,6 +37,9 @@ import java.awt.event.MouseEvent;
 import java.util.Collection;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
 import javax.swing.Icon;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
@@ -46,20 +51,22 @@ import javax.swing.SwingUtilities;
  *
  * @since 0.6.3m1
  */
+@Singleton
 public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
         ErrorListener, ActionListener {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 2;
     /** non error state image icon. */
-    private final Icon DEFAULT_ICON;
+    private final Icon defaultIcon;
     /** Status controller. */
     private final MainFrame mainFrame;
     /** Swing status bar. */
-    private final SwingStatusBar statusBar;
+    private final Provider<SwingStatusBar> statusBar;
+    /** The manager to use to retrieve icons. */
+    private final IconManager iconManager;
     /** Error manager. */
-    private final transient ErrorManager errorManager = ErrorManager
-            .getErrorManager();
+    private final transient ErrorManager errorManager = ErrorManager.getErrorManager();
     /** Dismiss menu. */
     private final JPopupMenu menu;
     /** Dismiss menu item. */
@@ -74,23 +81,29 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
     /**
      * Creates a new ErrorPanel for the specified status bar.
      *
-     * @param controller Swing controller
-     * @param mainFrame  Main frame
-     * @param statusBar  Status bar
+     * @param swingController Swing controller
+     * @param iconManager     The manager to use to retrieve icons.
+     * @param mainFrame       Main frame
+     * @param statusBar       Status bar
      */
-    public ErrorPanel(final SwingController controller,
-            final MainFrame mainFrame, final SwingStatusBar statusBar) {
+    @Inject
+    public ErrorPanel(
+            final SwingController swingController,
+            @GlobalConfig final IconManager iconManager,
+            final MainFrame mainFrame,
+            final Provider<SwingStatusBar> statusBar) {
         super(new JLabel());
 
-        this.controller = controller;
+        this.controller = swingController;
         this.mainFrame = mainFrame;
         this.statusBar = statusBar;
-        DEFAULT_ICON = controller.getIconManager().getIcon("normal");
+        this.iconManager = iconManager;
+        defaultIcon = iconManager.getIcon("normal");
 
         menu = new JPopupMenu();
         dismiss = new JMenuItem("Clear All");
         show = new JMenuItem("Open");
-        label.setIcon(DEFAULT_ICON);
+        label.setIcon(defaultIcon);
         setVisible(errorManager.getErrorCount() > 0);
         menu.add(show);
         menu.add(dismiss);
@@ -102,12 +115,12 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
 
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new ErrorPopup(controller.getIconManager(), this, mainFrame);
+        return new ErrorPopup(iconManager, this, mainFrame);
     }
 
     /** Clears the error. */
     public void clearError() {
-        label.setIcon(DEFAULT_ICON);
+        label.setIcon(defaultIcon);
         errorLevel = null;
     }
 
@@ -141,8 +154,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
                     for (final ProgramError error : errors) {
                         if (errorLevel == null || !error.getLevel().moreImportant(errorLevel)) {
                             errorLevel = error.getLevel();
-                            label.setIcon(controller.getIconManager()
-                                    .getIcon(errorLevel.getIcon()));
+                            label.setIcon(iconManager.getIcon(errorLevel.getIcon()));
                         }
                     }
                     setVisible(true);
@@ -153,7 +165,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
 
     @Override
     public boolean isReady() {
-        return statusBar.isValid();
+        return statusBar.get().isValid();
     }
 
     /**

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

@@ -22,8 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.interfaces.ui.StatusBar;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
 import com.dmdirc.logger.ErrorLevel;
@@ -71,13 +69,13 @@ public class SwingStatusBar extends JPanel implements StatusBar {
      * @param mainFrame    Main frame
      * @param inviteLabel  The invite label to add to the status bar.
      * @param updaterLabel The updater label to add to the status bar.
+     * @param errorLabel   The error label to add to the status bar.
      * @param messageLabel The message label to add to the status bar.
      */
     public SwingStatusBar(
-            final SwingController controller,
-            final MainFrame mainFrame,
             final InviteLabel inviteLabel,
             final UpdaterLabel updaterLabel,
+            final ErrorPanel errorLabel,
             final MessageLabel messageLabel) {
         checkOnEDT();
 
@@ -88,7 +86,7 @@ public class SwingStatusBar extends JPanel implements StatusBar {
                 + ", wmin 20, shrink 0";
 
         this.messageLabel = messageLabel;
-        errorPanel = new ErrorPanel(controller, mainFrame, this);
+        this.errorPanel = errorLabel;
         this.updateLabel = updaterLabel;
         this.inviteLabel = inviteLabel;
 

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

@@ -22,12 +22,14 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogModule.ForUpdates;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.updater.manager.UpdateManagerListener;
@@ -45,14 +47,12 @@ import javax.swing.JLabel;
 public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
         StatusBarComponent, UpdateManagerListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class structure is changed
-     * (or anything else that would prevent serialized objects being unserialized with the new
-     * class).
-     */
+    /** A version number for this class. */
     private static final long serialVersionUID = 1;
-    /** Swing controller. */
-    private final SwingController controller;
+    /** The manager to use to retrieve icons. */
+    private final IconManager iconManager;
+    /** The frame that owns this label. */
+    private final MainFrame mainFrame;
     /** The update manager to use to retrieve information. */
     private final CachingUpdateManager updateManager;
     /** Provider of updater dialogs. */
@@ -63,20 +63,23 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
     /**
      * Instantiates a new updater label, handles showing updates on the status bar.
      *
-     * @param controller            Swing controller
+     * @param iconManager           The manager to use to retrieve icons.
+     * @param mainFrame             The frame that owns this label.
      * @param updateManager         The manager to use to retrieve information.
      * @param updaterDialogProvider Provider of updater dialogs.
      * @param restartDialogProvider Provider of restart dialogs.
      */
     @Inject
     public UpdaterLabel(
-            final SwingController controller,
+            @GlobalConfig final IconManager iconManager,
+            final MainFrame mainFrame,
             final CachingUpdateManager updateManager,
             final DialogProvider<SwingUpdaterDialog> updaterDialogProvider,
             @ForUpdates final DialogProvider<SwingRestartDialog> restartDialogProvider) {
         super(new JLabel());
 
-        this.controller = controller;
+        this.iconManager = iconManager;
+        this.mainFrame = mainFrame;
         this.updateManager = updateManager;
         this.updaterDialogProvider = updaterDialogProvider;
         this.restartDialogProvider = restartDialogProvider;
@@ -106,7 +109,7 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
 
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new UpdaterPopup(updateManager, this, controller.getMainFrame());
+        return new UpdaterPopup(updateManager, this, mainFrame);
     }
 
     @Override
@@ -119,11 +122,11 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
         }
 
         if (status == UpdateManagerStatus.WORKING) {
-            label.setIcon(controller.getIconManager().getIcon("hourglass"));
+            label.setIcon(iconManager.getIcon("hourglass"));
         } else if (status == UpdateManagerStatus.IDLE_UPDATE_AVAILABLE) {
-            label.setIcon(controller.getIconManager().getIcon("update"));
+            label.setIcon(iconManager.getIcon("update"));
         } else if (status == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
-            label.setIcon(controller.getIconManager().getIcon("restart-needed"));
+            label.setIcon(iconManager.getIcon("restart-needed"));
         }
     }
 

src/com/dmdirc/addons/ui_swing/injection/SwingModule.java

@@ -41,6 +41,7 @@ import com.dmdirc.addons.ui_swing.commands.PopOutCommand;
 import com.dmdirc.addons.ui_swing.commands.ServerSettings;
 import com.dmdirc.addons.ui_swing.components.addonpanel.PluginPanel;
 import com.dmdirc.addons.ui_swing.components.addonpanel.ThemePanel;
+import com.dmdirc.addons.ui_swing.components.statusbar.ErrorPanel;
 import com.dmdirc.addons.ui_swing.components.statusbar.InviteLabel;
 import com.dmdirc.addons.ui_swing.components.statusbar.MessageLabel;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
@@ -139,16 +140,14 @@ public class SwingModule {
     @Provides
     @Singleton
     public SwingStatusBar getSwingStatusBar(
-            final SwingController swingController,
-            final MainFrame mainFrame,
             final InviteLabel inviteLabel,
+            final ErrorPanel errorLabel,
             final UpdaterLabel updaterLabel,
             final MessageLabel messageLabel) {
         return UIUtilities.invokeAndWait(new Callable<SwingStatusBar>() {
             @Override
             public SwingStatusBar call() {
-                return new SwingStatusBar(swingController, mainFrame, inviteLabel, updaterLabel,
-                        messageLabel);
+                return new SwingStatusBar(inviteLabel, updaterLabel, errorLabel, messageLabel);
             }
         });
     }