Fixes issue 0001734

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

src/com/dmdirc/actions/Action.java

@@ -246,7 +246,7 @@ public class Action extends ActionModel implements Serializable {
             if (data.containsKey("type") && data.containsKey("setting")
                     && data.containsKey("title") && data.containsKey("default")
                     && data.containsKey("tooltip")) {
-                myGroup.getSettings().add(new PreferencesSetting(
+                myGroup.getSettings().put(data.get("setting"), new PreferencesSetting(
                         PreferencesType.valueOf(data.get("type")), "actions",
                         data.get("setting"), data.get("default"), 
                         data.get("title"), data.get("tooltip")));

src/com/dmdirc/actions/ActionGroup.java

@@ -25,8 +25,11 @@ package com.dmdirc.actions;
 import com.dmdirc.config.prefs.PreferencesSetting;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Represents a group of actions, along with their meta-data.
@@ -61,7 +64,8 @@ public class ActionGroup implements Iterable<Action> {
     private int version = -1;
     
     /** A list of settings used by this action group. */
-    private final List<PreferencesSetting> settings = new ArrayList<PreferencesSetting>();
+    private final Map<String, PreferencesSetting> settings
+            = new HashMap<String, PreferencesSetting>();
 
     /**
      * Creates a new instance of ActionGroup.
@@ -120,11 +124,11 @@ public class ActionGroup implements Iterable<Action> {
     }
 
     /**
-     * Retrieves a list of settings used by this action group.
+     * Retrieves a map settings used by this action group.
      * 
-     * @return A list of settings used by this action group.
+     * @return A map of setting names to values
      */
-    public List<PreferencesSetting> getSettings() {
+    public Map<String, PreferencesSetting> getSettings() {
         return settings;
     }
 

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

@@ -33,8 +33,8 @@ import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import javax.swing.JButton;
@@ -56,7 +56,7 @@ public final class ActionGroupSettingsPanel extends JPanel implements ActionList
      */
     private static final long serialVersionUID = 1;
     /** Settings list. */
-    private List<PreferencesSetting> settings;
+    private Collection<PreferencesSetting> settings;
     /** Button -> Component map. */
     private Map<JButton, PreferencesSetting> settingMap;
     /** Parent dialog. */
@@ -141,7 +141,7 @@ public final class ActionGroupSettingsPanel extends JPanel implements ActionList
         if (group == null || group.getSettings().isEmpty()) {
             this.settings = new ArrayList<PreferencesSetting>();
         } else {
-            this.settings = group.getSettings();
+            this.settings = group.getSettings().values();
         }
 
         layoutComponents();