Remove all UpdateChecker.getManager() calls.

Down with static methods! Temporarily up with deprecated methods on horrible
global state objects!

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

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

@@ -26,7 +26,6 @@ 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.UpdateChecker;
 import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.updater.manager.UpdateManagerListener;
 import com.dmdirc.updater.manager.UpdateManagerStatus;
@@ -63,7 +62,7 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
 
         this.controller = controller;
         setBorder(BorderFactory.createEtchedBorder());
-        UpdateChecker.getManager().addUpdateManagerListener(this);
+        controller.getCachingUpdateManager().addUpdateManagerListener(this);
         setVisible(false);
         label.setText(null);
     }
@@ -77,13 +76,13 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
     public void mouseReleased(final MouseEvent mouseEvent) {
         super.mouseReleased(mouseEvent);
         if (mouseEvent.getButton() == MouseEvent.BUTTON1) {
-            if (UpdateChecker.getManager().getManagerStatus()
+            if (controller.getCachingUpdateManager().getManagerStatus()
                     == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
                 closeDialog();
                 controller.showDialog(SwingRestartDialog.class);
             } else {
                 controller.showDialog(SwingUpdaterDialog.class,
-                        UpdateChecker.getManager());
+                        controller.getCachingUpdateManager());
             }
         }
     }

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

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateComponent;
+import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateStatus;
 
 import java.awt.Window;
@@ -46,6 +46,9 @@ public class UpdaterPopup extends StatusbarPopupWindow {
      */
     private static final long serialVersionUID = 1;
 
+    /** The update manager to use to retrieve update status. */
+    private final CachingUpdateManager updateManager;
+
     /**
      * Creates a new popup window for the specified panel and window.
      *
@@ -56,13 +59,15 @@ public class UpdaterPopup extends StatusbarPopupWindow {
     public UpdaterPopup(final SwingController controller, final JPanel parent,
             final Window parentWindow) {
         super(controller, parent, parentWindow);
+
+        updateManager = controller.getCachingUpdateManager();
     }
 
     /** {@inheritDoc} */
     @Override
     protected void initContent(final JPanel panel) {
-        for (UpdateComponent component : UpdateChecker.getManager().getComponents()) {
-            final UpdateStatus status = UpdateChecker.getManager().getStatus(component);
+        for (UpdateComponent component : updateManager.getComponents()) {
+            final UpdateStatus status = updateManager.getStatus(component);
 
             if (status != UpdateStatus.IDLE && status != UpdateStatus.CHECKING_NOT_PERMITTED) {
                 panel.add(new JLabel(component.getFriendlyName()),

src/com/dmdirc/addons/ui_swing/dialogs/prefs/UpdateConfigPanel.java

@@ -71,7 +71,7 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
     /** Update channel. */
     private JComboBox updateChannel;
     /** Swing controller. */
-    private SwingController controller;
+    private final SwingController controller;
 
     /**
      * Instantiates a new update config panel.
@@ -112,7 +112,9 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
         final AggregateConfigProvider config = controller.getGlobalConfig();
         enable = new JCheckBox();
         scrollPane = new JScrollPane();
-        tableModel = new UpdateTableModel(UpdateChecker.getManager().getComponents());
+        tableModel = new UpdateTableModel(
+                controller.getCachingUpdateManager(),
+                controller.getCachingUpdateManager().getComponents());
         table = new PackingTable(tableModel, scrollPane);
         checkNow = new JButton("Check now");
         checkNow.setEnabled(config.getOptionBool("updater", "enable"));

src/com/dmdirc/addons/ui_swing/dialogs/prefs/UpdateTableModel.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateComponent;
+import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateStatus;
 
 import java.util.ArrayList;
@@ -48,21 +48,17 @@ public class UpdateTableModel extends AbstractTableModel {
     /** Update component list. */
     private final List<UpdateComponent> updates;
     /** Enabled list. */
-    private Map<UpdateComponent, Boolean> enabled;
-
-    /**
-     * Instantiates a new table model.
-     */
-    public UpdateTableModel() {
-        this(new ArrayList<UpdateComponent>());
-    }
+    private final Map<UpdateComponent, Boolean> enabled;
 
     /**
      * Instantiates a new table model.
      *
+     * @param updateManager The update manager to use to retrieve component status.
      * @param updates Update components to show
      */
-    public UpdateTableModel(final Collection<UpdateComponent> updates) {
+    public UpdateTableModel(
+            final CachingUpdateManager updateManager,
+            final Collection<UpdateComponent> updates) {
         super();
 
         this.updates = new ArrayList<>(updates);
@@ -70,8 +66,7 @@ public class UpdateTableModel extends AbstractTableModel {
 
         for (UpdateComponent update : this.updates) {
             enabled.put(update,
-                    UpdateChecker.getManager().getStatus(update)
-                    != UpdateStatus.CHECKING_NOT_PERMITTED);
+                    updateManager.getStatus(update) != UpdateStatus.CHECKING_NOT_PERMITTED);
         }
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingUpdaterDialog.java

@@ -30,7 +30,6 @@ import com.dmdirc.addons.ui_swing.components.renderers.UpdateStatusTableCellRend
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateManager;
@@ -199,7 +198,7 @@ public class SwingUpdaterDialog extends StandardDialog implements
                 }
             }.executeInExecutor();
 
-            if (UpdateChecker.getManager().getManagerStatus() == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
+            if (updateManager.getManagerStatus() == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
                 dialogManager.showDialog(SwingRestartDialog.class);
                 dispose();
             }

src/com/dmdirc/addons/ui_swing/dialogs/updater/UpdateTableModel.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.updater;
 
-import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateStatus;
@@ -57,12 +56,7 @@ public class UpdateTableModel extends AbstractTableModel implements UpdateStatus
     /** Cached progress for each component. */
     private final Map<UpdateComponent, Double> progress = new HashMap<>();
     /** Number formatter. */
-    private NumberFormat formatter;
-
-    /** Creates a new instance of UpdateTableModel. */
-    public UpdateTableModel() {
-        this(UpdateChecker.getManager(), Collections.<UpdateComponent>emptyList());
-    }
+    private final NumberFormat formatter;
 
     /**
      * Creates a new instance of UpdateTableModel.