Dont require UI to create aliases.

Change-Id: I01e8bbd9beb0dfd76827455d2939a9e6ff7d74ec
Reviewed-on: http://gerrit.dmdirc.com/3527
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/commandparser/aliases/CoreAliasDialogModel.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.aliases;
 
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.interfaces.ui.AliasDialogModel;
 import com.dmdirc.interfaces.ui.AliasDialogModelListener;
 import com.dmdirc.util.collections.ListenerList;
@@ -69,18 +70,27 @@ public class CoreAliasDialogModel implements AliasDialogModel {
     }
 
     @Override
-    public void addAlias(final Alias alias) {
-        Preconditions.checkNotNull(alias);
-        aliases.put(alias.getName(), alias);
+    public void addAlias(final String name,
+            final int minArguments,
+            final String substitution) {
+        Preconditions.checkNotNull(name);
+        Preconditions.checkArgument(!aliases.containsKey(name));
+        Preconditions.checkNotNull(substitution);
+        Preconditions.checkArgument(minArguments >= 0);
+        final Alias alias = new Alias(CommandType.TYPE_GLOBAL, name, minArguments, substitution);
+        aliases.put(name, alias);
         listeners.getCallable(AliasDialogModelListener.class).aliasAdded(alias);
     }
 
     @Override
-    public void editAlias(final String name, final Alias alias) {
+    public void editAlias(final String name,
+            final int minArguments,
+            final String substitution) {
         Preconditions.checkNotNull(name);
-        Preconditions.checkNotNull(alias);
+        Preconditions.checkNotNull(substitution);
+        Preconditions.checkArgument(minArguments >= 0);
         Preconditions.checkArgument(aliases.containsKey(name));
-        Preconditions.checkArgument(name.equals(alias.getName()));
+        final Alias alias = new Alias(CommandType.TYPE_GLOBAL, name, minArguments, substitution);
         aliases.put(name, alias);
         listeners.getCallable(AliasDialogModelListener.class).aliasEdited(name);
     }

src/com/dmdirc/interfaces/ui/AliasDialogModel.java

@@ -52,21 +52,23 @@ public interface AliasDialogModel {
     /**
      * Adds an alias to the model.
      *
-     * @param alias Alias to add.
+     * @param name         Name for the new alias
+     * @param minArguments Minimum number of arguments for the new alias
+     * @param substitution Substitution for the new alias
      */
-    void addAlias(final Alias alias);
+    void addAlias(String name, int minArguments, String substitution);
 
     /**
      * Edits the specified alias in the model.
      *
-     * @param name  Name of the alias to edit
-     * @param alias Alias to replace it with
+     * @param name         Name of the alias to edit
+     * @param minArguments Minimum number of arguments for the new alias
+     * @param substitution Substitution for the new alias
      */
-    void editAlias(final String name, final Alias alias);
+    void editAlias(final String name, int minArguments, String substitution);
 
     /**
-     * Renames an existing alias in the model. This method should not be used for renaming an alias
-     * {@link #renameAlias(String, String)}
+     * Renames an existing alias in the model.
      *
      * @param oldName Old name for the alias
      * @param newName New name for the alias

test/com/dmdirc/commandparser/aliases/CoreAliasDialogModelTest.java

@@ -87,7 +87,7 @@ public class CoreAliasDialogModelTest {
         when(aliasModel.getAliases()).thenReturn(aliases);
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
         assertEquals(model.getAliases().size(), 0);
-        model.addAlias(alias1);
+        model.addAlias(alias1.getName(), alias1.getMinArguments(), alias1.getSubstitution());
         assertEquals(model.getAliases().size(), 1);
     }
 
@@ -96,7 +96,7 @@ public class CoreAliasDialogModelTest {
         when(aliasModel.getAliases()).thenReturn(aliases);
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
         model.addListener(listener);
-        model.addAlias(alias1);
+        model.addAlias(alias1.getName(), alias1.getMinArguments(), alias1.getSubstitution());
         verify(listener).aliasAdded(alias1);
     }
 
@@ -107,27 +107,17 @@ public class CoreAliasDialogModelTest {
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
         assertEquals(model.getAliases().size(), 1);
         assertEquals(model.getAlias("alias1").get().getMinArguments(), 0);
-        model.editAlias("alias1", alias2Edited);
+        model.editAlias("alias1", alias2Edited.getMinArguments(), alias2Edited.getSubstitution());
         assertEquals(model.getAlias("alias1").get().getMinArguments(), 1);
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testEditAliasFail() {
-        aliases.add(alias1);
-        when(aliasModel.getAliases()).thenReturn(aliases);
-        final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
-        assertEquals(model.getAliases().size(), 1);
-        assertEquals(model.getAlias("alias1").get().getMinArguments(), 0);
-        model.editAlias("alias1", alias2);
-    }
-
     @Test
     public void testEditAliasListener() {
         aliases.add(alias1);
         when(aliasModel.getAliases()).thenReturn(aliases);
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
         model.addListener(listener);
-        model.editAlias("alias1", alias2Edited);
+        model.editAlias("alias1", alias2Edited.getMinArguments(), alias2Edited.getSubstitution());
         verify(listener).aliasEdited("alias1");
     }
 
@@ -218,9 +208,9 @@ public class CoreAliasDialogModelTest {
         when(aliasModel.getAliases()).thenReturn(aliases);
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
         model.addListener(listener);
-        model.addAlias(alias1);
+        model.addAlias(alias1.getName(), alias1.getMinArguments(), alias1.getSubstitution());
         model.removeListener(listener);
-        model.addAlias(alias2);
+        model.addAlias(alias2.getName(), alias2.getMinArguments(), alias2.getSubstitution());
         verify(listener).aliasAdded(alias1);
         verify(listener, never()).aliasAdded(alias2);
     }