work on issue 1027: New Actions Editor UI

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

src/com/dmdirc/ui/swing/SwingController.java

@@ -28,7 +28,6 @@ import com.dmdirc.ui.IconManager;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;

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

@@ -88,4 +88,19 @@ public class ActionResponsePanel extends JPanel {
         add(new JLabel("Alter the event's formatter"));
         add(formatter, "growx");
     }
+    
+    public String getResponse() {
+        return response.getText();
+    }
+    
+    public String getFormatter() {
+        return (String) formatter.getSelectedItem();
+    }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void setEnabled(final boolean enabled) {
+        response.setEnabled(enabled);
+        formatter.setEnabled(enabled);
+    }
 }

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

@@ -32,6 +32,7 @@ import java.util.Map.Entry;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 
+import javax.swing.SwingUtilities;
 import net.miginfocom.swing.MigLayout;
 
 /**
@@ -52,34 +53,15 @@ public class ActionSubstitutionsPanel extends JPanel {
     public ActionSubstitutionsPanel(final ActionType type) {
         super();
 
-        this.type = type;
-        substitutions = new ArrayList<ActionSubstitutionLabel>();
-
         initComponents();
         addListeners();
-        layoutComponents();
+        setActionType(type);
     }
 
     /** Initialises the components. */
     private void initComponents() {
-        final ActionSubstitutor sub = new ActionSubstitutor(type);
-
-        for (final Entry<String, String> entry : sub.getComponentSubstitutions().
-                entrySet()) {
-            substitutions.add(new ActionSubstitutionLabel(new ActionSubstitution(entry.getValue(),
-                    entry.getKey())));
-        }
-
-        for (final String entry : sub.getConfigSubstitutions()) {
-            substitutions.add(new ActionSubstitutionLabel(new ActionSubstitution(entry,
-                    entry)));
-        }
-
-        for (final Entry<String, String> entry : sub.getServerSubstitutions().
-                entrySet()) {
-            substitutions.add(new ActionSubstitutionLabel(new ActionSubstitution(entry.getValue(),
-                    entry.getKey())));
-        }
+        setBorder(BorderFactory.createTitledBorder(getBorder(), "Substitutions"));
+        setLayout(new MigLayout("fill, wrap 4"));
     }
 
     /** Adds the listeners. */
@@ -88,15 +70,50 @@ public class ActionSubstitutionsPanel extends JPanel {
 
     /** Lays out the components. */
     private void layoutComponents() {
-        setBorder(BorderFactory.createTitledBorder(getBorder(), "Substitutions"));
-        setLayout(new MigLayout("fill, wrap 4"));
+        removeAll();
 
         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");
-        
+
         for (ActionSubstitutionLabel label : substitutions) {
             add(label, "sgx subslabel, aligny top");
         }
     }
+
+    public void setActionType(final ActionType type) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                ActionSubstitutionsPanel.this.type = type;
+
+                substitutions = new ArrayList<ActionSubstitutionLabel>();
+
+                if (type != null) {
+                    final ActionSubstitutor sub = new ActionSubstitutor(type);
+
+                    for (final Entry<String, String> entry : sub.getComponentSubstitutions().
+                            entrySet()) {
+                        substitutions.add(new ActionSubstitutionLabel(new ActionSubstitution(entry.getValue(),
+                                entry.getKey())));
+                    }
+
+                    for (final String entry : sub.getConfigSubstitutions()) {
+                        substitutions.add(new ActionSubstitutionLabel(new ActionSubstitution(entry,
+                                entry)));
+                    }
+
+                    for (final Entry<String, String> entry : sub.getServerSubstitutions().
+                            entrySet()) {
+                        substitutions.add(new ActionSubstitutionLabel(new ActionSubstitution(entry.getValue(),
+                                entry.getKey())));
+                    }
+                }
+
+                layoutComponents();
+            }
+        });
+    }
 }

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

@@ -22,7 +22,21 @@
 
 package com.dmdirc.ui.swing.dialogs.actioneditor;
 
+import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.swing.components.ImageButton;
+import com.dmdirc.ui.swing.components.TextLabel;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+
+import net.miginfocom.swing.MigLayout;
 
 /**
  * Action triggers list panel.
@@ -35,11 +49,19 @@ public class ActionTriggersListPanel extends JPanel {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
+    private List<ActionType> triggers;
 
     /** Instantiates the panel. */
     public ActionTriggersListPanel() {
+        this(new ArrayList<ActionType>());
+    }
+
+    /** Instantiates the panel. */
+    public ActionTriggersListPanel(final List<ActionType> triggers) {
         super();
-        
+
+        this.triggers = new ArrayList<ActionType>(triggers);
+
         initComponents();
         addListeners();
         layoutComponents();
@@ -47,6 +69,7 @@ public class ActionTriggersListPanel extends JPanel {
 
     /** Initialises the components. */
     private void initComponents() {
+        setLayout(new MigLayout("fillx, wrap 2, debug"));
     }
 
     /** Adds the listeners. */
@@ -55,5 +78,69 @@ public class ActionTriggersListPanel extends JPanel {
 
     /** Lays out the components. */
     private void layoutComponents() {
+        synchronized (triggers) {
+            setVisible(false);
+
+            removeAll();
+
+            for (final ActionType trigger : triggers) {
+                final ImageButton button = new ImageButton("delete",
+                        IconManager.getIconManager().getIcon("close-inactive"),
+                        IconManager.getIconManager().getIcon("close-active"));
+                button.addActionListener(new ActionListener() {
+
+                    /** {@inheritDoc} */
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        delTrigger(trigger);
+                    }
+                });
+
+                add(new JLabel(trigger.getName()), "growx");
+                add(button, "right");
+            }
+
+            if (getComponentCount() == 0) {
+                add(new TextLabel("No triggers."));
+            }
+            getLayout().layoutContainer(this);
+            setVisible(true);
+        }
+    }
+
+    public void addTrigger(final ActionType trigger) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                synchronized (triggers) {
+                    triggers.add(trigger);
+
+                    layoutComponents();
+                }
+            }
+        });
+    }
+
+    public void delTrigger(final ActionType trigger) {
+        SwingUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                synchronized (triggers) {
+                    triggers.remove(trigger);
+
+                    layoutComponents();
+                }
+            }
+        });
+    }
+
+    public List<ActionType> getTriggers() {
+        synchronized (triggers) {
+            return triggers;
+        }
     }
 }