fixes issue 1027

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

src/com/dmdirc/ui/swing/dialogs/actioneditor/ActionConditionEditorPanel.java

@@ -160,23 +160,31 @@ public class ActionConditionEditorPanel extends JPanel implements ActionListener
     
     /** Handles the argument changing. */
     private void handleArgumentChange() {
-        System.out.println(condition.getArg() + " => " + arguments.getSelectedIndex());
         condition.setArg(arguments.getSelectedIndex());
+        populateComponents();
+        components.setEnabled(true);
         components.setSelectedItem(null);
         comparisons.setSelectedItem(null);
+        comparisons.setEnabled(false);
         target.setText(null);
+        target.setEnabled(false);
     }
     
     /** Handles the component changing. */
     private void handleComponentChange() {
         condition.setComponent((ActionComponent) components.getSelectedItem());
+        populateComparisons();
+        comparisons.setEnabled(true);
         comparisons.setSelectedItem(null);
         target.setText(null);
+        target.setEnabled(false);
     }
     
     /** Handles the comparison changing. */
     private void handleComparisonChange() {
         condition.setComparison((ActionComparison) comparisons.getSelectedItem());
+        populateTarget();
+        target.setEnabled(true);
         target.setText(null);
     }
 

src/com/dmdirc/ui/swing/dialogs/actioneditor/ActionConditionsPanel.java

@@ -175,7 +175,7 @@ public class ActionConditionsPanel extends JPanel implements ActionListener, Pro
      * 
      * @return condition type
      */
-    public ConditionTreeFactoryType getConditionType() {
+    public ConditionTreeFactoryType getConditionTreeType() {
         return tree.getRuleType(list.getConditions().size());
     }
     
@@ -185,7 +185,7 @@ public class ActionConditionsPanel extends JPanel implements ActionListener, Pro
      * @return condition tree
      */
     public ConditionTree getConditionTree() {
-        return ConditionTree.parseString(tree.getRule());
+        return tree.getRule(list.getConditions().size());
     }
     
     /**

src/com/dmdirc/ui/swing/dialogs/actioneditor/ActionConditionsTreePanel.java

@@ -37,13 +37,16 @@ import java.beans.PropertyChangeListener;
 import javax.swing.ButtonGroup;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 
 import net.miginfocom.swing.MigLayout;
 
 /**
  * Action conditions tree panel.
  */
-public class ActionConditionsTreePanel extends JPanel implements ActionListener, PropertyChangeListener {
+public class ActionConditionsTreePanel extends JPanel implements ActionListener,
+        PropertyChangeListener, DocumentListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -97,6 +100,7 @@ public class ActionConditionsTreePanel extends JPanel implements ActionListener,
         oneButton.addActionListener(this);
         customButton.addActionListener(this);
         rule.addPropertyChangeListener("validationResult", this);
+        rule.getDocument().addDocumentListener(this);
     }
 
     /** Lays out the components. */
@@ -120,27 +124,42 @@ public class ActionConditionsTreePanel extends JPanel implements ActionListener,
         } else {
             type = treeFactory.getType();
         }
-        
+
         switch (type) {
             case DISJUNCTION:
                 oneButton.setSelected(true);
                 rule.setText("");
                 rule.setEnabled(false);
-                firePropertyChange("validationResult", true, true);
                 break;
             case CUSTOM:
                 customButton.setSelected(true);
-                rule.setText(treeFactory.getConditionTree(conditionCount).toString());
+                rule.setText(treeFactory.getConditionTree(conditionCount).
+                        toString());
                 rule.setEnabled(true);
-                rule.checkError();
                 break;
             default:
                 allButton.setSelected(true);
                 rule.setText("");
                 rule.setEnabled(false);
-                firePropertyChange("validationResult", true, true);
                 break;
         }
+
+        sortTreeFactory();
+    }
+
+    /** Sorts the tree factory out. */
+    private void sortTreeFactory() {
+        if (group.getSelection().equals(allButton.getModel())) {
+            treeFactory = new ConditionTreeFactory.ConjunctionFactory();
+            firePropertyChange("validationResult", true, true);
+        } else if (group.getSelection().equals(oneButton.getModel())) {
+            treeFactory = new ConditionTreeFactory.DisjunctionFactory();
+            firePropertyChange("validationResult", true, true);
+        } else {
+            treeFactory =
+                    new ConditionTreeFactory.CustomFactory(ConditionTree.parseString(rule.getText()));
+            rule.checkError();
+        }
     }
 
     /** 
@@ -151,6 +170,7 @@ public class ActionConditionsTreePanel extends JPanel implements ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         rule.setEnabled(e.getSource().equals(customButton));
+        sortTreeFactory();
     }
 
     /** {@inheritDoc} */
@@ -170,9 +190,6 @@ public class ActionConditionsTreePanel extends JPanel implements ActionListener,
      */
     public ConditionTreeFactoryType getRuleType(final int conditionCount) {
         if (conditionCount >= 2) {
-            final ConditionTree tree =
-                    ConditionTree.parseString(rule.getText());
-            treeFactory = ConditionTreeFactory.getFactory(tree, conditionCount);
             return treeFactory.getType();
         } else {
             return ConditionTreeFactoryType.CONJUNCTION;
@@ -182,10 +199,13 @@ public class ActionConditionsTreePanel extends JPanel implements ActionListener,
     /**
      * Returns the current custom rule.
      * 
+     * @param conditionCount number of conditions
+     * 
      * @return Custom rule
      */
-    public String getRule() {
-        return rule.getText();
+    public ConditionTree getRule(final int conditionCount) {
+        treeFactory.getConditionTree(conditionCount);
+        return treeFactory.getConditionTree(conditionCount);
     }
 
     /**
@@ -205,11 +225,32 @@ public class ActionConditionsTreePanel extends JPanel implements ActionListener,
     /** {@inheritDoc} */
     @Override
     public void propertyChange(final PropertyChangeEvent evt) {
-        firePropertyChange("validationResult", evt.getOldValue(), evt.getNewValue());
+        firePropertyChange("validationResult", evt.getOldValue(),
+                evt.getNewValue());
     }
-    
+
     /** Validates the conditions. */
     public void validateConditions() {
         selectTreeButton();
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void insertUpdate(final DocumentEvent e) {
+        treeFactory =
+                new ConditionTreeFactory.CustomFactory(ConditionTree.parseString(rule.getText()));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void removeUpdate(final DocumentEvent e) {
+        treeFactory =
+                new ConditionTreeFactory.CustomFactory(ConditionTree.parseString(rule.getText()));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void changedUpdate(final DocumentEvent e) {
+    //Ignore
+    }
 }

src/com/dmdirc/ui/swing/dialogs/actioneditor/ActionEditorDialog.java

@@ -23,6 +23,7 @@
 package com.dmdirc.ui.swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.Action;
+import com.dmdirc.actions.ConditionTreeFactory.ConditionTreeFactoryType;
 import com.dmdirc.ui.swing.components.StandardDialog;
 
 import java.awt.Window;
@@ -233,12 +234,36 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
             showSubstitutions.setText(substitutions.isVisible() ? "Hide Substitutions"
                     : "Show Substitutions");
         } else if (e.getSource().equals(getOkButton())) {
+            save();
             dispose();
         } else if (e.getSource().equals(getCancelButton())) {
             dispose();
         }
     }
 
+    /** Saves the action being edited. */
+    private void save() {
+        name.getActionName();
+        triggers.getTriggers();
+        response.getResponse();
+        response.getFormatter();
+        conditions.getConditions();
+        conditions.getConditionTree();
+        if (action == null) {
+            new Action(group, name.getActionName(), triggers.getTriggers(),
+                    response.getResponse(), conditions.getConditions(),
+                    conditions.getConditionTree(), response.getFormatter());
+        } else {
+            action.setName(name.getActionName());
+            action.setConditionTree(conditions.getConditionTree());
+            action.setConditions(conditions.getConditions());
+            action.setNewFormat(response.getFormatter());
+            action.setResponse(response.getResponse());
+            action.setTriggers(triggers.getTriggers());
+            action.save();
+        }
+    }
+
     /** @{inheritDoc} */
     @Override
     public void propertyChange(final PropertyChangeEvent evt) {

src/com/dmdirc/ui/swing/dialogs/actioneditor/ActionResponsePanel.java

@@ -130,8 +130,8 @@ public class ActionResponsePanel extends JPanel {
      * 
      * @return Response text
      */
-    public String getResponse() {
-        return response.getText();
+    public String[] getResponse() {
+        return response.getText().split("\n");
     }
     
     /**