Inject the PluginManager.

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

src/com/dmdirc/ClientModule.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.commandline.CommandLineOptionsModule;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.IdentityController;
 
 import javax.inject.Singleton;
@@ -88,4 +89,15 @@ public class ClientModule {
         return actionManager;
     }
 
+    /**
+     * Provides an action controller.
+     *
+     * @param actionManager The action manager to use as a controller.
+     * @return An action controller to use.
+     */
+    @Provides
+    public ActionController getActionController(final ActionManager actionManager) {
+        return actionManager;
+    }
+
 }

src/com/dmdirc/Main.java

@@ -87,6 +87,9 @@ public class Main implements LifecycleController {
     /** The command-line parser used for this instance. */
     private final CommandLineParser commandLineParser;
 
+    /** The plugin manager the client will use. */
+    private final PluginManager pluginManager;
+
     /** The config dir to use for the client. */
     private final String configdir;
 
@@ -94,9 +97,6 @@ public class Main implements LifecycleController {
     @Deprecated
     public static Main mainInstance;
 
-    /** Instance of pluginmanager used by this Main. */
-    protected PluginManager pluginManager;
-
     /**
      * Creates a new instance of {@link Main}.
      *
@@ -104,6 +104,7 @@ public class Main implements LifecycleController {
      * @param serverManager The server manager the client will use.
      * @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 configDir The base configuration directory to use.
      */
     @Inject
@@ -112,11 +113,13 @@ public class Main implements LifecycleController {
             final ServerManager serverManager,
             final ActionManager actionManager,
             final CommandLineParser commandLineParser,
+            final PluginManager pluginManager,
             @Directory(DirectoryType.BASE) final String configDir) {
         this.identityManager = identityManager;
         this.serverManager = serverManager;
         this.actionManager = actionManager;
         this.commandLineParser = commandLineParser;
+        this.pluginManager = pluginManager;
         this.configdir = configDir;
     }
 
@@ -157,9 +160,6 @@ public class Main implements LifecycleController {
 
         MessageSinkManager.getManager().loadDefaultSinks();
 
-        final String fs = System.getProperty("file.separator");
-        final String pluginDirectory = configdir + "plugins" + fs;
-        pluginManager = new PluginManager(identityManager, actionManager, pluginDirectory);
         pluginManager.refreshPlugins();
         checkBundledPlugins(pluginManager, identityManager.getGlobalConfiguration());
 

src/com/dmdirc/commandline/CommandLineOptionsModule.java

@@ -41,7 +41,9 @@ public class CommandLineOptionsModule {
         /** The base directory, where everything else lives. */
         BASE,
         /** The directory that identities are stored in. */
-        IDENTITIES;
+        IDENTITIES,
+        /** The directory that plugins are stored in. */
+        PLUGINS;
     }
 
     /**
@@ -65,11 +67,21 @@ public class CommandLineOptionsModule {
         this.parser = parser;
     }
 
+    /**
+     * Provides the command-line parser used for this instance.
+     *
+     * @return The command-line parser.
+     */
     @Provides
     public CommandLineParser getParser() {
         return parser;
     }
 
+    /**
+     * Provides the base directory that all DMDirc user data is stored in.
+     *
+     * @return The base directory.
+     */
     @Provides
     @Singleton
     @Directory(DirectoryType.BASE)
@@ -81,6 +93,19 @@ public class CommandLineOptionsModule {
         }
     }
 
+    /**
+     * Provides the path to the plugins directory.
+     *
+     * @param baseDirectory The base DMDirc directory.
+     * @return The plugin directory.
+     */
+    @Provides
+    @Singleton
+    @Directory(DirectoryType.PLUGINS)
+    public String getPluginsDirectory(final @Directory(DirectoryType.BASE) String baseDirectory) {
+        return baseDirectory + "plugins" + File.separator;
+    }
+
     /**
      * Initialises the location of the configuration directory.
      */

src/com/dmdirc/plugins/PluginManager.java

@@ -23,6 +23,8 @@
 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;
@@ -47,6 +49,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 /**
  * Searches for and manages plugins and services.
  */
@@ -80,10 +84,11 @@ public class PluginManager implements ActionListener, ServiceManager {
      * @param actionController The action controller to use for events.
      * @param directory The directory to load plugins from.
      */
+    @Inject
     public PluginManager(
             final IdentityController identityController,
             final ActionController actionController,
-            final String directory) {
+            @Directory(DirectoryType.PLUGINS) final String directory) {
         this.identityController = identityController;
         this.actionController = actionController;
         this.directory = directory;

test/com/dmdirc/TestMain.java

@@ -21,17 +21,20 @@ public class TestMain extends Main {
     private final IdentityManager identityManager;
     private final ServerManager serverManager;
     private final ActionManager actionManager;
+    private final PluginManager pluginManager;
     private final String configdir;
 
     public TestMain(final IdentityManager identityManager,
             final ServerManager serverManager,
             final ActionManager actionManager,
             final CommandLineParser commandLineParser,
+            final PluginManager pluginManager,
             final String configDir) {
-        super(identityManager, serverManager, actionManager, commandLineParser, configDir);
+        super(identityManager, serverManager, actionManager, commandLineParser, pluginManager, configDir);
         this.identityManager = identityManager;
         this.serverManager = serverManager;
         this.actionManager = actionManager;
+        this.pluginManager = pluginManager;
         this.configdir = configDir;
     }
 
@@ -47,9 +50,6 @@ public class TestMain extends Main {
             // to handleInvalidConfigFile(); here)
         }
 
-        final String fs = System.getProperty("file.separator");
-        final String pluginDirectory = configdir + "plugins" + fs;
-        pluginManager = new PluginManager(IdentityManager.getIdentityManager(), actionManager, pluginDirectory);
         pluginManager.refreshPlugins();
         CommandManager.initCommandManager(IdentityManager.getIdentityManager(), serverManager);
 
@@ -84,7 +84,12 @@ public class TestMain extends Main {
                 tempFile.delete();
                 tempFile.mkdir();
                 tempFile.deleteOnExit();
-                instance = new TestMain(identityManager, serverManager, actionManager, null, tempFile.getAbsolutePath() + File.separator);
+
+                final String configDirectory = tempFile.getAbsolutePath() + File.separator;
+                final String pluginDirectory = configDirectory + "plugins" + File.separator;
+                final PluginManager pluginManager = new PluginManager(identityManager, actionManager, pluginDirectory);
+
+                instance = new TestMain(identityManager, serverManager, actionManager, null, pluginManager, configDirectory);
                 instance.init();
             } catch (IOException ex) {
                 // Blargh.