Fix validation of actions (and the validating text field itself).

Change-Id: I5a3bc9f0a7e3840f02e24cc9e2a919314b3df424
Fixes-Issue: CLIENT-438
Fixes-Issue: CLIENT-437
Reviewed-on: http://gerrit.dmdirc.com/3159
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/addons/ui_swing/components/JIconTextField.java

@@ -36,6 +36,8 @@ import javax.swing.UIManager;
  */
 public class JIconTextField extends JTextField {
 
+    /** A version number for this class, used in serialisation. */
+    private static final long serialVersionUID = 1L;
     /** Insets used by a normal text field. */
     private final Insets dummyInsets;
     /** Icon to show, or null. */

src/com/dmdirc/addons/ui_swing/components/validating/ValidatingJTextField.java

@@ -105,21 +105,27 @@ public class ValidatingJTextField extends JIconTextField implements DocumentList
      */
     public void checkError() {
         final boolean previousStatus = getMessage() == null || getMessage().isEmpty();
+        final ValidationResponse vr = validator.validate(getText());
+        setMessage(vr.getFailureReason());
+        firePropertyChange("validationResult", previousStatus, !vr.isFailure());
+        if (vr.isFailure()) {
+            setIcon(errorIcon);
+        } else {
+            setIcon(null);
+        }
+    }
 
-        if (isEnabled()) {
-            final ValidationResponse vr = validator.validate(getText());
-            setMessage(vr.getFailureReason());
-            firePropertyChange("validationResult", previousStatus, !vr.isFailure());
-            if (vr.isFailure()) {
-                setIcon(errorIcon);
-            } else {
-                setIcon(null);
-            }
+    @Override
+    public void setEnabled(final boolean enabled) {
+        final boolean previousStatus = getMessage() == null || getMessage().isEmpty();
+        if (enabled) {
+            checkError();
         } else {
             setIcon(null);
             setMessage(null);
             firePropertyChange("validationResult", previousStatus, true);
         }
+        super.setEnabled(enabled);
     }
 
     /**

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionsTreePanel.java

@@ -49,12 +49,10 @@ import net.miginfocom.swing.MigLayout;
 public class ActionConditionsTreePanel extends JPanel implements ActionListener,
         PropertyChangeListener, DocumentListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class structure is changed
-     * (or anything else that would prevent serialized objects being unserialized with the new
-     * class).
-     */
+    /** A version number for this class. */
     private static final long serialVersionUID = 1;
+    /** Icon manager. */
+    private final IconManager iconManager;
     /** Button group. */
     private ButtonGroup group;
     /** All triggers button. */
@@ -73,8 +71,6 @@ public class ActionConditionsTreePanel extends JPanel implements ActionListener,
     private ConditionRuleValidator treeValidator;
     /** validates. */
     private boolean validates = true;
-    /** Icon manager. */
-    private IconManager iconManager;
 
     /**
      * Instantiates the panel.
@@ -139,6 +135,11 @@ public class ActionConditionsTreePanel extends JPanel implements ActionListener,
         }
 
         switch (type) {
+            case CONJUNCTION:
+                allButton.setSelected(true);
+                rule.setText("");
+                rule.setEnabled(false);
+                break;
             case DISJUNCTION:
                 oneButton.setSelected(true);
                 rule.setText("");