Fixes issue 3812: AMD groupname validation fails when editing a group

Change-Id: I86bf10717a12f341e9093f02cb97474eb771497d
Reviewed-on: http://gerrit.dmdirc.com/928
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

src/com/dmdirc/addons/ui_swing/dialogs/profiles/NoDuplicatesInListValidator.java → src/com/dmdirc/addons/ui_swing/components/validating/NoDuplicatesInListValidator.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.profiles;
+package com.dmdirc.addons.ui_swing.components.validating;
 
 import com.dmdirc.config.prefs.validator.ValidationResponse;
 import com.dmdirc.config.prefs.validator.Validator;
@@ -34,11 +34,11 @@ import javax.swing.JList;
 public class NoDuplicatesInListValidator implements Validator<String> {
 
     /** List. */
-    private JList list;
+    protected JList list;
     /** List to validate. */
-    private DefaultListModel model;
+    protected DefaultListModel model;
     /** Case sensitive. */
-    private boolean caseSensitive;
+    protected boolean caseSensitive;
 
     /**
      * Creates a new validator.
@@ -69,11 +69,35 @@ public class NoDuplicatesInListValidator implements Validator<String> {
     @Override
     public ValidationResponse validate(final String object) {
         final String string = caseSensitive ? object : object.toLowerCase();
-        if (model.indexOf(string) != -1 && (list.getSelectedValue() == null ||
-                !list.getSelectedValue().equals(string))) {
+        if (indexOfString(string) != -1 && (list.getSelectedValue() == null ||
+                !listValueToString(list.getSelectedValue()).equals(string))) {
                 return new ValidationResponse("Value is a duplicate");
         } else {
             return new ValidationResponse();
         }
     }
+
+    /**
+     * Converts the list object to a string for validation. Defaults to the
+     * objects toString method.
+     *
+     * @param object Object to convert
+     *
+     * @return String representation
+     */
+    public String listValueToString(final Object object) {
+        return object.toString();
+    }
+
+    /**
+     * Returns the index of an object represented by a string.  Defaults to
+     * searching for the string.
+     *
+     * @param string String to look for
+     *
+     * @return Index of the string of -1 if not found
+     */
+    public int indexOfString(final String string) {
+        return model.indexOf(string);
+    }
 }

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java

@@ -32,7 +32,6 @@ import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.config.prefs.validator.ActionGroupValidator;
 import com.dmdirc.config.prefs.validator.FileNameValidator;
 import com.dmdirc.config.prefs.validator.ValidatorChain;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
@@ -41,6 +40,7 @@ import com.dmdirc.addons.ui_swing.components.SortedListModel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionGroupListCellRenderer;
+import com.dmdirc.addons.ui_swing.components.validating.NoDuplicatesInListValidator;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 
 import java.awt.Window;
@@ -100,16 +100,22 @@ public final class ActionsManagerDialog extends StandardDialog implements
     private JPanel groupPanel;
     /** Are we saving? */
     private final AtomicBoolean saving = new AtomicBoolean(false);
+    /** Duplicate action group validator. */
+    private ValidatorChain<String> validator;
 
     /** 
      * Creates a new instance of ActionsManagerDialog.
      */
+    @SuppressWarnings("unchecked")
     private ActionsManagerDialog(final Window parentWindow,
             final SwingController controller) {
         super(Apple.isAppleUI() ? new AppleJFrame((MainFrame) parentWindow,
                 controller) : null, ModalityType.MODELESS);
 
         initComponents();
+        validator = new ValidatorChain<String>(
+                new ActionGroupNoDuplicatesInListValidator(groups,
+                (DefaultListModel) groups.getModel()), new FileNameValidator());
         addListeners();
         layoutGroupPanel();
         layoutComponents();
@@ -335,13 +341,12 @@ public final class ActionsManagerDialog extends StandardDialog implements
     /**
      * Prompts then adds an action group.
      */
-    @SuppressWarnings("unchecked")
     private void addGroup() {
+        final int index = groups.getSelectedIndex();
+        groups.getSelectionModel().clearSelection();
         final StandardInputDialog inputDialog = new StandardInputDialog(this,
                 ModalityType.DOCUMENT_MODAL, "New action group",
-                "Please enter the name of the new action group",
-                new ValidatorChain<String>(new FileNameValidator(),
-                new ActionGroupValidator())) {
+                "Please enter the name of the new action group", validator) {
 
             /**
              * A version number for this class. It should be changed whenever the class
@@ -354,6 +359,7 @@ public final class ActionsManagerDialog extends StandardDialog implements
             @Override
             public boolean save() {
                 if (!saving.getAndSet(true)) {
+                    groups.setSelectedIndex(index);
                     if (getText() == null || getText().isEmpty() && !ActionManager.
                             getGroups().
                             containsKey(getText())) {
@@ -371,7 +377,7 @@ public final class ActionsManagerDialog extends StandardDialog implements
             /** {@inheritDoc} */
             @Override
             public void cancelled() {
-                //Ignore
+                groups.setSelectedIndex(index);
             }
         };
         inputDialog.display(this);
@@ -380,16 +386,12 @@ public final class ActionsManagerDialog extends StandardDialog implements
     /**
      * Prompts then edits an action group.
      */
-    @SuppressWarnings("unchecked")
     private void editGroup() {
         final String oldName =
                 ((ActionGroup) groups.getSelectedValue()).getName();
         final StandardInputDialog inputDialog = new StandardInputDialog(this,
-                ModalityType.DOCUMENT_MODAL,
-                "Edit action group",
-                "Please enter the new name of the action group",
-                new ValidatorChain<String>(new FileNameValidator(),
-                new ActionGroupValidator())) {
+                ModalityType.DOCUMENT_MODAL, "Edit action group",
+                "Please enter the new name of the action group", validator) {
 
             /**
              * A version number for this class. It should be changed whenever the class
@@ -521,3 +523,52 @@ public final class ActionsManagerDialog extends StandardDialog implements
         }
     }
 }
+
+/**
+ * No duplicates list validator, overriden to work with action groups.
+ */
+class ActionGroupNoDuplicatesInListValidator extends NoDuplicatesInListValidator {
+
+    /**
+     * Creates a new validator.
+     *
+     * @param list List
+     * @param model Model to validate
+     */
+    public ActionGroupNoDuplicatesInListValidator(final JList list,
+            final DefaultListModel model) {
+        super(true, list, model);
+    }
+
+    /**
+     * Creates a new validator.
+     *
+     * @param list List
+     * @param caseSensitive Case sensitive check?
+     * @param model Model to validate
+     */
+    public ActionGroupNoDuplicatesInListValidator(final boolean caseSensitive,
+            final JList list, final DefaultListModel model) {
+        super(caseSensitive, list, model);
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public String listValueToString(final Object object) {
+        return ((ActionGroup) object).getName();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int indexOfString(final String string) {
+        final String value = caseSensitive ? string : string.toLowerCase();
+        int index = -1;
+        for (int i = 0; i < model.getSize(); i++) {
+            if (((ActionGroup) model.get(i)).getName().equals(value)) {
+                index = i;
+                break;
+            }
+        }
+        return index;
+    }
+}

src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileDetailPanel.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.profiles;
 
+import com.dmdirc.addons.ui_swing.components.validating.NoDuplicatesInListValidator;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.config.prefs.validator.FileNameValidator;
 import com.dmdirc.config.prefs.validator.IdentValidator;