More actions work

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

src/com/dmdirc/actions/ActionGroup.java

@@ -26,11 +26,19 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- *
+ * Represents a group of actions, along with their meta-data.
+ * 
  * @author chris
  */
 public class ActionGroup extends ArrayList<Action> {
     
+    /**
+     * 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).
+     */
+    private static final long serialVersionUID = 1;    
+    
     private String name;
     
     private String description;
@@ -39,6 +47,10 @@ public class ActionGroup extends ArrayList<Action> {
     
     private final List<ActionSetting> settings = new ArrayList<ActionSetting>();
 
+    public ActionGroup(String name) {
+        this.name = name;
+    }
+
     public String getAuthor() {
         return author;
     }
@@ -66,7 +78,5 @@ public class ActionGroup extends ArrayList<Action> {
     public List<ActionSetting> getSettings() {
         return settings;
     }
-    
-    
 
 }

src/com/dmdirc/actions/ActionManager.java

@@ -41,7 +41,9 @@ import com.dmdirc.util.WeakMapList;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Manages all actions for the client.
@@ -71,8 +73,8 @@ public final class ActionManager {
             = new MapList<ActionType, Action>();
     
     /** A map linking groups and a list of actions that're in them. */
-    private final static MapList<String, Action> groups
-            = new MapList<String, Action>();
+    private final static Map<String, ActionGroup> groups
+            = new HashMap<String, ActionGroup>();
     
     /** A map of the action type groups to the action types within. */
     private final static MapList<String, ActionType> actionTypeGroups
@@ -178,7 +180,7 @@ public final class ActionManager {
      *
      * @return a map of groups to action lists
      */
-    public static MapList<String, Action> getGroups() {
+    public static Map<String, ActionGroup> getGroups() {
         return groups;
     }
     
@@ -291,10 +293,25 @@ public final class ActionManager {
         if (isWrappedGroup(action.getGroup())) {
             getWrapper(action.getGroup()).registerAction(action);
         } else {
-            groups.add(action.getGroup(), action);
+            getGroup(action.getGroup()).add(action);
         }
     }
     
+    /**
+     * Retrieves the action group with the specified name. A new group is
+     * created if it doesn't already exist.
+     * 
+     * @param name The name of the group to retrieve
+     * @return The corresponding ActionGroup
+     */
+    public static ActionGroup getGroup(final String name) {
+        if (!groups.containsKey(name)) {
+            groups.put(name, new ActionGroup(name));
+        }
+        
+        return groups.get(name);
+    }
+    
     /**
      * Unregisters an action with the manager.
      *
@@ -305,7 +322,7 @@ public final class ActionManager {
         assert(action != null);
         
         actions.removeFromAll(action);
-        groups.removeFromAll(action);
+        getGroup(action.getGroup()).remove(action);
     }
     
     /**
@@ -407,7 +424,7 @@ public final class ActionManager {
         assert(!groups.containsKey(group));
         
         if (new File(getDirectory() + group).mkdir()) {
-            groups.add(group);
+            groups.put(group, new ActionGroup(group));
         }
     }
     
@@ -423,7 +440,7 @@ public final class ActionManager {
     public static void removeGroup(final String group) {
         assert(group != null);
         assert(!group.isEmpty());
-        assert(groups.containsKey(group));        
+        assert(groups.containsKey(group));
         
         for (Action action : new ArrayList<Action>(groups.get(group))) {
             unregisterAction(action);
@@ -474,10 +491,10 @@ public final class ActionManager {
         
         for (Action action : groups.get(oldName)) {
             action.setGroup(newName);
-            groups.add(newName, action);
+            getGroup(newName).add(action);
         }
         
-        groups.clear(oldName);
+        groups.remove(oldName);
         
         removeGroup(oldName);
     }

src/com/dmdirc/ui/swing/dialogs/actionseditor/ActionsManagerDialog.java

@@ -23,17 +23,17 @@
 package com.dmdirc.ui.swing.dialogs.actionseditor;
 
 import com.dmdirc.Main;
-import com.dmdirc.actions.Action;
+import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.ui.swing.MainFrame;
 import com.dmdirc.ui.swing.components.StandardDialog;
-import com.dmdirc.util.MapList;
 
 import java.awt.Dimension;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Arrays;
+import java.util.Map;
 
 import javax.swing.JButton;
 import javax.swing.JDialog;
@@ -199,7 +199,7 @@ public final class ActionsManagerDialog extends StandardDialog
 
         groups.removeAll();
 
-        final MapList<String, Action> actionGroups = ActionManager.getGroups();
+        final Map<String, ActionGroup> actionGroups = ActionManager.getGroups();
 
         if (actionGroups == null) {
             return;