issue 1027

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

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

@@ -33,6 +33,8 @@ import com.dmdirc.util.ListenerList;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import javax.swing.JPanel;
 import javax.swing.JToggleButton;
 
@@ -41,7 +43,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Action condition display panel.
  */
-public class ActionConditionDisplayPanel extends JPanel implements ActionListener {
+public class ActionConditionDisplayPanel extends JPanel implements ActionListener, PropertyChangeListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -103,6 +105,7 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
     private void addListeners() {
         editButton.addActionListener(this);
         deleteButton.addActionListener(this);
+        editPanel.addPropertyChangeListener("edit", this);
     }
 
     /** Lays out the components. */
@@ -214,4 +217,10 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
     public ActionCondition getCondition() {
         return condition;
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void propertyChange(final PropertyChangeEvent evt) {
+        setCondition(trigger, condition);
+    }
 }

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

@@ -237,18 +237,21 @@ public class ActionConditionEditorPanel extends JPanel implements ActionListener
             }
             populateComparisons();
         }
+        firePropertyChange("edit", null, null);
     }
 
     /** {@inheritDoc} */
     @Override
     public void insertUpdate(final DocumentEvent e) {
-    //Ignore
+        condition.setTarget(target.getText());
+        firePropertyChange("edit", null, null);
     }
 
     /** {@inheritDoc} */
     @Override
     public void removeUpdate(final DocumentEvent e) {
-    //Ignore
+        condition.setTarget(target.getText());
+        firePropertyChange("edit", null, null);
     }
 
     /** {@inheritDoc} */

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

@@ -23,14 +23,12 @@
 package com.dmdirc.ui.swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.ActionCondition;
+import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.interfaces.ActionType;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
@@ -39,8 +37,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Action conditions list panel.
  */
-public class ActionConditionsListPanel extends JPanel implements ActionConditionRemovalListener,
-        ActionListener {
+public class ActionConditionsListPanel extends JPanel implements ActionConditionRemovalListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -52,8 +49,6 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
     private ActionType trigger;
     /** Conditions list. */
     private List<ActionConditionDisplayPanel> conditions;
-    /** Add button. */
-    private JButton add;
 
     /** Instantiates the panel. */
     public ActionConditionsListPanel() {
@@ -89,9 +84,8 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
 
     /** Initialises the components. */
     private void initComponents() {
-        setLayout(new MigLayout("fill, wrap 2"));
+        setLayout(new MigLayout("fillx, wrap 2"));
 
-        add = new JButton("Add");
         if (trigger == null) {
             setEnabled(false);
         }
@@ -102,7 +96,6 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
         for (ActionConditionDisplayPanel condition : conditions) {
             condition.addConditionListener(this);
         }
-        add.addActionListener(this);
     }
 
     /** Lays out the components. */
@@ -110,17 +103,22 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
         setVisible(false);
         removeAll();
         int index = 0;
-        synchronized (conditions) {
-            for (ActionConditionDisplayPanel condition : conditions) {
-                index++;
-                add(new JLabel(index + "."), "aligny top");
-                add(condition, "growx");
+        if (trigger == null) {
+            add(new JLabel("You must add at least one trigger before you can add conditions."),
+                    "alignx center, aligny top, growx");
+        } else {
+            synchronized (conditions) {
+                for (ActionConditionDisplayPanel condition : conditions) {
+                    index++;
+                    add(new JLabel(index + "."), "aligny top");
+                    add(condition, "growx, aligny top");
+                }
+            }
+            if (index == 0) {
+                add(new JLabel("No conditions."),
+                        "alignx center, aligny top, growx");
             }
         }
-        if (index == 0) {
-            add(new JLabel("No conditions."), "alignx center, aligny top, growx");
-        }
-        add(add, "gaptop push, newline, right, aligny bottom");
         setVisible(true);
 
     }
@@ -168,8 +166,11 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
      * @param trigger Action trigger
      */
     public void setTrigger(final ActionType trigger) {
+        if (this.trigger != null || ActionManager.getCompatibleTypes(trigger).contains(this.trigger)) {
+            conditions.clear();
+        }
         this.trigger = trigger;
-        add.setEnabled(trigger != null);
+        layoutComponents();
     }
 
     /** {@inheritDoc} */
@@ -181,19 +182,11 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
         layoutComponents();
     }
 
-    /** 
-     * {@inheritDoc}
-     * 
-     * @param e Action event
-     */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        addCondition(new ActionCondition(-1, null, null, null));
-    }
-    
     /** {@inheritDoc} */
     @Override
     public void setEnabled(final boolean enabled) {
-        add.setEnabled(false);
+        for (ActionConditionDisplayPanel condition : conditions) {
+            condition.setEnabled(false);
+        }
     }
 }

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

@@ -22,10 +22,16 @@
 
 package com.dmdirc.ui.swing.dialogs.actioneditor;
 
+import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.interfaces.ActionType;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 import javax.swing.BorderFactory;
+import javax.swing.JButton;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 
 import net.miginfocom.swing.MigLayout;
@@ -33,7 +39,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Action conditions panel.
  */
-public class ActionConditionsPanel extends JPanel {
+public class ActionConditionsPanel extends JPanel implements ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -47,6 +53,8 @@ public class ActionConditionsPanel extends JPanel {
     private ActionConditionsTreePanel tree;
     /** List Panel. */
     private ActionConditionsListPanel list;
+    /** Add button. */
+    private JButton add;
 
     /** Instantiates the panel. */
     public ActionConditionsPanel() {
@@ -69,6 +77,7 @@ public class ActionConditionsPanel extends JPanel {
         
         if (trigger == null) {
             setEnabled(false);
+            add.setEnabled(false);
         }
     }
 
@@ -76,10 +85,12 @@ public class ActionConditionsPanel extends JPanel {
     private void initComponents() {
         tree = new ActionConditionsTreePanel();
         list = new ActionConditionsListPanel();
+        add = new JButton("Add");
     }
 
     /** Adds the listeners. */
     private void addListeners() {
+        add.addActionListener(this);
     }
 
     /** Lays out the components. */
@@ -88,9 +99,14 @@ public class ActionConditionsPanel extends JPanel {
         
         setBorder(BorderFactory.createTitledBorder(getBorder(), "Conditions"));
         
+        final JScrollPane sp = new JScrollPane(list);
+        sp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+        sp.getVerticalScrollBar().setUnitIncrement(10);
+        
         add(tree, "growx, pushx");
         add(new JSeparator(JSeparator.HORIZONTAL), "growx, pushx");
-        add(list, "grow");
+        add(sp, "grow");
+        add(add, "right, gaptop push");
     }
 
     /**
@@ -101,6 +117,7 @@ public class ActionConditionsPanel extends JPanel {
     public void setActionTrigger(final ActionType trigger) {
         this.trigger = trigger;
         list.setTrigger(trigger);
+        add.setEnabled(trigger != null);
     }
     
     /** {@inheritDoc} */
@@ -109,4 +126,14 @@ public class ActionConditionsPanel extends JPanel {
         tree.setEnabled(enabled);
         list.setEnabled(enabled);
     }
+    
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param e Action event
+     */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        list.addCondition(new ActionCondition(-1, null, null, null));
+    }
 }

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

@@ -27,13 +27,14 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.swing.UIUtilities;
 import com.dmdirc.ui.swing.components.StandardDialog;
 
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+
 import javax.swing.JButton;
 import javax.swing.JFrame;
 
@@ -62,14 +63,22 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
     private ActionSubstitutionsPanel substitutions;
     /** Show substitutions button. */
     private JButton showSubstitutions;
+    /** Is the name valid? */
     private boolean nameValid = false;
+    /** Are the triggers valid? */
     private boolean triggersValid = false;
+    /** Is the response valid? */
     private boolean responseValid = false;
+    /** Are the conditions valid? */
     private boolean conditionsValid = false;
 
-    /** Instantiates the panel. */
-    public ActionEditorDialog() {
-        super(new JFrame(), false);
+    /** 
+     * Instantiates the panel.
+     * 
+     * @param window Parent window
+     */
+    public ActionEditorDialog(final Window window) {
+        super(window, ModalityType.MODELESS);
 
         initComponents();
         addListeners();
@@ -104,13 +113,13 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
 
     /** Lays out the components. */
     private void layoutComponents() {
-        setLayout(new MigLayout("fill, hidemode 3, wrap 2, pack"));
+        setLayout(new MigLayout("fill, hidemode 3, wrap 2, pack, hmax 80sp"));
 
-        add(name, "grow, wmax 225");
-        add(conditions, "spany 3, grow, wmin 400, wmax 400");
-        add(triggers, "grow, wmax 225");
-        add(response, "grow, wmax 225");
-        add(substitutions, "spanx 2, grow, wmax 625");
+        add(name, "grow, wmax 250");
+        add(conditions, "spany 3, grow, wmin 410, wmax 410");
+        add(triggers, "grow, wmax 250");
+        add(response, "grow, wmax 250");
+        add(substitutions, "spanx 2, grow, wmax 660");
         add(showSubstitutions, "left, sgx button, split 3, spanx 2");
         add(getLeftButton(), "right, sgx button, gapleft push");
         add(getRightButton(), "right, sgx button");
@@ -125,7 +134,9 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
         UIUtilities.initUISettings();
         IdentityManager.load();
         ActionManager.init();
-        ActionEditorDialog dialog = new ActionEditorDialog();
+        ActionManager.loadActions();
+        System.out.println(ActionManager.getGroups().values().iterator().next().getActions().get(0));
+        ActionEditorDialog dialog = new ActionEditorDialog(new JFrame());
         dialog.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 
         dialog.addWindowListener(new WindowAdapter() {
@@ -166,7 +177,9 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
             
             response.setEnabled((Boolean) evt.getNewValue());
             conditions.setEnabled((Boolean) evt.getNewValue());
+            substitutions.setEnabled((Boolean) evt.getNewValue());
             
+            substitutions.setActionType(triggers.getPrimaryTrigger());
             conditions.setActionTrigger(triggers.getPrimaryTrigger());
         }
         

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

@@ -44,14 +44,23 @@ public final class ActionSubstitution {
     }
     
     /**
-     * Returns the value of this substitution.
+     * Returns the name of this substitution.
      *
-     * @return Substitution value   
+     * @return Substitution name   
      */
-    public String getValue() {
+    public String getName() {
         return name;
     }
     
+    /**
+     * Returns the value of this substitution.
+     * 
+     * @return Substitution value
+     */
+    public String getValue() {
+        return value;
+    }
+    
     /** {@inheritDoc} */
     @Override
     public String toString() {

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

@@ -81,7 +81,7 @@ public class ActionSubstitutionLabel extends JButton implements MouseListener,
         dragSource.createDefaultDragGestureRecognizer(this,
                 DnDConstants.ACTION_COPY, this);
 
-        setText(substition.getValue());
+        setText(substition.getName());
         setFont(getFont().deriveFont(getFont().getSize() - 2f));
         
         setBorder(

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

@@ -75,7 +75,7 @@ public class ActionSubstitutionsPanel extends JPanel {
     /** Initialises the components. */
     private void initComponents() {
         setBorder(BorderFactory.createTitledBorder(getBorder(), "Substitutions"));
-        setLayout(new MigLayout("fill, wrap 5"));
+        setLayout(new MigLayout("fillx, wrap 5"));
     }
 
     /** Adds the listeners. */
@@ -89,14 +89,14 @@ public class ActionSubstitutionsPanel extends JPanel {
         add(new TextLabel("Substitutions may be used in the response and " +
                 "target fields. Drag and drop, or click on an item when " +
                 "editing the field, to insert it."), "spany, aligny top, wmin 225, wmax 225");
-        add(new JSeparator(JSeparator.VERTICAL), "growy");
+        add(new JSeparator(JSeparator.VERTICAL), "growy, spany");
 
         for (ActionSubstitutionLabel label : substitutions) {
-            add(label, "sgx subslabel, aligny top");
+            add(label, "sgx subslabel, aligny top, growx");
         }
         
         if (getComponentCount() == 2) {
-            add(new JLabel("No substitutions."), "growx, aligny top");
+            add(new JLabel("No substitutions."), "growx, aligny top, align center");
         }
     }
 

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

@@ -40,6 +40,7 @@ import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
 import javax.swing.SwingUtilities;
 import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
@@ -79,7 +80,8 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
         setBorder(BorderFactory.createTitledBorder(getBorder(), "Triggers"));
 
         trigger =
-                new JComboBox(new ActionTypeModel(ActionManager.getTypeGroups()));
+                new JComboBox(new ActionTypeModel(getFontMetrics(getFont()),
+                ActionManager.getTypeGroups()));
         //Only fire events on selection not on highlight
         trigger.putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE);
         trigger.setRenderer(new ActionTypeRenderer());
@@ -93,10 +95,15 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
                 if (!(comp instanceof JPopupMenu)) {
                     return;
                 }
-                JComponent scrollPane =
-                        (JComponent) ((JPopupMenu) comp).getComponent(0);
+                JComponent scrollPane = (JComponent) ((JPopupMenu) comp).getComponent(0);
                 Dimension size = scrollPane.getPreferredSize();
-                size.width = size.width * 2;
+                if (scrollPane instanceof JScrollPane) {
+                    size.width = ((ActionTypeModel) trigger.getModel()).
+                            getMaxWidth() + (int) ((JScrollPane) scrollPane).
+                            getVerticalScrollBar().getPreferredSize().getWidth();
+                } else {
+                    size.width = ((ActionTypeModel) trigger.getModel()).getMaxWidth();
+                }
                 scrollPane.setPreferredSize(size);
                 scrollPane.setMaximumSize(size);
             }
@@ -122,7 +129,7 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
         add.addActionListener(this);
         trigger.addActionListener(this);
         triggerList.addTriggerListener(this);
-        
+
         triggerList.addPropertyChangeListener("triggerCount", this);
     }
 
@@ -136,7 +143,7 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
         add(trigger, "growx");
         add(add, "right");
     }
-    
+
     /**
      * Returns the primary trigger for this panel.
      * 
@@ -183,6 +190,7 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
 
                 if (triggerList.getTriggerCount() == 0) {
                     ((ActionTypeModel) trigger.getModel()).setTypeGroup(ActionManager.getTypeGroups());
+                    trigger.setEnabled((trigger.getModel().getSize() > 0));
                     return;
                 }
                 for (ActionType thisType : ActionManager.getCompatibleTypes(triggerList.getTrigger(0))) {
@@ -191,7 +199,7 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
                         ((ActionTypeModel) trigger.getModel()).addElement(thisType);
                     }
                 }
-                 trigger.setEnabled((trigger.getModel().getSize() > 0));
+                trigger.setEnabled((trigger.getModel().getSize() > 0));
             }
         });
     }

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

@@ -26,11 +26,14 @@ import com.dmdirc.actions.ActionTypeComparator;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.util.MapList;
 
+import java.awt.FontMetrics;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
 import javax.swing.DefaultComboBoxModel;
+import javax.swing.SwingUtilities;
+import sun.swing.SwingUtilities2;
 
 /**
  * Model for the "trigger" list of the actions editor. Adds type group headers,
@@ -44,15 +47,22 @@ public final class ActionTypeModel extends DefaultComboBoxModel {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;    
+    /** Max Width. */
+    private int maxWidth = -1;
+    /** Font metrics. */
+    private FontMetrics fm;
     
     /**
      * Creates a new instance of ActionTypeModel.
      * 
+     * @param fm Font metrics
      * @param typeGroups The action type groups to use
      */
-    public ActionTypeModel(final MapList<String, ActionType> typeGroups) {
+    public ActionTypeModel(final FontMetrics fm, final MapList<String, ActionType> typeGroups) {
         super();
         
+        this.fm = fm;
+        
         for (Map.Entry<String, List<ActionType>> entry : typeGroups.entrySet()) {
             addElement(entry.getKey());
             
@@ -65,6 +75,23 @@ public final class ActionTypeModel extends DefaultComboBoxModel {
         }
     }
 
+    /** 
+     * {@inheritDoc}
+     * 
+     * @param anObject Objerct to add
+     */
+    @Override
+    public void addElement(final Object anObject) {
+        super.addElement(anObject);
+        int width = maxWidth;
+        if (anObject instanceof String) {
+            width = SwingUtilities.computeStringWidth(fm, (String) anObject);
+        } else if (anObject instanceof ActionType) {
+            width = SwingUtilities.computeStringWidth(fm, ((ActionType) anObject).getName());
+        }
+        maxWidth = Math.max(width, maxWidth);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void setSelectedItem(final Object anObject) {
@@ -92,4 +119,13 @@ public final class ActionTypeModel extends DefaultComboBoxModel {
             }
         }
     }
+    
+    /**
+     * Returns the maximum width of a string in this model.
+     * 
+     * @return String max width
+     */
+    public int getMaxWidth() {
+        return maxWidth;
+    }
 }