Desingleton the AliasWrapper.

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

src/com/dmdirc/ClientModule.java

@@ -344,23 +344,6 @@ public class ClientModule {
         return aliasWrapper;
     }
 
-    /**
-     * Gets the alias actions wrapper.
-     *
-     * @param commandController The controller to register commands with
-     * @param windowManager The manager to use to iterate windows.
-     * @return An alias wrapper to use in the client.
-     */
-    @Provides
-    @Singleton
-    public AliasWrapper getAliasWrapper(
-            final CommandController commandController,
-            final WindowManager windowManager) {
-        final AliasWrapper wrapper = new AliasWrapper(commandController, windowManager);
-        AliasWrapper.setAliasWrapper(wrapper);
-        return wrapper;
-    }
-
     /**
      * Gets the performs actions wrapper.
      *

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

@@ -232,7 +232,7 @@ public class Alias implements Serializable {
      */
     public Action createAction() {
         return actionFactory.create(
-                AliasWrapper.getAliasWrapper().getName(),
+                AliasWrapper.GROUP_NAME,
                 getName(),
                 new ActionType[] {CoreActionType.UNKNOWN_COMMAND, },
                 getResponse(),

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

@@ -37,13 +37,17 @@ import com.dmdirc.ui.input.TabCompletionType;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 /**
  * Encapsulates alias actions.
  */
+@Singleton
 public class AliasWrapper extends ActionGroup {
 
-    /** Singleton instance of the alias wrapper. */
-    private static AliasWrapper me;
+    /** The name of the actions group we wrap. */
+    protected static final String GROUP_NAME = "aliases";
 
     /** A list of registered alias names. */
     private final List<String> aliases = new ArrayList<>();
@@ -60,37 +64,16 @@ public class AliasWrapper extends ActionGroup {
      * @param commandController Command controller to get command info from.
      * @param windowManager The window manager to use to find root windows.
      */
+    @Inject
     public AliasWrapper(
             final CommandController commandController,
             final WindowManager windowManager) {
-        super("aliases");
+        super(GROUP_NAME);
 
         this.commandController = commandController;
         this.windowManager = windowManager;
     }
 
-    /**
-     * Retrieves a singleton instance of this alias wrapper.
-     *
-     * @return A singleton instance of AliasWrapper
-     * @deprecated Global state is bad.
-     */
-    @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 Global state is bad.
-     */
-    @Deprecated
-    public static void setAliasWrapper(final AliasWrapper wrapper) {
-        me = wrapper;
-    }
-
     /**
      * Retrieves a list of alias names registered with this wrapper.
      *