Inject some action wrappers.

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

src/com/dmdirc/ClientModule.java

@@ -22,7 +22,10 @@
 
 package com.dmdirc;
 
+import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.wrappers.AliasWrapper;
+import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.commandline.CommandLineOptionsModule;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
@@ -53,6 +56,9 @@ import java.awt.GraphicsEnvironment;
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Set;
+
+import javax.inject.Provider;
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -121,12 +127,18 @@ public class ClientModule {
      *
      * @param serverManager The server manager to use to iterate servers.
      * @param identityController The identity controller to use to look up settings.
+     * @param aliasWrapperProvider Provider for {@link AliasWrapper}s.
+     * @param performWrapperProvider Provider for {@link PerformWrapper}s.
      * @return An unitialised action manager.
      */
     @Provides
     @Singleton
-    public ActionManager getActionManager(final ServerManager serverManager, final IdentityController identityController) {
-        final ActionManager actionManager = new ActionManager(serverManager, identityController);
+    public ActionManager getActionManager(
+            final ServerManager serverManager,
+            final IdentityController identityController,
+            final Provider<Set<ActionGroup>> actionWrappersProvider) {
+        final ActionManager actionManager = new ActionManager(serverManager,
+                identityController, actionWrappersProvider);
         ActionManager.setActionManager(actionManager);
         return actionManager;
     }
@@ -296,6 +308,36 @@ public class ClientModule {
         return manager;
     }
 
+    /**
+     * Gets the alias actions wrapper.
+     *
+     * @param commandController The controller to register commands with
+     * @param serverManager The manager to use to iterate servers.
+     * @return An alias wrapper to use in the client.
+     */
+    @Provides(type = Provides.Type.SET)
+    @Singleton
+    public ActionGroup getAliasWrapper(
+            final CommandController commandController,
+            final ServerManager serverManager) {
+        final AliasWrapper wrapper = new AliasWrapper(commandController, serverManager);
+        AliasWrapper.setAliasWrapper(wrapper);
+        return wrapper;
+    }
+
+    /**
+     * Gets the performs actions wrapper.
+     *
+     * @return An performs wrapper to use in the client.
+     */
+    @Provides(type = Provides.Type.SET)
+    @Singleton
+    public ActionGroup getPerformWrapper() {
+        final PerformWrapper wrapper = new PerformWrapper();
+        PerformWrapper.setPerformWrapper(wrapper);
+        return wrapper;
+    }
+
     /**
      * 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/Main.java

@@ -95,6 +95,7 @@ public class Main implements LifecycleController {
      * @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 themeManager Unused for now - TODO: remove me when it's injected somewhere sensible.
+     * @param aliasWrapper Alias wrapper to provide to the actions manager.
      * @param corePluginExtractor Extractor to use for core plugins.
      */
     @Inject

src/com/dmdirc/actions/ActionManager.java

@@ -25,8 +25,6 @@ package com.dmdirc.actions;
 import com.dmdirc.Precondition;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.internal.WhoisNumericFormatter;
-import com.dmdirc.actions.wrappers.AliasWrapper;
-import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
@@ -49,6 +47,9 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+
+import javax.inject.Provider;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -67,6 +68,9 @@ public class ActionManager implements ActionController {
     /** The ServerManager currently in use. */
     private final ServerManager serverManager;
 
+    /** Provider for action wrappers. */
+    private final Provider<Set<ActionGroup>> actionWrappersProvider;
+
     /** A list of registered action types. */
     private final List<ActionType> types = new ArrayList<>();
 
@@ -100,11 +104,15 @@ public class ActionManager implements ActionController {
      *
      * @param serverManager The ServerManager in use.
      * @param identityManager The IdentityManager to load configuration from.
+     * @param actionWrappersProvider Provider of action wrappers.
      */
-    public ActionManager(final ServerManager serverManager, final IdentityController identityManager) {
+    public ActionManager(
+            final ServerManager serverManager,
+            final IdentityController identityManager,
+            final Provider<Set<ActionGroup>> actionWrappersProvider) {
         this.serverManager = serverManager;
         this.identityManager = identityManager;
-        this.identityManager.getGlobalConfiguration().getBinder().bind(this, ActionManager.class);
+        this.actionWrappersProvider = actionWrappersProvider;
     }
 
     /**
@@ -135,17 +143,24 @@ public class ActionManager implements ActionController {
         return me;
     }
 
-    /** {@inheritDoc} */
-    @Override
+    /**
+     * Initialiases the actions manager.
+     *
+     * @param aliasWrapper The wrapper to use for aliases.
+     * @param performWrapper The wrapper to use for performs.
+     */
     public void initialise() {
         log.info("Initialising the actions manager");
 
+        identityManager.getGlobalConfiguration().getBinder().bind(this, ActionManager.class);
+
         registerTypes(CoreActionType.values());
         registerComparisons(CoreActionComparison.values());
         registerComponents(CoreActionComponent.values());
 
-        addGroup(AliasWrapper.getAliasWrapper());
-        addGroup(PerformWrapper.getPerformWrapper());
+        for (ActionGroup wrapper : actionWrappersProvider.get()) {
+            addGroup(wrapper);
+        }
 
         new WhoisNumericFormatter(identityManager.getGlobalAddonIdentity()).register();
 

src/com/dmdirc/actions/wrappers/AliasWrapper.java

@@ -28,9 +28,7 @@ import com.dmdirc.ServerManager;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -48,7 +46,7 @@ public class AliasWrapper extends ActionGroup {
     private static AliasWrapper me;
 
     /** A list of registered alias names. */
-    private final List<String> aliases = new ArrayList<String>();
+    private final List<String> aliases = new ArrayList<>();
 
     /** Command controller to get command info from. */
     private final CommandController commandController;
@@ -73,21 +71,28 @@ public class AliasWrapper extends ActionGroup {
      *
      * @return A singleton instance of AliasWrapper
      */
-    public static synchronized AliasWrapper getAliasWrapper() {
-        if (me == null) {
-            me = new AliasWrapper(CommandManager.getCommandManager(), ActionManager.getActionManager().getServerManager());
-        }
-
+    @Deprecated
+    public static AliasWrapper getAliasWrapper() {
         return me;
     }
 
+    /**
+     * Sets the alias wrapper that will be used as a singleton instance.
+     *
+     * @param wrapper The wrapper to use as a singleton.
+     */
+    @Deprecated
+    public static void setAliasWrapper(final AliasWrapper wrapper) {
+        me = wrapper;
+    }
+
     /**
      * Retrieves a list of alias names registered with this wrapper.
      *
      * @return A list of alias names
      */
     public List<String> getAliases() {
-        return new ArrayList<String>(aliases);
+        return new ArrayList<>(aliases);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/actions/wrappers/PerformWrapper.java

@@ -44,7 +44,7 @@ import java.util.List;
 public class PerformWrapper extends ActionGroup {
 
     /** A singleton instance of the Perform Wrapper. */
-    private static final PerformWrapper ME = new PerformWrapper();
+    private static PerformWrapper me;
 
     /** The component name for per-profile perform conditions. */
     private static final String PP_COMP_NAME = "SERVER_PROFILE.IDENTITY_NAME";
@@ -52,7 +52,7 @@ public class PerformWrapper extends ActionGroup {
     /**
      * Creates a new instance of PerformWrapper.
      */
-    private PerformWrapper() {
+    public PerformWrapper() {
         super("performs");
     }
 
@@ -61,8 +61,19 @@ public class PerformWrapper extends ActionGroup {
      *
      * @return A singleton instance of PerformWrapper
      */
+    @Deprecated
     public static PerformWrapper getPerformWrapper() {
-        return ME;
+        return me;
+    }
+
+    /**
+     * Sets the singleton instance of the perform wrapper.
+     *
+     * @param wrapper The new singleton instance.
+     */
+    @Deprecated
+    public static void setPerformWrapper(final PerformWrapper wrapper) {
+        me = wrapper;
     }
 
     /** {@inheritDoc} */
@@ -217,7 +228,7 @@ public class PerformWrapper extends ActionGroup {
      */
     private Action createAction(final String server, final String network,
             final String profile) {
-        final List<ActionCondition> conditions = new ArrayList<ActionCondition>();
+        final List<ActionCondition> conditions = new ArrayList<>();
         final CoreActionComponent component =
                 server.isEmpty() ? CoreActionComponent.SERVER_NETWORK
                 : CoreActionComponent.SERVER_NAME;

src/com/dmdirc/interfaces/ActionController.java

@@ -189,11 +189,6 @@ public interface ActionController {
      */
     ActionType getType(final String type);
 
-    /**
-     * Initialises the action manager.
-     */
-    void initialise();
-
     /**
      * Loads actions from the user's directory.
      */

test/com/dmdirc/TestMain.java

@@ -1,5 +1,6 @@
 package com.dmdirc;
 
+import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.commandparser.CommandManager;
@@ -10,11 +11,17 @@ import com.dmdirc.updater.manager.UpdateManager;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collections;
+
+import javax.inject.Provider;
 import static org.mockito.Mockito.*;
 
 /**
  * Main subclass to init things needed for testing.
+ *
+ * @deprecated Tests shouldn't need the entire universe created.
  */
+@Deprecated
 public class TestMain extends Main {
 
     private static Main instance;
@@ -84,8 +91,11 @@ public class TestMain extends Main {
                 IdentityManager.getIdentityManager().loadVersionIdentity();
 
                 final ServerManager serverManager = mock(ServerManager.class);
+                final CommandManager commandManager = new CommandManager(serverManager);
 
-                final ActionManager actionManager = new ActionManager(serverManager, identityManager);
+                final ActionManager actionManager = new ActionManager(
+                        serverManager, identityManager,
+                        new DummyProvider<>(Collections.<ActionGroup>emptySet()));
                 ActionManager.setActionManager(actionManager);
 
                 final PluginManager pluginManager = new PluginManager(
@@ -95,8 +105,8 @@ public class TestMain extends Main {
                         new CorePluginExtractor(pluginManager, pluginDirectory);
 
                 instance = new TestMain(identityManager, serverManager,
-                        actionManager, null, pluginManager,
-                        new CommandManager(serverManager), corePluginExtractor);
+                        actionManager, null, pluginManager, commandManager,
+                        corePluginExtractor);
                 instance.init();
             } catch (IOException ex) {
                 // Blargh.
@@ -104,4 +114,18 @@ public class TestMain extends Main {
         }
         return instance;
     }
+
+    private static class DummyProvider<T> implements Provider<T> {
+
+        private final T value;
+
+        public DummyProvider(T value) {
+            this.value = value;
+        }
+
+        @Override
+        public T get() {
+            return value;
+        }
+    }
 }