Inject update manager in a few places.

Again, add a deprecated method to SwingController/Manager to escape the dependency
hell temporarily.

Change-Id: Ia79f9199e8ca40dddddd8de6f9a44da042fc617f
Depends-On: Ia79f9199e8ca40dc3031234569a44da042fc617f
Reviewed-on: http://gerrit.dmdirc.com/3025
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -70,6 +70,7 @@ import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.Version;
+import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
@@ -932,4 +933,9 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         return swingManager.getDataLoaderWorkerFactory();
     }
 
+    @Deprecated
+    public CachingUpdateManager getCachingUpdateManager() {
+        return swingManager.getCachingUpdateManager();
+    }
+
 }

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

@@ -32,6 +32,7 @@ import com.dmdirc.addons.ui_swing.wizard.firstrun.FirstRunWizardExecutor;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.util.URLHandler;
+import com.dmdirc.updater.manager.CachingUpdateManager;
 
 import java.awt.KeyboardFocusManager;
 import java.awt.Toolkit;
@@ -76,6 +77,9 @@ public class SwingManager {
     /** Factory used to create data loader workers. */
     private final DataLoaderWorkerFactory dataLoaderWorkerFactory;
 
+    /** The update manager to use. */
+    private final CachingUpdateManager cachingUpdateManager;
+
     /** Provider of first run executors. */
     private final Provider<FirstRunWizardExecutor> firstRunExecutor;
 
@@ -94,6 +98,7 @@ public class SwingManager {
      * @param urlHandler The URL handler to use.
      * @param dialogKeyListener The key listener that supports dialogs.
      * @param dataLoaderWorkerFactory Factory used to create data loader workers.
+     * @param cachingUpdateManager Update manager to use.
      * @param firstRunExecutor A provider of first run executors.
      */
     @Inject
@@ -110,6 +115,7 @@ public class SwingManager {
             final URLHandler urlHandler,
             final DialogKeyListener dialogKeyListener,
             final DataLoaderWorkerFactory dataLoaderWorkerFactory,
+            final CachingUpdateManager cachingUpdateManager,
             final Provider<FirstRunWizardExecutor> firstRunExecutor) {
         this.dialogManager = dialogManager;
         this.eventQueue = eventQueue;
@@ -120,6 +126,7 @@ public class SwingManager {
         this.urlHandler = urlHandler;
         this.dialogKeyListener = dialogKeyListener;
         this.dataLoaderWorkerFactory = dataLoaderWorkerFactory;
+        this.cachingUpdateManager = cachingUpdateManager;
         this.firstRunExecutor = firstRunExecutor;
 
         this.mainFrame = mainFrame;
@@ -179,6 +186,11 @@ public class SwingManager {
         return dataLoaderWorkerFactory;
     }
 
+    @Deprecated
+    public CachingUpdateManager getCachingUpdateManager() {
+        return cachingUpdateManager;
+    }
+
     /**
      * Retrieves the window factory to use.
      *

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonToggle.java

@@ -26,8 +26,8 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.themes.Theme;
 import com.dmdirc.ui.themes.ThemeManager;
-import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateComponent;
+import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateStatus;
 import com.dmdirc.util.collections.ListenerList;
 
@@ -56,44 +56,54 @@ public final class AddonToggle {
      * Creates a new instance of AddonToggle to wrap the specified
      * PluginInfo.
      *
+     * @param updateManager The update manager to use to retrieve component info.
      * @param identity Identity to change update settings in.
      * @param pi The PluginInfo to be wrapped.
      */
-    public AddonToggle(final ConfigProvider identity, final PluginInfo pi) {
+    public AddonToggle(
+            final CachingUpdateManager updateManager,
+            final ConfigProvider identity,
+            final PluginInfo pi) {
         this.identity = identity;
         this.pi = pi;
         this.theme = null;
         this.themeManager = null;
         state = pi.isLoaded();
 
-        for (UpdateComponent comp : UpdateChecker.getManager().getComponents()) {
-            if (comp.getName().equals("addon-" + getID())) {
-                updateState = UpdateChecker.getManager().getStatus(comp)
-                        != UpdateStatus.CHECKING_NOT_PERMITTED;
-                break;
-            }
-        }
+        checkUpdateState(updateManager);
     }
 
     /**
-     * Creates a new instance of AddonToggle to wrap the specified
-     * Theme.
+     * Creates a new instance of AddonToggle to wrap the specified Theme.
      *
+     * @param updateManager The update manager to use to retrieve component info.
      * @param identity Identity to change update settings in.
      * @param themeManager The manager to update when toggling a theme.
      * @param theme The Theme to be wrapped
      */
-    public AddonToggle(final ConfigProvider identity, final ThemeManager themeManager, final Theme theme) {
+    public AddonToggle(
+            final CachingUpdateManager updateManager,
+            final ConfigProvider identity,
+            final ThemeManager themeManager,
+            final Theme theme) {
         this.identity = identity;
         this.pi = null;
         this.theme = theme;
         this.themeManager = themeManager;
         state = theme.isEnabled();
 
-        for (UpdateComponent comp : UpdateChecker.getManager().getComponents()) {
+        checkUpdateState(updateManager);
+    }
+
+    /**
+     * Checks whether or not the component that is controlled by this toggle is enabled.
+     *
+     * @param updateManager The update manager to use to retrieve component info.
+     */
+    private void checkUpdateState(final CachingUpdateManager updateManager) {
+        for (UpdateComponent comp : updateManager.getComponents()) {
             if (comp.getName().equals("addon-" + getID())) {
-                updateState = UpdateChecker.getManager().getStatus(comp)
-                        != UpdateStatus.CHECKING_NOT_PERMITTED;
+                updateState = updateManager.getStatus(comp) != UpdateStatus.CHECKING_NOT_PERMITTED;
                 break;
             }
         }

src/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java

@@ -96,9 +96,14 @@ public class PluginPanel extends AddonPanel implements ActionListener {
                 ((DefaultTableModel) table.getModel()).setNumRows(0);
                 for (final PluginInfo plugin : sortedList) {
                     ((DefaultTableModel) table.getModel()).addRow(
-                            new AddonCell[]{ new AddonCell(new AddonToggle(
-                                    controller.getGlobalIdentity(), plugin),
-                                    getIconManager()), });
+                            new AddonCell[]{
+                                new AddonCell(
+                                        new AddonToggle(
+                                                controller.getCachingUpdateManager(),
+                                                controller.getGlobalIdentity(),
+                                                plugin),
+                                        getIconManager()),
+                            });
                 }
                 table.repaint();
             }

src/com/dmdirc/addons/ui_swing/components/addonpanel/ThemePanel.java

@@ -80,10 +80,15 @@ public class ThemePanel extends AddonPanel {
                 ((DefaultTableModel) addonList.getModel()).setRowCount(0);
                 for (final Theme theme : list) {
                     ((DefaultTableModel) addonList.getModel()).addRow(
-                    new AddonCell[]{ new AddonCell(new AddonToggle(
-                            controller.getGlobalIdentity(),
-                            controller.getThemeManager(), theme),
-                            getIconManager()), });
+                            new AddonCell[]{
+                                new AddonCell(
+                                        new AddonToggle(
+                                                controller.getCachingUpdateManager(),
+                                                controller.getGlobalIdentity(),
+                                                controller.getThemeManager(),
+                                                theme),
+                                        getIconManager()),
+                            });
                 }
 
                 addonList.repaint();