Deprecate old aliases and remove core refs.

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

src/com/dmdirc/ClientModule.java

@@ -25,7 +25,6 @@ package com.dmdirc;
 import com.dmdirc.actions.ActionFactory;
 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;
@@ -271,11 +270,6 @@ public class ClientModule {
         return manager;
     }
 
-    @Provides(type = Provides.Type.SET)
-    public ActionGroup getAliasWrapper(final AliasWrapper aliasWrapper) {
-        return aliasWrapper;
-    }
-
     @Provides(type = Provides.Type.SET)
     @Singleton
     public ActionGroup getPerformWrapper(final PerformWrapper wrapper) {

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

@@ -38,7 +38,10 @@ import java.util.List;
 
 /**
  * Actions alias wrapper.
+ *
+ * @deprecated Replaced by {@link com.dmdirc.commandparser.aliases.Alias}.
  */
+@Deprecated
 public class Alias implements Serializable {
 
     /** A version number for this class. */

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

@@ -27,6 +27,7 @@ import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.commandparser.aliases.AliasManager;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -41,8 +42,11 @@ import javax.inject.Singleton;
 
 /**
  * Encapsulates alias actions.
+ *
+ * @deprecated Replaced by {@link AliasManager}.
  */
 @Singleton
+@Deprecated
 public class AliasWrapper extends ActionGroup {
 
     /** The name of the actions group we wrap. */

src/com/dmdirc/plugins/PluginInjectorInitialiser.java

@@ -28,7 +28,6 @@ import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionFactory;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.ActionSubstitutorFactory;
-import com.dmdirc.actions.wrappers.AliasWrapper;
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.prefs.PreferencesManager;
@@ -56,7 +55,6 @@ public class PluginInjectorInitialiser {
 
     private final ActionManager actionManager;
     private final ActionFactory actionFactory;
-    private final AliasWrapper aliasWrapper;
     private final PluginManager pluginManager;
     private final IdentityController identityController;
     private final ServerManager serverManager;
@@ -78,7 +76,6 @@ public class PluginInjectorInitialiser {
     @Inject
     public PluginInjectorInitialiser(final ActionManager actionManager,
             final ActionFactory actionFactory,
-            final AliasWrapper aliasWrapper,
             final PluginManager pluginManager,
             final IdentityController identityController,
             final ServerManager serverManager,
@@ -98,7 +95,6 @@ public class PluginInjectorInitialiser {
             @GlobalConfig final IconManager iconManager) {
         this.actionManager = actionManager;
         this.actionFactory = actionFactory;
-        this.aliasWrapper = aliasWrapper;
         this.pluginManager = pluginManager;
         this.identityController = identityController;
         this.serverManager = serverManager;
@@ -134,7 +130,6 @@ public class PluginInjectorInitialiser {
         injector.addParameter(statusBarManager);
         injector.addParameter(PreferencesManager.class, preferencesManager);
         injector.addParameter(PerformWrapper.class, performWrapper);
-        injector.addParameter(AliasWrapper.class, aliasWrapper);
         injector.addParameter(LifecycleController.class, lifecycleController);
         injector.addParameter(corePluginExtractor);
         injector.addParameter(actionFactory);

src/com/dmdirc/ui/input/TabCompleterFactory.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.input;
 
-import com.dmdirc.actions.wrappers.AliasWrapper;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -40,24 +39,16 @@ public class TabCompleterFactory {
 
     /** The command controller to use to find commands. */
     private final Provider<CommandController> commandController;
-    /** The alias wrapper to use for alias tab completion. */
-    // TODO: There should be an easy way to inject completion providers here, instead of
-    //       calling out the AliasWrapper in particular. Specifically, plugins should be able to
-    //       add things trivially.
-    private final Provider<AliasWrapper> aliasWrapper;
 
     /**
      * Creates a new instance of {@link TabCompleterFactory}.
      *
      * @param commandController The command controller to use to find commands.
-     * @param aliasWrapper      The alias wrapper to use for alias tab completion.
      */
     @Inject
     public TabCompleterFactory(
-            final Provider<CommandController> commandController,
-            final Provider<AliasWrapper> aliasWrapper) {
+            final Provider<CommandController> commandController) {
         this.commandController = commandController;
-        this.aliasWrapper = aliasWrapper;
     }
 
     /**
@@ -77,7 +68,6 @@ public class TabCompleterFactory {
             final CommandType... commandTypes) {
         final TabCompleter tabCompleter = new TabCompleter(commandController.get(), configProvider);
         addCommands(tabCompleter, commandTypes);
-        tabCompleter.addEntries(TabCompletionType.COMMAND, aliasWrapper.get().getAliases());
         return tabCompleter;
     }
 

test/com/dmdirc/actions/wrappers/AliasTest.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.actions.wrappers;
-
-import com.dmdirc.actions.ActionFactory;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-public class AliasTest {
-
-    @Test
-    public void testBasics() {
-        final Alias alias = new Alias(mock(ActionFactory.class), "testing");
-
-        assertEquals("testing", alias.getCommand());
-        assertEquals("testing-Any", alias.getName());
-        assertTrue(Arrays.equals(new String[]{""}, alias.getResponse()));
-        assertTrue(alias.matches(alias));
-    }
-
-}

test/com/dmdirc/actions/wrappers/AliasWrapperTest.java

@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.actions.wrappers;
-
-import com.dmdirc.actions.Action;
-import com.dmdirc.actions.ActionCondition;
-import com.dmdirc.actions.CoreActionComparison;
-import com.dmdirc.actions.CoreActionComponent;
-import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.logger.ErrorManager;
-import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.WindowManager;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-@RunWith(MockitoJUnitRunner.class)
-public class AliasWrapperTest {
-
-    @Mock private Action action;
-    @Mock private ActionCondition condition;
-    @Mock private WindowManager windowManager;
-    @Mock private CommandController commandController;
-    private List<ActionCondition> conditions;
-
-    private AliasWrapper aliasWrapper;
-
-    @BeforeClass
-    public static void overrideLogger() {
-        // We expect errors to be generated, so mock out the error manager.
-        Logger.setErrorManager(mock(ErrorManager.class));
-    }
-
-    @Before
-    public void setup() {
-        when(commandController.getCommandChar()).thenReturn('!');
-
-        conditions = new ArrayList<>();
-        aliasWrapper = new AliasWrapper(commandController, windowManager);
-
-        when(condition.getArg()).thenReturn(1);
-        when(condition.getComparison()).thenReturn(CoreActionComparison.STRING_EQUALS);
-        when(condition.getComponent()).thenReturn(CoreActionComponent.STRING_STRING);
-        when(condition.getTarget()).thenReturn("name");
-        when(action.getConditions()).thenReturn(conditions);
-        when(action.getTriggers()).thenReturn(new ActionType[] { CoreActionType.UNKNOWN_COMMAND });
-    }
-
-    @Test
-    public void testAddsAlias() {
-        conditions.add(condition);
-
-        aliasWrapper.add(action);
-        assertFalse(aliasWrapper.getAliases().isEmpty());
-    }
-
-    @Test
-    public void testDoesNotAddActionWithNoConditions() {
-        aliasWrapper.add(action);
-        assertTrue(aliasWrapper.getAliases().isEmpty());
-    }
-
-    @Test
-    public void testDoesNotAddActionWithWrongTrigger() {
-        when(action.getTriggers()).thenReturn(new ActionType[] { CoreActionType.ACTION_CREATED });
-
-        aliasWrapper.add(action);
-        assertTrue(aliasWrapper.getAliases().isEmpty());
-    }
-
-    @Test
-    public void testGetsCommandName() {
-        conditions.add(condition);
-        assertEquals("!name", aliasWrapper.getCommandName(action));
-    }
-
-    @Test
-    public void testGetsCommandNameWithMultipleConditions() {
-        final ActionCondition otherCondition = mock(ActionCondition.class);
-        when(otherCondition.getArg()).thenReturn(7);
-
-        conditions.add(otherCondition);
-        conditions.add(condition);
-        assertEquals("!name", aliasWrapper.getCommandName(action));
-    }
-
-    @Test
-    public void testGetCommandNameReturnsNullIfUnknown() {
-        assertNull(aliasWrapper.getCommandName(action));
-    }
-
-}