Fixes issue 1568. ActionGroupValidator no longer cares about file names, FileNameValidator now allows - and _, AMD now uses a chain of both

git-svn-id: http://svn.dmdirc.com/trunk@4467 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/config/prefs/validator/ActionGroupValidator.java

@@ -29,10 +29,6 @@ import com.dmdirc.actions.ActionManager;
  */
 public class ActionGroupValidator implements Validator<String> {
 
-    /** Filename regex. */
-    private static final String FILENAME_REGEX = "[A-Za-z0-9 \\-_]+";
-    /** Failure reason for regex failures. */
-    private static final String FAILURE_REGEX = "Must be a valid filename.";
     /** Failure reason for duplicates. */
     private static final String FAILURE_EXISTS = "Must not already exist.";
 
@@ -40,15 +36,13 @@ public class ActionGroupValidator implements Validator<String> {
      * Instantiates a new filename validator.
      */
     public ActionGroupValidator() {
-    //Do nothing
+        //Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
     public ValidationResponse validate(final String object) {
-        if (!object.matches(FILENAME_REGEX)) {
-            return new ValidationResponse(FAILURE_REGEX);
-        } else if (ActionManager.getGroups().containsKey(object)) {
+        if (ActionManager.getGroups().containsKey(object)) {
             return new ValidationResponse(FAILURE_EXISTS);
         } else {
             return new ValidationResponse();

src/com/dmdirc/config/prefs/validator/FileNameValidator.java

@@ -28,7 +28,7 @@ package com.dmdirc.config.prefs.validator;
 public class FileNameValidator implements Validator<String> {
 
     /** Filename regex. */
-    private static final String FILENAME_REGEX = "[A-Za-z0-9 ]+";
+    private static final String FILENAME_REGEX = "[A-Za-z0-9 \\-_]+";
     /** Failure reason. */
     private static final String FAILURE_REASON = "Must be a valid filename";
 

src/com/dmdirc/ui/swing/dialogs/actionsmanager/ActionsManagerDialog.java

@@ -31,6 +31,7 @@ import com.dmdirc.actions.interfaces.ActionType;
 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.ui.swing.components.TextLabel;
 import com.dmdirc.ui.swing.MainFrame;
 import com.dmdirc.ui.swing.SwingController;
@@ -157,6 +158,7 @@ public final class ActionsManagerDialog extends StandardDialog implements Action
         edit = new JButton("Edit");
         delete = new JButton("Delete");
         groupPanel = new JPanel();
+        groupPanel.setName("Groups");
 
         groupPanel.setBorder(BorderFactory.createTitledBorder(groupPanel.getBorder(),
                 "Groups"));
@@ -299,11 +301,12 @@ public final class ActionsManagerDialog extends StandardDialog implements Action
     /**
      * Prompts then adds an action group.
      */
+    @SuppressWarnings("unchecked")
     private void addGroup() {
-        final StandardInputDialog inputDialog = new StandardInputDialog(SwingController.getMainFrame(), false,
-                "New action group",
+        final StandardInputDialog inputDialog = new StandardInputDialog(SwingController.getMainFrame(),
+                false, "New action group",
                 "Please enter the name of the new action group",
-                new ActionGroupValidator()) {
+                new ValidatorChain<String>(new FileNameValidator(), new ActionGroupValidator())) {
 
             /**
              * A version number for this class. It should be changed whenever the class
@@ -338,13 +341,14 @@ public final class ActionsManagerDialog extends StandardDialog implements Action
     /**
      * Prompts then edits an action group.
      */
+    @SuppressWarnings("unchecked")
     private void editGroup() {
         final String oldName =
                 ((ActionGroup) groups.getSelectedValue()).getName();
         final StandardInputDialog inputDialog = new StandardInputDialog(SwingController.getMainFrame(), false,
                 "Edit action group",
                 "Please enter the new name of the action group",
-                new FileNameValidator()) {
+                new ValidatorChain<String>(new FileNameValidator(), new ActionGroupValidator())) {
 
             /**
              * A version number for this class. It should be changed whenever the class