Add renamealias to corealiasdialogmodel

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

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

@@ -25,6 +25,8 @@ package com.dmdirc.commandparser.aliases;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 
+import com.google.common.base.Objects;
+
 /**
  * Describes a user-defined command alias.
  */
@@ -73,4 +75,21 @@ public class Alias implements CommandInfo {
         return type;
     }
 
+    @Override
+    public boolean equals(final Object object) {
+        if (!(object instanceof Alias)) {
+            return false;
+        }
+        final Alias alias = (Alias) object;
+        return Objects.equal(getName(), alias.getName())
+                && Objects.equal(getMinArguments(), alias.getMinArguments())
+                && Objects.equal(getSubstitution(), alias.getSubstitution())
+                && Objects.equal(getType(), alias.getType());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(name, minArguments, substitution, type);
+    }
+
 }

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

@@ -80,10 +80,24 @@ public class CoreAliasDialogModel implements AliasDialogModel {
         Preconditions.checkNotNull(name);
         Preconditions.checkNotNull(alias);
         Preconditions.checkArgument(aliases.containsKey(name));
+        Preconditions.checkArgument(name.equals(alias.getName()));
         aliases.put(name, alias);
         listeners.getCallable(AliasDialogModelListener.class).aliasEdited(name);
     }
 
+    @Override
+    public void renameAlias(final String oldName, final String newName) {
+        Preconditions.checkNotNull(oldName);
+        Preconditions.checkNotNull(newName);
+        Preconditions.checkArgument(aliases.containsKey(oldName));
+        Preconditions.checkArgument(!aliases.containsKey(newName));
+        final Alias alias = aliases.get(oldName);
+        aliases.remove(oldName);
+        aliases.put(newName, new Alias(alias.getType(), newName, alias.getMinArguments(),
+                alias.getSubstitution()));
+        listeners.getCallable(AliasDialogModelListener.class).aliasRenamed(oldName, newName);
+    }
+
     @Override
     public void removeAlias(final String name) {
         Preconditions.checkNotNull(name);

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

@@ -64,6 +64,15 @@ public interface AliasDialogModel {
      */
     void editAlias(final String name, final Alias alias);
 
+    /**
+     * Renames an existing alias in the model. This method should not be used for renaming an alias
+     * {@link #renameAlias(String, String)}
+     *
+     * @param oldName Old name for the alias
+     * @param newName New name for the alias
+     */
+    void renameAlias(final String oldName, final String newName);
+
     /**
      * Removes the named alias from the model.
      *

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

@@ -52,6 +52,14 @@ public interface AliasDialogModelListener {
      */
     void aliasEdited(String name);
 
+    /**
+     * An alias has been renamed.
+     *
+     * @param oldName Old name of the alias
+     * @param newName New name of the alias
+     */
+    void aliasRenamed(String oldName, String newName);
+
     /**
      * An alias selection has been changed.
      *

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

@@ -46,6 +46,7 @@ public class CoreAliasDialogModelTest {
     @Mock private AliasManager aliasModel;
     @Mock private AliasDialogModelListener listener;
     private final Alias alias1 = new Alias(CommandType.TYPE_GLOBAL, "alias1", 0, "");
+    private final Alias alias2Edited = new Alias(CommandType.TYPE_GLOBAL, "alias1", 1, "");
     private final Alias alias2 = new Alias(CommandType.TYPE_GLOBAL, "alias2", 0, "");
     private Set<Alias> aliases;
 
@@ -105,8 +106,19 @@ public class CoreAliasDialogModelTest {
         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", alias2Edited);
+        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);
-        assertEquals(model.getAlias("alias1").get(), alias2);
     }
 
     @Test
@@ -115,10 +127,33 @@ public class CoreAliasDialogModelTest {
         when(aliasModel.getAliases()).thenReturn(aliases);
         final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
         model.addListener(listener);
-        model.editAlias("alias1", alias2);
+        model.editAlias("alias1", alias2Edited);
         verify(listener).aliasEdited("alias1");
     }
 
+    @Test
+    public void testRenameAlias() {
+        aliases.add(alias1);
+        when(aliasModel.getAliases()).thenReturn(aliases);
+        final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
+        assertEquals(model.getAliases().size(), 1);
+        assertEquals(model.getAlias("alias1").get(), alias1);
+        model.renameAlias("alias1", "alias2");
+        assertEquals(model.getAlias("alias2").get(), alias2);
+    }
+
+    @Test
+    public void testRenameAliasListener() {
+        aliases.add(alias1);
+        when(aliasModel.getAliases()).thenReturn(aliases);
+        final CoreAliasDialogModel model = new CoreAliasDialogModel(aliasModel);
+        model.addListener(listener);
+        assertEquals(model.getAliases().size(), 1);
+        assertEquals(model.getAlias("alias1").get(), alias1);
+        model.renameAlias("alias1", "alias2");
+        verify(listener).aliasRenamed("alias1", "alias2");
+    }
+
     @Test
     public void testRemoveAlias() {
         aliases.add(alias1);