Inject updater components.

Remove some singleton refs from them.

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

src/com/dmdirc/ClientModule.java

@@ -54,8 +54,13 @@ import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.UpdateChecker;
+import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;
+import com.dmdirc.updater.components.ClientComponent;
+import com.dmdirc.updater.components.DefaultsComponent;
 import com.dmdirc.updater.components.LauncherComponent;
+import com.dmdirc.updater.components.ModeAliasesComponent;
+import com.dmdirc.updater.manager.DMDircUpdateManager;
 import com.dmdirc.updater.manager.UpdateManager;
 
 import java.awt.GraphicsEnvironment;
@@ -283,12 +288,15 @@ public class ClientModule {
      * Gets an update manager for the client.
      *
      * @param commandLineParser CLI parser to use to find launcher version.
+     * @param updateManager The underlying update manager.
      * @return The update manager to use.
      */
     @Provides
     @Singleton
-    public UpdateManager getUpdateManager(final CommandLineParser commandLineParser) {
-        UpdateChecker.init();
+    public UpdateManager getUpdateManager(
+            final CommandLineParser commandLineParser,
+            final DMDircUpdateManager updateManager) {
+        UpdateChecker.init(updateManager);
         final UpdateManager manager = UpdateChecker.getManager();
 
         if (commandLineParser.getLauncherVersion() != null) {
@@ -411,6 +419,39 @@ public class ClientModule {
         return identityManager;
     }
 
+    /**
+     * Provides a client component for the updater component set.
+     *
+     * @param component The client component to provide.
+     * @return The component entry in the set.
+     */
+    @Provides(type = Provides.Type.SET)
+    public UpdateComponent getClientComponent(final ClientComponent component) {
+        return component;
+    }
+
+    /**
+     * Provides a mode aliases component for the updater component set.
+     *
+     * @param component The mode aliases component to provide.
+     * @return The component entry in the set.
+     */
+    @Provides(type = Provides.Type.SET)
+    public UpdateComponent getModeAliasesComponent(final ModeAliasesComponent component) {
+        return component;
+    }
+
+    /**
+     * Provides a defaults component for the updater component set.
+     *
+     * @param component The defaults component to provide.
+     * @return The component entry in the set.
+     */
+    @Provides(type = Provides.Type.SET)
+    public UpdateComponent getDefaultsComponent(final DefaultsComponent component) {
+        return component;
+    }
+
     /**
      * Called when the global config cannot be loaded due to an error. This
      * method informs the user of the problem and installs a new default config

src/com/dmdirc/updater/UpdateChecker.java

@@ -27,7 +27,6 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.manager.CachingUpdateManager;
-import com.dmdirc.updater.manager.DMDircUpdateManager;
 import com.dmdirc.updater.manager.UpdateStatus;
 
 import java.util.Date;
@@ -106,10 +105,8 @@ public final class UpdateChecker implements Runnable {
      *
      * @param main Parent Main class
      */
-    public static void init() {
-        manager = new DMDircUpdateManager(IdentityManager.getIdentityManager()
-                .getGlobalConfiguration(), IdentityManager.getIdentityManager().getConfigDir(), 3);
-
+    public static void init(final CachingUpdateManager manager) {
+        UpdateChecker.manager = manager;
         initTimer();
     }
 

src/com/dmdirc/updater/components/ClientComponent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.updater.components;
 
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.updater.UpdateComponent;
@@ -31,11 +31,33 @@ import com.dmdirc.util.resourcemanager.DMDircResourceManager;
 
 import java.io.File;
 
+import javax.inject.Inject;
+
 /**
  * Represents the client component, which covers the core client resources.
  */
 public class ClientComponent implements UpdateComponent {
 
+    /** The controller to read settings from. */
+    private final IdentityController identityController;
+
+    /** The manager to add status bar messages to. */
+    private final StatusBarManager statusBarManager;
+
+    /**
+     * Creates a new instance of {@link ClientComponent}.
+     *
+     * @param identityController The controller to read settings from.
+     * @param statusBarManager The manager to add status bar messages to.
+     */
+    @Inject
+    public ClientComponent(
+            final IdentityController identityController,
+            final StatusBarManager statusBarManager) {
+        this.identityController = identityController;
+        this.statusBarManager = statusBarManager;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
@@ -99,8 +121,7 @@ public class ClientComponent implements UpdateComponent {
     /** {@inheritDoc} */
     @Override
     public String getFriendlyVersion() {
-        return IdentityManager.getIdentityManager().getGlobalConfiguration()
-                .getOption("version", "version");
+        return identityController.getGlobalConfiguration().getOption("version", "version");
     }
 
     /** {@inheritDoc} */
@@ -120,8 +141,8 @@ public class ClientComponent implements UpdateComponent {
             // @deprecated Should be removed when updater UI changes are
             // implemented.
             final String message = this.getManualInstructions(path);
-            StatusBarManager.getStatusBarManager().setMessage(
-                    new StatusMessage(message, IdentityManager.getIdentityManager().getGlobalConfiguration()));
+            statusBarManager.setMessage(new StatusMessage(message,
+                    identityController.getGlobalConfiguration()));
         }
 
         return true;

src/com/dmdirc/updater/components/DefaultsComponent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.updater.components;
 
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;
 import com.dmdirc.util.resourcemanager.ZipResourceManager;
@@ -31,11 +31,26 @@ import com.dmdirc.util.resourcemanager.ZipResourceManager;
 import java.io.File;
 import java.io.IOException;
 
+import javax.inject.Inject;
+
 /**
  * Represents the default identities.
  */
 public class DefaultsComponent implements UpdateComponent {
 
+    /** The controller to read settings from. */
+    private final IdentityController identityController;
+
+    /**
+     * Creates a new instance of {@link DefaultsComponent}.
+     *
+     * @param identityController The controller to read settings from.
+     */
+    @Inject
+    public DefaultsComponent(final IdentityController identityController) {
+        this.identityController = identityController;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
@@ -57,8 +72,7 @@ public class DefaultsComponent implements UpdateComponent {
     /** {@inheritDoc} */
     @Override
     public Version getVersion() {
-        final ConfigManager globalConfig = IdentityManager.getIdentityManager()
-                .getGlobalConfiguration();
+        final ConfigManager globalConfig = identityController.getGlobalConfiguration();
 
         if (globalConfig.hasOptionString("identity", "defaultsversion")) {
             return new Version(globalConfig.getOption("identity",
@@ -95,9 +109,9 @@ public class DefaultsComponent implements UpdateComponent {
     public boolean doInstall(final String path) throws IOException {
         final ZipResourceManager ziprm = ZipResourceManager.getInstance(path);
 
-        ziprm.extractResources("", IdentityManager.getIdentityManager().getIdentityDirectory());
+        ziprm.extractResources("", identityController.getIdentityDirectory());
 
-        IdentityManager.getIdentityManager().loadUserIdentities();
+        identityController.loadUserIdentities();
 
         new File(path).delete();
 

src/com/dmdirc/updater/components/ModeAliasesComponent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.updater.components;
 
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;
 import com.dmdirc.util.resourcemanager.ZipResourceManager;
@@ -31,11 +31,26 @@ import com.dmdirc.util.resourcemanager.ZipResourceManager;
 import java.io.File;
 import java.io.IOException;
 
+import javax.inject.Inject;
+
 /**
  * Represents the mode alias identities.
  */
 public class ModeAliasesComponent implements UpdateComponent {
 
+    /** The controller to read settings from. */
+    private final IdentityController identityController;
+
+    /**
+     * Creates a new instance of {@link DefaultsComponent}.
+     *
+     * @param identityController The controller to read settings from.
+     */
+    @Inject
+    public ModeAliasesComponent(final IdentityController identityController) {
+        this.identityController = identityController;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
@@ -57,8 +72,7 @@ public class ModeAliasesComponent implements UpdateComponent {
     /** {@inheritDoc} */
     @Override
     public Version getVersion() {
-        final ConfigManager globalConfig = IdentityManager.getIdentityManager()
-                .getGlobalConfiguration();
+        final ConfigManager globalConfig = identityController.getGlobalConfiguration();
 
         if (globalConfig.hasOptionString("identity", "modealiasversion")) {
             return new Version(globalConfig.getOption("identity",
@@ -95,9 +109,9 @@ public class ModeAliasesComponent implements UpdateComponent {
     public boolean doInstall(final String path) throws IOException {
         final ZipResourceManager ziprm = ZipResourceManager.getInstance(path);
 
-        ziprm.extractResources("", IdentityManager.getIdentityManager().getIdentityDirectory());
+        ziprm.extractResources("", identityController.getIdentityDirectory());
 
-        IdentityManager.getIdentityManager().loadUserIdentities();
+        identityController.loadUserIdentities();
 
         new File(path).delete();
 

src/com/dmdirc/updater/manager/DMDircUpdateManager.java

@@ -23,21 +23,22 @@
 package com.dmdirc.updater.manager;
 
 import com.dmdirc.config.ConfigBinding;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.updater.UpdateChannel;
+import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.checking.DMDircCheckStrategy;
 import com.dmdirc.updater.checking.NaiveConsolidator;
-import com.dmdirc.updater.components.ClientComponent;
-import com.dmdirc.updater.components.DefaultsComponent;
-import com.dmdirc.updater.components.ModeAliasesComponent;
 import com.dmdirc.updater.installing.LegacyInstallationStrategy;
 import com.dmdirc.updater.retrieving.DownloadRetrievalStrategy;
 
+import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import javax.inject.Inject;
+
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -46,35 +47,35 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class DMDircUpdateManager extends CachingUpdateManagerImpl {
 
+    /** Number of threads to use. */
+    private static final int THREAD_COUNT = 3;
+
     /** The default check strategy we use. */
     private final DMDircCheckStrategy checkStrategy;
 
     /**
      * Creates a new instance of the update manager.
      *
-     * @param configManager The config manager to use to retrieve channel info
-     * @param tempFolder Temporary folder to use for downloading updates
-     * @param threads The number of threads to use for updating
+     * @param identityController The controller to use for config information.
+     * @param components The default components to add to the manager.
      */
-    public DMDircUpdateManager(final ConfigManager configManager,
-            final String tempFolder, final int threads) {
-        super(new ThreadPoolExecutor(threads, threads, 1, TimeUnit.MINUTES,
+    @Inject
+    public DMDircUpdateManager(
+            final IdentityController identityController,
+            final Set<UpdateComponent> components) {
+        super(new ThreadPoolExecutor(THREAD_COUNT, THREAD_COUNT, 1, TimeUnit.MINUTES,
                 new LinkedBlockingQueue<Runnable>(), new NamedThreadFactory()),
                 new NaiveConsolidator(),
-                new ConfigComponentPolicy(configManager));
-
-        // @deprecated See ClientComponent
-        addComponent(new ClientComponent());
-        addComponent(new ModeAliasesComponent());
-        addComponent(new DefaultsComponent());
-
+                new ConfigComponentPolicy(identityController.getGlobalConfiguration()));
         checkStrategy = new DMDircCheckStrategy(UpdateChannel.STABLE);
-
-        configManager.getBinder().bind(this, DMDircUpdateManager.class);
-
+        identityController.getGlobalConfiguration().getBinder().bind(this, DMDircUpdateManager.class);
         addCheckStrategy(checkStrategy);
-        addRetrievalStrategy(new DownloadRetrievalStrategy(tempFolder));
+        addRetrievalStrategy(new DownloadRetrievalStrategy(identityController.getConfigDir()));
         addInstallationStrategy(new LegacyInstallationStrategy());
+
+        for (UpdateComponent component : components) {
+            addComponent(component);
+        }
     }
 
     /**