Inject more things.

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

src/com/dmdirc/addons/ui_swing/components/menubar/HelpMenu.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.menubar;
 
+import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
@@ -45,16 +46,22 @@ public class HelpMenu extends JMenu implements ActionListener {
     private static final long serialVersionUID = 1;
     /** Swing controller. */
     private final SwingController controller;
+    /** Server manager to use to join dev chat. */
+    private final ServerManager serverManager;
 
     /**
      * Instantiates a new help menu.
      *
      * @param controller Swing controller
+     * @param serverManager The manager to use to join dev chat.
      */
     @Inject
-    public HelpMenu(final SwingController controller) {
+    public HelpMenu(
+            final SwingController controller,
+            final ServerManager serverManager) {
         super("Help");
         this.controller = controller;
+        this.serverManager = serverManager;
         setMnemonic('h');
         initHelpMenu();
     }
@@ -101,7 +108,7 @@ public class HelpMenu extends JMenu implements ActionListener {
                 controller.showDialog(AboutDialog.class);
                 break;
             case "JoinDevChat":
-                controller.getServerManager().joinDevChat();
+                serverManager.joinDevChat();
                 break;
             case "feedback":
                 controller.showDialog(FeedbackDialog.class);

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

@@ -22,13 +22,14 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.Invite;
 import com.dmdirc.Server;
+import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
@@ -37,11 +38,13 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.InviteListener;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
+import com.dmdirc.ui.IconManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
 import java.util.Collection;
 
+import javax.inject.Inject;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
@@ -78,17 +81,24 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
     /**
      * Instantiates a new invite label.
      *
-     * @param controller Swing controller
+     * @param dialogManager The manager to register dialogs with.
+     * @param iconManager The manager to retrieve the invite icon from.
+     * @param serverManager The manager to use to iterate servers.
      * @param mainFrame Main frame
      */
-    public InviteLabel(final SwingController controller, final MainFrame mainFrame) {
+    @Inject
+    public InviteLabel(
+            final DialogManager dialogManager,
+            @GlobalConfig final IconManager iconManager,
+            final ServerManager serverManager,
+            final MainFrame mainFrame) {
         super(new JLabel());
 
-        this.dialogManager = controller.getDialogManager();
+        this.dialogManager = dialogManager;
         this.mainFrame = mainFrame;
 
         setBorder(BorderFactory.createEtchedBorder());
-        label.setIcon(controller.getIconManager().getIcon("invite"));
+        label.setIcon(iconManager.getIcon("invite"));
 
         menu = new JPopupMenu();
         dismiss = new JMenuItem("Dismiss all invites");
@@ -98,7 +108,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
         accept.setActionCommand("acceptAll");
         accept.addActionListener(this);
 
-        for (final Server server : controller.getServerManager().getServers()) {
+        for (final Server server : serverManager.getServers()) {
             server.addInviteListener(this);
         }
 

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

@@ -70,11 +70,15 @@ public class SwingStatusBar extends JPanel implements StatusBar {
      *
      * @param controller Swing controller
      * @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.
      */
     @Inject
     public SwingStatusBar(
             final SwingController controller,
-            final MainFrame mainFrame) {
+            final MainFrame mainFrame,
+            final InviteLabel inviteLabel,
+            final UpdaterLabel updaterLabel) {
         super();
 
         height = getFontMetrics(UIManager.getFont("Table.font")).getHeight()
@@ -85,8 +89,8 @@ public class SwingStatusBar extends JPanel implements StatusBar {
 
         messageLabel = new MessageLabel(controller, mainFrame);
         errorPanel = new ErrorPanel(controller, mainFrame, this);
-        updateLabel = new UpdaterLabel(controller);
-        inviteLabel = new InviteLabel(controller, mainFrame);
+        this.updateLabel = updaterLabel;
+        this.inviteLabel = inviteLabel;
 
         setLayout(new MigLayout("fill, ins 0, hidemode 3"));
 

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

@@ -26,12 +26,14 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
+import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.updater.manager.UpdateManagerListener;
 import com.dmdirc.updater.manager.UpdateManagerStatus;
 
 import java.awt.event.MouseEvent;
 
+import javax.inject.Inject;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 
@@ -50,19 +52,26 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
     private static final long serialVersionUID = 1;
     /** Swing controller. */
     private final SwingController controller;
+    /** The update manager to use to retrieve information. */
+    private final CachingUpdateManager updateManager;
 
     /**
      * Instantiates a new updater label, handles showing updates on the status
      * bar.
      *
      * @param controller Swing controller
+     * @param updateManager The manager to use to retrieve information.
      */
-    public UpdaterLabel(final SwingController controller) {
+    @Inject
+    public UpdaterLabel(
+            final SwingController controller,
+            final CachingUpdateManager updateManager) {
         super(new JLabel());
 
         this.controller = controller;
+        this.updateManager = updateManager;
         setBorder(BorderFactory.createEtchedBorder());
-        controller.getCachingUpdateManager().addUpdateManagerListener(this);
+        updateManager.addUpdateManagerListener(this);
         setVisible(false);
         label.setText(null);
     }
@@ -76,13 +85,11 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
     public void mouseReleased(final MouseEvent mouseEvent) {
         super.mouseReleased(mouseEvent);
         if (mouseEvent.getButton() == MouseEvent.BUTTON1) {
-            if (controller.getCachingUpdateManager().getManagerStatus()
-                    == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
+            if (updateManager.getManagerStatus() == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
                 closeDialog();
                 controller.showDialog(SwingRestartDialog.class);
             } else {
-                controller.showDialog(SwingUpdaterDialog.class,
-                        controller.getCachingUpdateManager());
+                controller.showDialog(SwingUpdaterDialog.class, updateManager);
             }
         }
     }
@@ -90,7 +97,7 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
     /** {@inheritDoc} */
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new UpdaterPopup(controller.getDialogManager(), controller.getCachingUpdateManager(),
+        return new UpdaterPopup(controller.getDialogManager(), updateManager,
                 this, controller.getMainFrame());
     }