Initialise the IdentityManager in Dagger.

No need for Main to do it - might as well get a fully-initialised
manager when we ask for one.

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

src/com/dmdirc/ClientModule.java

@@ -24,11 +24,22 @@ package com.dmdirc;
 
 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.config.IdentityManager;
+import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.interfaces.LifecycleController;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.WarningDialog;
 
+import java.awt.GraphicsEnvironment;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -43,14 +54,23 @@ public class ClientModule {
     /**
      * Provides an identity manager for the client.
      *
-     * @return An unitialised {@link IdentityManager}.
+     * @param directory The directory to load settings from.
+     * @return An initialised {@link IdentityManager}.
      */
     @Provides
     @Singleton
-    public IdentityManager getIdentityManager() {
-        final IdentityManager identityManager = new IdentityManager();
+    public IdentityManager getIdentityManager(
+            @Directory(DirectoryType.BASE) final String directory) {
+        final IdentityManager identityManager = new IdentityManager(directory);
         IdentityManager.setIdentityManager(identityManager);
         identityManager.loadVersionIdentity();
+
+        try {
+            identityManager.initialise();
+        } catch (InvalidIdentityFileException ex) {
+            handleInvalidConfigFile(identityManager, directory);
+        }
+
         return identityManager;
     }
 
@@ -68,11 +88,12 @@ public class ClientModule {
     /**
      * Provides a parser factory.
      *
+     * @param pluginManager The plugin manager to use to find parsers.
      * @return A parser factory for use in the client.
      */
     @Provides
-    public ParserFactory getParserFactory() {
-        return new ParserFactory(Main.mainInstance.getPluginManager());
+    public ParserFactory getParserFactory(final PluginManager pluginManager) {
+        return new ParserFactory(pluginManager);
     }
 
     /**
@@ -112,4 +133,49 @@ public class ClientModule {
         return controller;
     }
 
+    /**
+     * 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
+     * file, backing up the old one.
+     *
+     * @param identityManager The identity manager to re-initialise after installing defaults.
+     * @param configdir The directory to extract default settings into.
+     */
+    private void handleInvalidConfigFile(final IdentityManager identityManager, final String configdir) {
+        final String date = new SimpleDateFormat("yyyyMMddkkmmss").format(new Date());
+
+        final String message = "DMDirc has detected that your config file "
+                + "has become corrupted.<br><br>DMDirc will now backup "
+                + "your current config and try restarting with a default "
+                + "config.<br><br>Your old config will be saved as:<br>"
+                + "dmdirc.config." + date;
+
+        if (!GraphicsEnvironment.isHeadless()) {
+            new WarningDialog("Invalid Config File", message).displayBlocking();
+        }
+
+        // Let command-line users know what is happening.
+        System.out.println(message.replace("<br>", "\n"));
+
+        final File configFile = new File(configdir + "dmdirc.config");
+        final File newConfigFile = new File(configdir + "dmdirc.config." + date);
+
+        if (configFile.renameTo(newConfigFile)) {
+            try {
+                identityManager.initialise();
+            } catch (InvalidIdentityFileException iife) {
+                // This shouldn't happen!
+                Logger.appError(ErrorLevel.FATAL, "Unable to load global config", iife);
+            }
+        } else {
+            final String newMessage = "DMDirc was unable to rename the "
+                    + "global config file and is unable to fix this issue.";
+            if (!GraphicsEnvironment.isHeadless()) {
+                new WarningDialog("Invalid Config File", newMessage).displayBlocking();
+            }
+            System.out.println(newMessage.replace("<br>", "\n"));
+            System.exit(1);
+        }
+    }
+
 }

src/com/dmdirc/Main.java

@@ -33,7 +33,6 @@ 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.ui.UIController;
 import com.dmdirc.logger.DMDircExceptionHandler;
 import com.dmdirc.logger.ErrorLevel;
@@ -52,9 +51,7 @@ import com.dmdirc.util.resourcemanager.ResourceManager;
 import java.awt.GraphicsEnvironment;
 import java.io.File;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -143,6 +140,8 @@ public class Main implements LifecycleController {
      */
     @SuppressWarnings("PMD.AvoidCatchingThrowable")
     public static void main(final String[] args) {
+        Thread.setDefaultUncaughtExceptionHandler(new DMDircExceptionHandler());
+
         try {
             ObjectGraph graph = ObjectGraph.create(
                     new ClientModule(),
@@ -161,14 +160,6 @@ public class Main implements LifecycleController {
      * @param args The command line arguments
      */
     public void init() {
-        Thread.setDefaultUncaughtExceptionHandler(new DMDircExceptionHandler());
-
-        try {
-            identityManager.initialise(configdir);
-        } catch (InvalidIdentityFileException iife) {
-            handleInvalidConfigFile();
-        }
-
         UpdateChecker.init(this);
 
         MessageSinkManager.getManager().loadDefaultSinks();
@@ -276,48 +267,6 @@ public class Main implements LifecycleController {
         }
     }
 
-    /**
-     * 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
-     * file, backing up the old one.
-     */
-    private void handleInvalidConfigFile() {
-        final String date = new SimpleDateFormat("yyyyMMddkkmmss").format(new Date());
-
-        final String message = "DMDirc has detected that your config file "
-                + "has become corrupted.<br><br>DMDirc will now backup "
-                + "your current config and try restarting with a default "
-                + "config.<br><br>Your old config will be saved as:<br>"
-                + "dmdirc.config." + date;
-
-        if (!GraphicsEnvironment.isHeadless()) {
-            new WarningDialog("Invalid Config File", message).displayBlocking();
-        }
-
-        // Let command-line users know what is happening.
-        System.out.println(message.replace("<br>", "\n"));
-
-        final File configFile = new File(configdir + "dmdirc.config");
-        final File newConfigFile = new File(configdir + "dmdirc.config." + date);
-
-        if (configFile.renameTo(newConfigFile)) {
-            try {
-                identityManager.initialise(configdir);
-            } catch (InvalidIdentityFileException iife2) {
-                // This shouldn't happen!
-                Logger.appError(ErrorLevel.FATAL, "Unable to load global config", iife2);
-            }
-        } else {
-            final String newMessage = "DMDirc was unable to rename the "
-                    + "global config file and is unable to fix this issue.";
-            if (!GraphicsEnvironment.isHeadless()) {
-                new WarningDialog("Invalid Config File", newMessage).displayBlocking();
-            }
-            System.out.println(newMessage.replace("<br>", "\n"));
-            System.exit(1);
-        }
-    }
-
     /**
      * Ensures that there is at least one provider of the specified
      * service type by extracting matching core plugins. Plugins must be named

src/com/dmdirc/config/IdentityManager.java

@@ -87,8 +87,13 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     /** The config manager used for global settings. */
     private ConfigManager globalconfig;
 
-    /** Creates a new instance of IdentityManager. */
-    public IdentityManager() {
+    /**
+     * Creates a new instance of IdentityManager.
+     *
+     * @param directory The BASE config directory.
+     */
+    public IdentityManager(final String directory) {
+        this.configDirectory = directory;
     }
 
     /** {@inheritDoc} */
@@ -99,8 +104,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
     /** {@inheritDoc} */
     @Override
-    public void initialise(final String configDirectory) throws InvalidIdentityFileException {
-        this.configDirectory = configDirectory;
+    public void initialise() throws InvalidIdentityFileException {
         identities.clear();
 
         loadVersionIdentity();

src/com/dmdirc/interfaces/IdentityController.java

@@ -94,11 +94,10 @@ public interface IdentityController {
     /**
      * Loads all identity files.
      *
-     * @param configDirectory Config Directory.
      * @throws InvalidIdentityFileException If there is an error with the config
      * file.
      */
-    void initialise(final String configDirectory) throws InvalidIdentityFileException;
+    void initialise() throws InvalidIdentityFileException;
 
     /**
      * Get the config directory used by this identity controller.

src/com/dmdirc/plugins/PluginManager.java

@@ -50,10 +50,12 @@ 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. */

test/com/dmdirc/TestMain.java

@@ -46,7 +46,7 @@ public class TestMain extends Main {
     @Override
     public void init() {
         try {
-            IdentityManager.getIdentityManager().initialise(configdir);
+            identityManager.initialise();
         } catch (InvalidIdentityFileException ex) {
             // If a bad config dir exists, try to continue anyway, maybe the
             // test doesn't need it.
@@ -73,17 +73,6 @@ public class TestMain extends Main {
      */
     public static Main getTestMain() {
         if (instance == null) {
-            // TODO: Tests probably shouldn't rely on a config dir... Who knows
-            //       what the user has done with their config.
-            final IdentityManager identityManager = new IdentityManager();
-            IdentityManager.setIdentityManager(identityManager);
-            IdentityManager.getIdentityManager().loadVersionIdentity();
-
-            final ServerManager serverManager = mock(ServerManager.class);
-
-            final ActionManager actionManager = new ActionManager(serverManager, identityManager);
-            ActionManager.setActionManager(actionManager);
-
             try {
                 File tempFile = File.createTempFile("dmdirc", "test");
                 tempFile.delete();
@@ -92,6 +81,18 @@ public class TestMain extends Main {
 
                 final String configDirectory = tempFile.getAbsolutePath() + File.separator;
                 final String pluginDirectory = configDirectory + "plugins" + File.separator;
+
+                // TODO: Tests probably shouldn't rely on a config dir... Who knows
+                //       what the user has done with their config.
+                final IdentityManager identityManager = new IdentityManager(configDirectory);
+                IdentityManager.setIdentityManager(identityManager);
+                IdentityManager.getIdentityManager().loadVersionIdentity();
+
+                final ServerManager serverManager = mock(ServerManager.class);
+
+                final ActionManager actionManager = new ActionManager(serverManager, identityManager);
+                ActionManager.setActionManager(actionManager);
+
                 final PluginManager pluginManager = new PluginManager(identityManager, actionManager, pluginDirectory);
 
                 instance = new TestMain(identityManager, serverManager,