Remove some deprecated method usages.

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

Change-Id: I1f3a097c2c0077ad55092e810bf23eae2849569e
Reviewed-on: http://gerrit.dmdirc.com/3262
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
Reviewed-on: http://gerrit.dmdirc.com/3340
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/ui_swing/components/statusbar/MessageLabel.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.UIUtilities;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.StatusMessage;
 
-import java.awt.Window;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.util.Date;
@@ -36,6 +38,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import javax.inject.Inject;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
@@ -65,25 +68,28 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
     private StatusMessage currentMessage;
     /** Timer to clear the message. */
     private transient TimerTask messageTimer;
-    /** Swing controller. */
-    private final SwingController controller;
+    /** Icon manager to retrieve icons from. */
+    private final IconManager iconManager;
 
     /**
      * Instantiates a new message label.
      *
-     * @param controller   Swing controller
+     * @param iconManager  Icon manager to retrieve icons from
+     * @param config       Config to read settings from
      * @param parentWindow Parent window
      */
-    public MessageLabel(final SwingController controller,
-            final Window parentWindow) {
+    @Inject
+    public MessageLabel(
+            @GlobalConfig final AggregateConfigProvider config,
+            @GlobalConfig final IconManager iconManager,
+            final MainFrame parentWindow) {
         super(new MigLayout("fill, ins 0, gap 0  0"));
-        this.controller = controller;
+        this.iconManager = iconManager;
         queue = new ConcurrentLinkedQueue<>();
-        defaultMessage = new StatusMessage(null, "Ready.", null, -1,
-                controller.getGlobalConfig());
+        defaultMessage = new StatusMessage(null, "Ready.", null, -1, config);
         currentMessage = defaultMessage;
         label = new JLabel();
-        historyLabel = new MessagePopup(this, parentWindow, controller);
+        historyLabel = new MessagePopup(this, parentWindow, iconManager);
         label.setText("Ready.");
         label.setBorder(new SidelessEtchedBorder(
                 SidelessEtchedBorder.Side.RIGHT));
@@ -120,8 +126,7 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
                 if (currentMessage.getIconType() == null) {
                     label.setIcon(null);
                 } else {
-                    label.setIcon(controller.getIconManager().getIcon(
-                            currentMessage.getIconType()));
+                    label.setIcon(iconManager.getIcon(currentMessage.getIconType()));
                 }
                 label.setText(UIUtilities.clipStringifNeeded(MessageLabel.this,
                         currentMessage.getMessage(), getWidth()));
@@ -135,7 +140,7 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
                     messageTimer = new MessageTimerTask(MessageLabel.this);
                     new Timer("SwingStatusBar messageTimer").schedule(
                             messageTimer, new Date(System.currentTimeMillis()
-                            + 250 + currentMessage.getTimeout() * 1000L));
+                                    + 250 + currentMessage.getTimeout() * 1000L));
                 }
             }
         });

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.util.collections.RollingList;
 
@@ -55,24 +55,24 @@ class MessagePopup extends StatusbarTogglePanel<JLabel> {
     private final RollingList<StatusMessage> messages;
     /** Parent panel. */
     private final JPanel parent;
-    /** Swing controller. */
-    private final SwingController controller;
+    /** Icon manager to retrieve icons from. */
+    private final IconManager iconManager;
 
     /**
      * Creates a new message history popup.
      *
      * @param parent       Parent to size against
      * @param parentWindow Parent window
-     * @param controller   Swing controller
+     * @param iconManager  Icon manager to retrieve icons from
      */
     public MessagePopup(final JPanel parent, final Window parentWindow,
-            final SwingController controller) {
+            final IconManager iconManager) {
         super(new JLabel("^"),
                 new SidelessEtchedBorder(SidelessEtchedBorder.Side.LEFT),
                 new SidelessEtchedBorder(SidelessEtchedBorder.Side.TOP));
         this.parentWindow = parentWindow;
         this.parent = parent;
-        this.controller = controller;
+        this.iconManager = iconManager;
         messages = new RollingList<>(5);
     }
 
@@ -167,9 +167,8 @@ class MessagePopup extends StatusbarTogglePanel<JLabel> {
 
             for (final StatusMessage message : messages.getList()) {
                 panel.add(new JLabel(message.getMessage(), message.getIconType()
-                        == null ? null : controller.getIconManager()
-                        .getIcon(message.getIconType()), SwingConstants.LEFT),
-                        "grow, push, wrap");
+                        == null ? null : iconManager.getIcon(message.getIconType()),
+                        SwingConstants.LEFT), "grow, push, wrap");
             }
         }
 

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

@@ -72,22 +72,22 @@ 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 messageLabel The message label to add to the status bar.
      */
     @Inject
     public SwingStatusBar(
             final SwingController controller,
             final MainFrame mainFrame,
             final InviteLabel inviteLabel,
-            final UpdaterLabel updaterLabel) {
-        super();
-
+            final UpdaterLabel updaterLabel,
+            final MessageLabel messageLabel) {
         height = getFontMetrics(UIManager.getFont("Table.font")).getHeight()
                 + (int) PlatformDefaults.getUnitValueX("related").getValue()
                 + (int) PlatformDefaults.getUnitValueX("related").getValue();
         componentConstraints = "sgy components, hmax " + height + ", hmin " + height
                 + ", wmin 20, shrink 0";
 
-        messageLabel = new MessageLabel(controller, mainFrame);
+        this.messageLabel = messageLabel;
         errorPanel = new ErrorPanel(controller, mainFrame, this);
         this.updateLabel = updaterLabel;
         this.inviteLabel = inviteLabel;