Move more initialisation into dagger.

Fully initialise the PluginManager instead of passing around
one in various states of existance.

Move plugin extraction logic into a CorePluginExtractor class.

Inject UpdateManager where appropriate.

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

src/com/dmdirc/ClientModule.java

@@ -26,17 +26,27 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.commandline.CommandLineOptionsModule;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
+import com.dmdirc.commandline.CommandLineParser;
+import com.dmdirc.commandparser.CommandLoader;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.ActionController;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.messages.MessageSinkManager;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.WarningDialog;
 import com.dmdirc.ui.core.components.StatusBarManager;
+import com.dmdirc.updater.UpdateChecker;
+import com.dmdirc.updater.Version;
+import com.dmdirc.updater.components.LauncherComponent;
+import com.dmdirc.updater.manager.UpdateManager;
 
 import java.awt.GraphicsEnvironment;
 import java.io.File;
@@ -57,12 +67,14 @@ public class ClientModule {
      * Provides an identity manager for the client.
      *
      * @param directory The directory to load settings from.
+     * @param commandLineParser The CLI parser to read command line settings from.
      * @return An initialised {@link IdentityManager}.
      */
     @Provides
     @Singleton
     public IdentityManager getIdentityManager(
-            @Directory(DirectoryType.BASE) final String directory) {
+            @Directory(DirectoryType.BASE) final String directory,
+            final CommandLineParser commandLineParser) {
         final IdentityManager identityManager = new IdentityManager(directory);
         IdentityManager.setIdentityManager(identityManager);
         identityManager.loadVersionIdentity();
@@ -73,6 +85,11 @@ public class ClientModule {
             handleInvalidConfigFile(identityManager, directory);
         }
 
+        if (commandLineParser.getDisableReporting()) {
+            identityManager.getGlobalConfigIdentity()
+                    .setOption("temp", "noerrorreporting", true);
+        }
+
         return identityManager;
     }
 
@@ -163,6 +180,103 @@ public class ClientModule {
         return messageSinkManager;
     }
 
+    /**
+     * Gets the command manager the client should use.
+     *
+     * @param serverManager The manager to use to iterate servers.
+     * @param identityController The controller to use to read settings.
+     * @param commandLoader The loader to use to populate default commands.
+     * @return The command manager the client should use.
+     */
+    @Provides
+    @Singleton
+    public CommandManager getCommandManager(
+            final ServerManager serverManager,
+            final IdentityController identityController,
+            final CommandLoader commandLoader) {
+        final CommandManager manager = new CommandManager(serverManager);
+        manager.initialise(identityController.getGlobalConfiguration());
+        CommandManager.setCommandManager(manager);
+        commandLoader.loadCommands(manager);
+        return manager;
+    }
+
+    /**
+     * Gets a command controller for use in the client.
+     *
+     * @param commandManager The manager to use as a controller.
+     * @return The command controller the client should use.
+     */
+    @Provides
+    public CommandController getCommandController(final CommandManager commandManager) {
+        return commandManager;
+    }
+
+    /**
+     * Gets an initialised plugin manager for the client.
+     *
+     * @param identityController The controller to read settings from.
+     * @param actionController The action controller to use for events.
+     * @param updateManager The update manager to inform about plugins.
+     * @param directory The directory to load and save plugins in.
+     * @return An initialised plugin manager for the client.
+     */
+    @Provides
+    @Singleton
+    public PluginManager getPluginManager(
+            final IdentityController identityController,
+            final ActionController actionController,
+            final UpdateManager updateManager,
+            @Directory(DirectoryType.PLUGINS) final String directory) {
+        final PluginManager manager = new PluginManager(identityController, actionController, updateManager, directory);
+        final CorePluginExtractor extractor = new CorePluginExtractor(manager, directory);
+        checkBundledPlugins(extractor, manager, identityController.getGlobalConfiguration());
+
+        for (String service : new String[]{"ui", "tabcompletion", "parser"}) {
+            ensureExists(extractor, manager, service);
+        }
+
+        // The user may have an existing parser plugin (e.g. twitter) which
+        // will satisfy the service existance check above, but will render the
+        // client pretty useless, so we'll force IRC extraction for now.
+        extractor.extractCorePlugins("parser_irc");
+        manager.refreshPlugins();
+        return manager;
+    }
+
+    /**
+     * Gets a core plugin extractor.
+     *
+     * @param pluginManager The plugin manager to notify about updates.
+     * @param directory The directory to extract plugins to.
+     * @return A plugin extractor for the client to use.
+     */
+    @Provides
+    public CorePluginExtractor getCorePluginExtractor(
+            final PluginManager pluginManager,
+            @Directory(DirectoryType.PLUGINS) final String directory) {
+        return new CorePluginExtractor(pluginManager, directory);
+    }
+
+    /**
+     * Gets an update manager for the client.
+     *
+     * @param commandLineParser CLI parser to use to find launcher version.
+     * @return The update manager to use.
+     */
+    @Provides
+    @Singleton
+    public UpdateManager getUpdateManager(final CommandLineParser commandLineParser) {
+        UpdateChecker.init();
+        final UpdateManager manager = UpdateChecker.getManager();
+
+        if (commandLineParser.getLauncherVersion() != null) {
+            LauncherComponent.setLauncherInfo(manager, commandLineParser.getLauncherVersion());
+        }
+
+        return manager;
+    }
+
     /**
      * 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
@@ -208,4 +322,51 @@ public class ClientModule {
         }
     }
 
+    /**
+     * Ensures that there is at least one provider of the specified
+     * service type by extracting matching core plugins. Plugins must be named
+     * so that their file name starts with the service type, and then an
+     * underscore.
+     *
+     * @param corePluginExtractor Extractor to use if the service doesn't exist
+     * @param pm The plugin manager to use to access services
+     * @param serviceType The type of service that should exist
+     */
+    public void ensureExists(
+            final CorePluginExtractor corePluginExtractor,
+            final PluginManager pm,
+            final String serviceType) {
+        if (pm.getServicesByType(serviceType).isEmpty()) {
+            corePluginExtractor.extractCorePlugins(serviceType + "_");
+            pm.refreshPlugins();
+        }
+    }
+
+    /**
+     * Checks whether the plugins bundled with this release of DMDirc are newer
+     * than the plugins known by the specified {@link PluginManager}. If the
+     * bundled plugins are newer, they are automatically extracted.
+     *
+     * @param corePluginExtractor Extractor to use if plugins need updating.
+     * @param pm The plugin manager to use to check plugins
+     * @param config The configuration source for bundled versions
+     */
+    private void checkBundledPlugins(
+            final CorePluginExtractor corePluginExtractor,
+            final PluginManager pm,
+            final ConfigManager config) {
+        for (PluginInfo plugin : pm.getPluginInfos()) {
+            if (config.hasOptionString("bundledplugins_versions", plugin.getMetaData().getName())) {
+                final Version bundled = new Version(config.getOption("bundledplugins_versions",
+                        plugin.getMetaData().getName()));
+                final Version installed = plugin.getMetaData().getVersion();
+
+                if (installed.compareTo(bundled) < 0) {
+                    corePluginExtractor.extractCorePlugins(plugin.getMetaData().getName());
+                    pm.reloadPlugin(plugin.getFilename());
+                }
+            }
+        }
+    }
+
 }

src/com/dmdirc/CorePluginExtractor.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2006-2013 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.dmdirc;
+
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.util.resourcemanager.ResourceManager;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Utility class that can extract bundled plugins.
+ */
+public class CorePluginExtractor {
+
+    /** The plugin manager to inform when plugins are updated. */
+    private final PluginManager pluginManager;
+    /** The directory to extract plugins to. */
+    private final String pluginDir;
+
+    /**
+     * Creates a new instance of {@link CorePluginExtractor}.
+     *
+     * @param pluginManager The plugin manager to inform when plugins are updated.
+     * @param pluginDir The directory to extract plugins to.
+     */
+    public CorePluginExtractor(final PluginManager pluginManager, final String pluginDir) {
+        this.pluginManager = pluginManager;
+        this.pluginDir = pluginDir;
+    }
+
+    /**
+     * Extracts plugins bundled with DMDirc to the user's profile's plugin
+     * directory.
+     *
+     * @param prefix If non-null, only plugins whose file name starts with
+     * this prefix will be extracted.
+     */
+    public void extractCorePlugins(final String prefix) {
+        final Map<String, byte[]> resources = ResourceManager.getResourceManager()
+                .getResourcesStartingWithAsBytes("plugins");
+        for (Map.Entry<String, byte[]> resource : resources.entrySet()) {
+            try {
+                final String resourceName = pluginDir + resource.getKey().substring(7);
+
+                if (prefix != null && !resource.getKey().substring(8).startsWith(prefix)) {
+                    continue;
+                }
+
+                final File newDir = new File(resourceName.substring(0,
+                        resourceName.lastIndexOf('/')) + "/");
+
+                if (!newDir.exists()) {
+                    newDir.mkdirs();
+                }
+
+                final File newFile = new File(newDir,
+                        resourceName.substring(resourceName.lastIndexOf('/') + 1,
+                        resourceName.length()));
+
+                if (!newFile.isDirectory()) {
+                    ResourceManager.getResourceManager().
+                            resourceToFile(resource.getValue(), newFile);
+
+                    final PluginInfo plugin = pluginManager.getPluginInfo(newFile
+                            .getAbsolutePath().substring(pluginManager.getDirectory().length()));
+
+                    if (plugin != null) {
+                        plugin.pluginUpdated();
+                    }
+                }
+            } catch (IOException ex) {
+                Logger.userError(ErrorLevel.LOW, "Failed to extract plugins", ex);
+            }
+        }
+    }
+
+}

src/com/dmdirc/Main.java

@@ -26,35 +26,24 @@ import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandline.CommandLineOptionsModule;
-import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
-import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.commandline.CommandLineParser;
-import com.dmdirc.commandparser.CommandLoader;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.logger.DMDircExceptionHandler;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.messages.MessageSinkManager;
-import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.plugins.ServiceProvider;
 import com.dmdirc.ui.WarningDialog;
 import com.dmdirc.ui.themes.ThemeManager;
-import com.dmdirc.updater.UpdateChecker;
-import com.dmdirc.updater.Version;
-import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.awt.GraphicsEnvironment;
-import java.io.File;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -88,14 +77,8 @@ public class Main implements LifecycleController {
     /** The plugin manager the client will use. */
     private final PluginManager pluginManager;
 
-    /** The command manager the client will use. */
-    private final CommandManager commandManager;
-
-    /** The command loader to use to initialise the command manager. */
-    private final CommandLoader commandLoader;
-
-    /** The config dir to use for the client. */
-    private final String configdir;
+    /** The extractor to use for core plugins. */
+    private final CorePluginExtractor corePluginExtractor;
 
     /** Instance of main, protected to allow subclasses direct access. */
     @Deprecated
@@ -109,10 +92,9 @@ public class Main implements LifecycleController {
      * @param actionManager The action manager the client will use.
      * @param commandLineParser The command-line parser used for this instance.
      * @param pluginManager The plugin manager the client will use.
-     * @param commandManager The command manager the client will use.
-     * @param commandLoader The command loader to use to initialise the command manager.
+     * @param commandManager Unused for now - TODO: remove me when it's injected somewhere sensible.
      * @param messageSinkManager Unused for now - TODO: remove me when it's injected somewhere sensible.
-     * @param configDir The base configuration directory to use.
+     * @param corePluginExtractor Extractor to use for core plugins.
      */
     @Inject
     public Main(
@@ -122,17 +104,14 @@ public class Main implements LifecycleController {
             final CommandLineParser commandLineParser,
             final PluginManager pluginManager,
             final CommandManager commandManager,
-            final CommandLoader commandLoader,
             final MessageSinkManager messageSinkManager,
-            @Directory(DirectoryType.BASE) final String configDir) {
+            final CorePluginExtractor corePluginExtractor) {
         this.identityManager = identityManager;
         this.serverManager = serverManager;
         this.actionManager = actionManager;
         this.commandLineParser = commandLineParser;
         this.pluginManager = pluginManager;
-        this.commandManager = commandManager;
-        this.commandLoader = commandLoader;
-        this.configdir = configDir;
+        this.corePluginExtractor = corePluginExtractor;
     }
 
     /**
@@ -162,29 +141,8 @@ public class Main implements LifecycleController {
      * @param args The command line arguments
      */
     public void init() {
-        UpdateChecker.init(this);
-
-        pluginManager.refreshPlugins();
-        checkBundledPlugins(pluginManager, identityManager.getGlobalConfiguration());
-
         ThemeManager.loadThemes();
 
-        commandLineParser.applySettings(identityManager.getGlobalConfigIdentity());
-
-        commandManager.initialise(identityManager.getGlobalConfiguration());
-        CommandManager.setCommandManager(commandManager);
-        commandLoader.loadCommands(commandManager);
-
-        for (String service : new String[]{"ui", "tabcompletion", "parser"}) {
-            ensureExists(pluginManager, service);
-        }
-
-        // The user may have an existing parser plugin (e.g. twitter) which
-        // will satisfy the service existance check above, but will render the
-        // client pretty useless, so we'll force IRC extraction for now.
-        extractCorePlugins("parser_irc");
-        pluginManager.refreshPlugins();
-
         loadUIs(pluginManager);
 
         doFirstRun();
@@ -239,18 +197,18 @@ public class Main implements LifecycleController {
      */
     private void handleMissingUI() {
         // Check to see if we have already tried this
-        if (IdentityManager.getIdentityManager().getGlobalConfiguration().hasOptionBool("debug", "uiFixAttempted")) {
+        if (identityManager.getGlobalConfiguration().hasOptionBool("debug", "uiFixAttempted")) {
             System.out.println("DMDirc is unable to load any compatible UI plugins.");
             if (!GraphicsEnvironment.isHeadless()) {
                 new WarningDialog(WarningDialog.NO_COMPAT_UIS_TITLE,
                         WarningDialog.NO_RECOV_UIS).displayBlocking();
             }
-            IdentityManager.getIdentityManager().getGlobalConfigIdentity().unsetOption("debug", "uiFixAttempted");
+            identityManager.getGlobalConfigIdentity().unsetOption("debug", "uiFixAttempted");
             System.exit(1);
         } else {
             // Try to extract the UIs again incase they changed between versions
             // and the user didn't update the UI plugin.
-            extractCorePlugins("ui_");
+            corePluginExtractor.extractCorePlugins("ui_");
 
             System.out.println("DMDirc has updated the UI plugins and needs to restart.");
 
@@ -260,52 +218,12 @@ public class Main implements LifecycleController {
             }
 
             // Allow the rebooted DMDirc to know that we have attempted restarting.
-            IdentityManager.getIdentityManager().getGlobalConfigIdentity()
-                    .setOption("debug", "uiFixAttempted", "true");
+            identityManager.getGlobalConfigIdentity().setOption("debug", "uiFixAttempted", "true");
             // Tell the launcher to restart!
             System.exit(42);
         }
     }
 
-    /**
-     * Ensures that there is at least one provider of the specified
-     * service type by extracting matching core plugins. Plugins must be named
-     * so that their file name starts with the service type, and then an
-     * underscore.
-     *
-     * @param pm The plugin manager to use to access services
-     * @param serviceType The type of service that should exist
-     */
-    public void ensureExists(final PluginManager pm, final String serviceType) {
-        if (pm.getServicesByType(serviceType).isEmpty()) {
-            extractCorePlugins(serviceType + "_");
-            pm.refreshPlugins();
-        }
-    }
-
-    /**
-     * Checks whether the plugins bundled with this release of DMDirc are newer
-     * than the plugins known by the specified {@link PluginManager}. If the
-     * bundled plugins are newer, they are automatically extracted.
-     *
-     * @param pm The plugin manager to use to check plugins
-     * @param config The configuration source for bundled versions
-     */
-    private void checkBundledPlugins(final PluginManager pm, final ConfigManager config) {
-        for (PluginInfo plugin : pm.getPluginInfos()) {
-            if (config.hasOptionString("bundledplugins_versions", plugin.getMetaData().getName())) {
-                final Version bundled = new Version(config.getOption("bundledplugins_versions",
-                        plugin.getMetaData().getName()));
-                final Version installed = plugin.getMetaData().getVersion();
-
-                if (installed.compareTo(bundled) < 0) {
-                    extractCorePlugins(plugin.getMetaData().getName());
-                    pm.reloadPlugin(plugin.getFilename());
-                }
-            }
-        }
-    }
-
     /**
      * Attempts to find and activate a service which provides a UI that we
      * can use.
@@ -332,10 +250,8 @@ public class Main implements LifecycleController {
             handleMissingUI();
         } else {
             // The fix worked!
-            if (IdentityManager.getIdentityManager().getGlobalConfiguration()
-                    .hasOptionBool("debug", "uiFixAttempted")) {
-                IdentityManager.getIdentityManager().getGlobalConfigIdentity()
-                        .unsetOption("debug", "uiFixAttempted");
+            if (identityManager.getGlobalConfiguration().hasOptionBool("debug", "uiFixAttempted")) {
+                identityManager.getGlobalConfigIdentity().unsetOption("debug", "uiFixAttempted");
             }
         }
     }
@@ -344,8 +260,8 @@ public class Main implements LifecycleController {
      * Executes the first run or migration wizards as required.
      */
     private void doFirstRun() {
-        if (IdentityManager.getIdentityManager().getGlobalConfiguration().getOptionBool("general", "firstRun")) {
-            IdentityManager.getIdentityManager().getGlobalConfigIdentity().setOption("general", "firstRun", "false");
+        if (identityManager.getGlobalConfiguration().getOptionBool("general", "firstRun")) {
+            identityManager.getGlobalConfigIdentity().setOption("general", "firstRun", "false");
             for (UIController controller : CONTROLLERS) {
                 controller.showFirstRunWizard();
             }
@@ -427,45 +343,11 @@ public class Main implements LifecycleController {
      *
      * @param prefix If non-null, only plugins whose file name starts with
      * this prefix will be extracted.
+     * @deprecated Go via a {@link CorePluginExtractor}.
      */
+    @Deprecated
     public void extractCorePlugins(final String prefix) {
-        final Map<String, byte[]> resources = ResourceManager.getResourceManager()
-                .getResourcesStartingWithAsBytes("plugins");
-        for (Map.Entry<String, byte[]> resource : resources.entrySet()) {
-            try {
-                final String resourceName = configdir + "plugins"
-                        + resource.getKey().substring(7);
-
-                if (prefix != null && !resource.getKey().substring(8).startsWith(prefix)) {
-                    continue;
-                }
-
-                final File newDir = new File(resourceName.substring(0,
-                        resourceName.lastIndexOf('/')) + "/");
-
-                if (!newDir.exists()) {
-                    newDir.mkdirs();
-                }
-
-                final File newFile = new File(newDir,
-                        resourceName.substring(resourceName.lastIndexOf('/') + 1,
-                        resourceName.length()));
-
-                if (!newFile.isDirectory()) {
-                    ResourceManager.getResourceManager().
-                            resourceToFile(resource.getValue(), newFile);
-
-                    final PluginInfo plugin = pluginManager.getPluginInfo(newFile
-                            .getAbsolutePath().substring(pluginManager.getDirectory().length()));
-
-                    if (plugin != null) {
-                        plugin.pluginUpdated();
-                    }
-                }
-            } catch (IOException ex) {
-                Logger.userError(ErrorLevel.LOW, "Failed to extract plugins", ex);
-            }
-        }
+        corePluginExtractor.extractCorePlugins(prefix);
     }
 
 }

src/com/dmdirc/ServerManager.java

@@ -23,10 +23,10 @@
 package com.dmdirc;
 
 import com.dmdirc.actions.wrappers.AliasWrapper;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.logger.ErrorLevel;
@@ -61,18 +61,24 @@ public class ServerManager implements ServerFactory {
     /** The identity controller to use to find profiles. */
     private final IdentityController identityController;
 
+    /** A provider of {@link CommandController}s to pass to servers. */
+    private final Provider<CommandController> commandController;
+
     /**
      * Creates a new instance of ServerManager.
      *
      * @param parserFactoryProvider The provider of {@link ParserFactory}s to give to servers.
      * @param identityController The identity controller to use to find profiles.
+     * @param commandController A provider of {@link CommandController}s to pass to servers.
      */
     @Inject
     public ServerManager(
             final Provider<ParserFactory> parserFactoryProvider,
-            final IdentityController identityController) {
+            final IdentityController identityController,
+            final Provider<CommandController> commandController) {
         this.parserFactoryProvider = parserFactoryProvider;
         this.identityController = identityController;
+        this.commandController = commandController;
     }
 
     /** {@inheritDoc} */
@@ -87,7 +93,7 @@ public class ServerManager implements ServerFactory {
                 parserFactoryProvider.get(),
                 WindowManager.getWindowManager(),
                 AliasWrapper.getAliasWrapper(),
-                CommandManager.getCommandManager(),
+                commandController.get(),
                 uri,
                 profile);
     }

src/com/dmdirc/commandline/CommandLineParser.java

@@ -25,11 +25,9 @@ package com.dmdirc.commandline;
 import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.commands.global.NewServer;
-import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.updater.components.LauncherComponent;
 import com.dmdirc.util.resourcemanager.DMDircResourceManager;
 
 import java.io.File;
@@ -68,7 +66,7 @@ public class CommandLineParser {
     private boolean disablereporting;
 
     /** The version string passed for the launcher. */
-    private String launcherVersion = "";
+    private String launcherVersion;
 
     /** The configuration directory. */
     private String configDirectory;
@@ -358,16 +356,22 @@ public class CommandLineParser {
     }
 
     /**
-     * Applies any applicable settings to the config identity.
+     * Indicates whether the user has requested error reporting be disabled.
+     *
+     * @return True if the user has disabled reporting, false otherwise.
      */
-    public void applySettings(final Identity globalIdentity) {
-        if (disablereporting) {
-            globalIdentity.setOption("temp", "noerrorreporting", true);
-        }
+    public boolean getDisableReporting() {
+        return disablereporting;
+    }
 
-        if (!launcherVersion.isEmpty()) {
-            LauncherComponent.setLauncherInfo(launcherVersion);
-        }
+    /**
+     * Returns the provided launcher version, if any.
+     *
+     * @return The version supplied by the launcher, or {@code null} if no
+     * launcher is identified.
+     */
+    public String getLauncherVersion() {
+        return launcherVersion;
     }
 
     /**

src/com/dmdirc/commandparser/CommandManager.java

@@ -39,16 +39,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import lombok.Getter;
 
 /**
  * The command manager creates and manages a single instance of all commands,
  * and provides methods to load each group of commands into a parser instance.
  */
-@Singleton
 @SuppressWarnings("PMD.UnusedPrivateField")
 public class CommandManager implements CommandController {
 
@@ -81,7 +77,6 @@ public class CommandManager implements CommandController {
      *
      * @param serverManager the manager to use to iterate servers.
      */
-    @Inject
     public CommandManager(final ServerManager serverManager) {
         this.serverManager = serverManager;
     }

src/com/dmdirc/plugins/PluginManager.java

@@ -23,8 +23,6 @@
 package com.dmdirc.plugins;
 
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
-import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
@@ -32,8 +30,8 @@ import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.components.PluginComponent;
+import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.util.collections.MapList;
 
 import java.io.File;
@@ -49,13 +47,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 /**
  * Searches for and manages plugins and services.
  */
-@Singleton
 public class PluginManager implements ActionListener, ServiceManager {
 
     /** List of known plugins' file names to their corresponding {@link PluginInfo} objects. */
@@ -73,6 +67,9 @@ public class PluginManager implements ActionListener, ServiceManager {
     /** The action controller to use for events. */
     private final ActionController actionController;
 
+    /** The update manager to inform about plugins. */
+    private final UpdateManager updateManager;
+
     /** Map of services. */
     private final Map<String, Map<String, Service>> services = new HashMap<>();
 
@@ -84,15 +81,17 @@ public class PluginManager implements ActionListener, ServiceManager {
      *
      * @param identityController The identity controller to use for configuration options.
      * @param actionController The action controller to use for events.
+     * @param updateManager The update manager to inform about plugins.
      * @param directory The directory to load plugins from.
      */
-    @Inject
     public PluginManager(
             final IdentityController identityController,
             final ActionController actionController,
-            @Directory(DirectoryType.PLUGINS) final String directory) {
+            final UpdateManager updateManager,
+            final String directory) {
         this.identityController = identityController;
         this.actionController = actionController;
+        this.updateManager = updateManager;
         this.directory = directory;
         this.globalClassLoader = new GlobalClassLoader(this);
 
@@ -265,7 +264,7 @@ public class PluginManager implements ActionListener, ServiceManager {
             if ((metadata.getUpdaterId() > 0 && metadata.getVersion().isValid())
                     || (identityController.getGlobalConfiguration()
                     .hasOptionInt("plugin-addonid", metadata.getName()))) {
-                UpdateChecker.getManager().addComponent(new PluginComponent(pluginInfo));
+                updateManager.addComponent(new PluginComponent(pluginInfo));
             }
 
             knownPlugins.put(filename.toLowerCase(), pluginInfo);

src/com/dmdirc/updater/UpdateChecker.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.updater;
 
-import com.dmdirc.Main;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
@@ -107,9 +106,9 @@ public final class UpdateChecker implements Runnable {
      *
      * @param main Parent Main class
      */
-    public static void init(final Main main) {
+    public static void init() {
         manager = new DMDircUpdateManager(IdentityManager.getIdentityManager()
-                .getGlobalConfiguration(), IdentityManager.getIdentityManager().getConfigDir(), 3, main);
+                .getGlobalConfiguration(), IdentityManager.getIdentityManager().getConfigDir(), 3);
 
         initTimer();
     }

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

@@ -35,15 +35,6 @@ import java.io.File;
  */
 public class ClientComponent implements UpdateComponent {
 
-    // @deprecated This is only needed because we need to show a UI for
-    // manual installs. This should be removed at some point.
-    /** Reference to parent Main. */
-    final Main main;
-
-    public ClientComponent(final Main main) {
-        this.main = main;
-    }
-
     /** {@inheritDoc} */
     @Override
     public String getName() {
@@ -128,7 +119,7 @@ public class ClientComponent implements UpdateComponent {
             // @deprecated Should be removed when updater UI changes are
             // implemented.
             final String message = this.getManualInstructions(path);
-            main.getUI().showMessageDialog("Client update downloaded", message);
+            Main.mainInstance.getUI().showMessageDialog("Client update downloaded", message);
         }
 
         return true;

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.updater.components;
 
-import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;
+import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.util.resourcemanager.ZipResourceManager;
 
 import java.io.File;
@@ -44,9 +44,10 @@ public class LauncherComponent implements UpdateComponent {
     /**
      * Parses the specified launcher information.
      *
+     * @param manager THe manager to update with the launcher component.
      * @param info The platform and version of the launcher, separated by '-'.
      */
-    public static void setLauncherInfo(final String info) {
+    public static void setLauncherInfo(final UpdateManager manager, final String info) {
         final int hpos = info.indexOf('-');
         final int cpos = info.indexOf(',');
 
@@ -61,7 +62,7 @@ public class LauncherComponent implements UpdateComponent {
             version = new Version(info.substring(hpos + 1, cpos));
         }
 
-        UpdateChecker.getManager().addComponent(new LauncherComponent());
+        manager.addComponent(new LauncherComponent());
     }
 
     /**

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.updater.manager;
 
-import com.dmdirc.Main;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.updater.UpdateChannel;
@@ -56,17 +55,16 @@ public class DMDircUpdateManager extends CachingUpdateManagerImpl {
      * @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 main Instance of main for ClientComponent
      */
     public DMDircUpdateManager(final ConfigManager configManager,
-            final String tempFolder, final int threads, final Main main) {
+            final String tempFolder, final int threads) {
         super(new ThreadPoolExecutor(threads, threads, 1, TimeUnit.MINUTES,
                 new LinkedBlockingQueue<Runnable>(), new NamedThreadFactory()),
                 new NaiveConsolidator(),
                 new ConfigComponentPolicy(configManager));
 
         // @deprecated See ClientComponent
-        addComponent(new ClientComponent(main));
+        addComponent(new ClientComponent());
         addComponent(new ModeAliasesComponent());
         addComponent(new DefaultsComponent());
 

test/com/dmdirc/ServerManagerTest.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc;
 
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 
@@ -43,11 +44,13 @@ public class ServerManagerTest {
 
     @Mock private IdentityController identityController;
     @Mock private Provider<ParserFactory> parserFactoryProvider;
+    @Mock private Provider<CommandController> commandControllerProvider;
     private ServerManager serverManager;
 
     @Before
     public void setUp() throws Exception {
-        serverManager = new ServerManager(parserFactoryProvider, identityController);
+        serverManager = new ServerManager(parserFactoryProvider,
+                identityController, commandControllerProvider);
     }
 
     @After

test/com/dmdirc/TestMain.java

@@ -6,6 +6,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.updater.manager.UpdateManager;
 
 import java.io.File;
 import java.io.IOException;
@@ -19,11 +20,8 @@ public class TestMain extends Main {
     private static Main instance;
 
     private final IdentityManager identityManager;
-    private final ServerManager serverManager;
-    private final ActionManager actionManager;
     private final PluginManager pluginManager;
     private final CommandManager commandManager;
-    private final String configdir;
 
     public TestMain(final IdentityManager identityManager,
             final ServerManager serverManager,
@@ -31,15 +29,12 @@ public class TestMain extends Main {
             final CommandLineParser commandLineParser,
             final PluginManager pluginManager,
             final CommandManager commandManager,
-            final String configDir) {
+            final CorePluginExtractor corePluginExtractor) {
         super(identityManager, serverManager, actionManager, commandLineParser,
-                pluginManager, commandManager, null, null, configDir);
+                pluginManager, commandManager, null, corePluginExtractor);
         this.identityManager = identityManager;
-        this.serverManager = serverManager;
-        this.actionManager = actionManager;
         this.pluginManager = pluginManager;
         this.commandManager = commandManager;
-        this.configdir = configDir;
     }
 
     /** {@inheritDoc} */
@@ -93,11 +88,15 @@ public class TestMain extends Main {
                 final ActionManager actionManager = new ActionManager(serverManager, identityManager);
                 ActionManager.setActionManager(actionManager);
 
-                final PluginManager pluginManager = new PluginManager(identityManager, actionManager, pluginDirectory);
+                final PluginManager pluginManager = new PluginManager(
+                        identityManager, actionManager,
+                        mock(UpdateManager.class), pluginDirectory);
+                final CorePluginExtractor corePluginExtractor =
+                        new CorePluginExtractor(pluginManager, pluginDirectory);
 
                 instance = new TestMain(identityManager, serverManager,
                         actionManager, null, pluginManager,
-                        new CommandManager(serverManager), configDirectory);
+                        new CommandManager(serverManager), corePluginExtractor);
                 instance.init();
             } catch (IOException ex) {
                 // Blargh.