Initial work in action error persistence

Also remove deprecated methods

Change-Id: Id3d1e92c7db813911b4bf4f27b92d4eff92bdd41
Depends-On: Ib20eb804c786b157a33c6d0610e9151200371400
Reviewed-on: http://gerrit.dmdirc.com/1963
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/actions/Action.java

@@ -63,9 +63,6 @@ public class Action extends ActionModel implements ConfigChangeListener {
     /** The domain name for misc settings. */
     private static final String DOMAIN_MISC = "misc".intern();
 
-    /** Whether or not this action is disabled. */
-    protected boolean disabled;
-
     /** The config file we're using. */
     protected ConfigFile config;
 
@@ -88,13 +85,12 @@ public class Action extends ActionModel implements ConfigChangeListener {
             config = new ConfigFile(location);
             config.read();
             loadActionFromConfig();
+            ActionManager.getActionManager().addAction(this);
         } catch (InvalidConfigFileException ex) {
             // This isn't a valid config file. Maybe it's a properties file?
-            Logger.userError(ErrorLevel.MEDIUM, "Unable to parse action file: "
-                    + group + "/" + name + ": " + ex.getMessage());
+            error(ActionErrorType.FILE, "Unable to parse action file: " + ex.getMessage());
         } catch (IOException ex) {
-            Logger.userError(ErrorLevel.HIGH, "I/O error when loading action: "
-                    + group + "/" + name + ": " + ex.getMessage());
+            error(ActionErrorType.FILE, "I/O error when loading action: " + ex.getMessage());
         }
 
         IdentityManager.getGlobalConfig().addChangeListener("disable_action",
@@ -164,7 +160,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
                 return;
             }
         } else {
-            error("No trigger specified");
+            error(ActionErrorType.TRIGGERS, "No trigger specified");
             return;
         }
 
@@ -176,7 +172,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
                 response[i++] = line;
             }
         } else {
-            error("No response specified");
+            error(ActionErrorType.RESPONSE, "No response specified");
             return;
         }
 
@@ -197,12 +193,12 @@ public class Action extends ActionModel implements ConfigChangeListener {
                     config.getFlatDomain(DOMAIN_CONDITIONTREE).get(0));
 
             if (conditionTree == null) {
-                error("Unable to parse condition tree");
+                error(ActionErrorType.CONDITION_TREE, "Unable to parse condition tree");
                 return;
             }
 
             if (conditionTree.getMaximumArgument() >= conditions.size()) {
-                error("Condition tree references condition "
+                error(ActionErrorType.CONDITION_TREE, "Condition tree references condition "
                         + conditionTree.getMaximumArgument() + " but there are"
                         + " only " + conditions.size() + " conditions");
                 return;
@@ -219,7 +215,9 @@ public class Action extends ActionModel implements ConfigChangeListener {
             setStopping(Boolean.parseBoolean(config.getKeyDomain(DOMAIN_MISC).get("stopping")));
         }
 
-        ActionManager.getActionManager().addAction(this);
+        if (status == ActionStatus.DISABLED) {
+            status = ActionStatus.ACTIVE;
+        }
 
         checkMetaData();
     }
@@ -285,10 +283,10 @@ public class Action extends ActionModel implements ConfigChangeListener {
             triggers[i] = ActionManager.getActionManager().getType(newTriggers.get(i));
 
             if (triggers[i] == null) {
-                error("Invalid trigger specified: " + newTriggers.get(i));
+                error(ActionErrorType.TRIGGERS, "Invalid trigger specified: " + newTriggers.get(i));
                 return false;
             } else if (i != 0 && !triggers[i].getType().equals(triggers[0].getType())) {
-                error("Triggers are not compatible");
+                error(ActionErrorType.TRIGGERS, "Triggers are not compatible");
                 return false;
             }
         }
@@ -308,6 +306,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
 
         final List<String> triggerNames = new ArrayList<String>();
         final List<String> responseLines = new ArrayList<String>();
+        responseLines.addAll(Arrays.asList(response));
 
         for (ActionType trigger : triggers) {
             if (trigger == null) {
@@ -320,10 +319,6 @@ public class Action extends ActionModel implements ConfigChangeListener {
             triggerNames.add(trigger.toString());
         }
 
-        for (String line : response) {
-            responseLines.add(line);
-        }
-
         newConfig.addDomain(DOMAIN_TRIGGERS, triggerNames);
         newConfig.addDomain(DOMAIN_RESPONSE, responseLines);
 
@@ -407,12 +402,13 @@ public class Action extends ActionModel implements ConfigChangeListener {
         try {
             arg = Integer.parseInt(data.get("argument"));
         } catch (NumberFormatException ex) {
-            error("Invalid argument number specified: " + data.get("argument"));
+            error(ActionErrorType.CONDITIONS,
+                    "Invalid argument number specified: " + data.get("argument"));
             return false;
         }
 
         if (arg < -1 || arg >= triggers[0].getType().getArity()) {
-            error("Invalid argument number specified: " + arg);
+            error(ActionErrorType.CONDITIONS, "Invalid argument number specified: " + arg);
             return false;
         }
 
@@ -422,7 +418,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
             starget = data.get("starget");
 
             if (starget == null) {
-                error("No starget specified");
+                error(ActionErrorType.CONDITIONS, "No starget specified");
                 return false;
             }
         } else {
@@ -436,13 +432,15 @@ public class Action extends ActionModel implements ConfigChangeListener {
 
         comparison = ActionManager.getActionManager().getComparison(data.get("comparison"));
         if (comparison == null) {
-            error("Invalid comparison specified: " + data.get("comparison"));
+            error(ActionErrorType.CONDITIONS, "Invalid comparison specified: "
+                    + data.get("comparison"));
             return false;
         }
 
         if ((arg != -1 && !comparison.appliesTo().equals(component.getType()))
             || (arg == -1 && !comparison.appliesTo().equals(String.class))) {
-            error("Comparison cannot be applied to specified component: " + data.get("comparison"));
+            error(ActionErrorType.CONDITIONS,
+                    "Comparison cannot be applied to specified component: " + data.get("comparison"));
             return false;
         }
 
@@ -451,7 +449,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
         target = data.get("target");
 
         if (target == null) {
-            error("No target specified for condition");
+            error(ActionErrorType.CONDITIONS, "No target specified for condition");
             return false;
         }
 
@@ -483,18 +481,19 @@ public class Action extends ActionModel implements ConfigChangeListener {
                 component = new ActionComponentChain(triggers[0].getType().getArgTypes()[arg],
                         componentName);
             } catch (IllegalArgumentException iae) {
-                error(iae.getMessage());
+                error(ActionErrorType.CONDITIONS, iae.getMessage());
                 return null;
             }
         }
 
         if (component == null) {
-            error("Unknown component: " + componentName);
+            error(ActionErrorType.CONDITIONS, "Unknown component: " + componentName);
             return null;
         }
 
         if (!component.appliesTo().equals(triggers[0].getType().getArgTypes()[arg])) {
-            error("Component cannot be applied to specified arg in condition: " + componentName);
+            error(ActionErrorType.CONDITIONS,
+                    "Component cannot be applied to specified arg in condition: " + componentName);
             return null;
         }
 
@@ -506,7 +505,11 @@ public class Action extends ActionModel implements ConfigChangeListener {
      *
      * @param message The message to be raised
      */
-    private void error(final String message) {
+    private void error(final ActionErrorType type, final String message) {
+        this.error = message;
+        this.errorType = type;
+        this.status = ActionStatus.FAILED;
+
         Logger.userError(ErrorLevel.LOW, "Error when parsing action: "
                 + group + "/" + name + ": " + message);
     }
@@ -567,20 +570,28 @@ public class Action extends ActionModel implements ConfigChangeListener {
      * @since 0.6.3
      */
     protected void checkDisabled() {
-        disabled = IdentityManager.getGlobalConfig().hasOptionBool("disable_action",
+        boolean disabled = IdentityManager.getGlobalConfig().hasOptionBool("disable_action",
                 (group + "/" + name).replace(' ', '.'))
                 && IdentityManager.getGlobalConfig().getOptionBool("disable_action",
                 (group + "/" + name).replace(' ', '.'));
+
+        if (disabled && status == ActionStatus.ACTIVE) {
+            status = ActionStatus.DISABLED;
+        } else if (!disabled && status == ActionStatus.DISABLED) {
+            status = ActionStatus.ACTIVE;
+        }
     }
 
     /**
      * Determines whether this action is enabled or not.
      *
      * @since 0.6.4
+     * @deprecated Use {@link #getStatus()} instead
      * @return True if the action is enabled, false otherwise
      */
+    @Deprecated
     public boolean isEnabled() {
-        return !disabled;
+        return status == ActionStatus.ACTIVE;
     }
 
     /**
@@ -598,14 +609,4 @@ public class Action extends ActionModel implements ConfigChangeListener {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public boolean trigger(final StringBuffer format, final Object... arguments) {
-        if (!disabled) {
-            return super.trigger(format, arguments);
-        }
-
-        return false;
-    }
-
 }

src/com/dmdirc/actions/ActionErrorType.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.actions;
+
+/**
+ * An enumeration of possible types of error an action may encounter.
+ *
+ * @since 0.6.6
+ */
+public enum ActionErrorType {
+
+    /** A low-level problem occurred trying to read the action's file. */
+    FILE,
+
+    /** A problem with the action's triggers. */
+    TRIGGERS,
+
+    /** A problem with the action's response. */
+    RESPONSE,
+
+    /** A problem with the action's condition tree. */
+    CONDITION_TREE,
+
+    /** A problem with the action's conditions. */
+    CONDITIONS;
+
+}

src/com/dmdirc/actions/ActionGroup.java

@@ -263,7 +263,7 @@ public class ActionGroup implements Iterable<Action> {
         Logger.assertTrue(action != null);
         Logger.assertTrue(actions.contains(action));
 
-        ActionManager.deleteAction(action);
+        ActionManager.getActionManager().removeAction(action);
     }
 
     /**

src/com/dmdirc/actions/ActionManager.java

@@ -45,6 +45,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Level;
 
 /**
  * Manages all actions for the client.
@@ -54,6 +55,10 @@ public final class ActionManager {
     /** A singleton instance of the ActionManager. */
     private static final ActionManager INSTANCE = new ActionManager();
 
+    /** A logger for the action manager to use. */
+    private static final java.util.logging.Logger LOGGER
+            = java.util.logging.Logger.getLogger(ActionManager.class.getName());
+
     /** A list of registered action types. */
     private final List<ActionType> types
             = new ArrayList<ActionType>();
@@ -104,35 +109,26 @@ public final class ActionManager {
         return INSTANCE;
     }
 
-    /**
-     * Initialises the action manager.
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static void init() {
-        INSTANCE.initialise();
-    }
-
     /**
      * Initialises the action manager.
      */
     public void initialise() {
-        registerActionTypes(CoreActionType.values());
-        registerActionComparisons(CoreActionComparison.values());
-        registerActionComponents(CoreActionComponent.values());
+        registerTypes(CoreActionType.values());
+        registerComparisons(CoreActionComparison.values());
+        registerComponents(CoreActionComponent.values());
 
-        registerGroup(AliasWrapper.getAliasWrapper());
-        registerGroup(PerformWrapper.getPerformWrapper());
+        addGroup(AliasWrapper.getAliasWrapper());
+        addGroup(PerformWrapper.getPerformWrapper());
 
         new WhoisNumericFormatter(IdentityManager.getAddonIdentity()).register();
 
         // Register a listener for the closing event, so we can save actions
-        addListener(new ActionListener() {
+        registerListener(new ActionListener() {
             /** {@inheritDoc} */
             @Override
             public void processEvent(final ActionType type, final StringBuffer format,
                     final Object... arguments) {
-                saveActions();
+                saveAllActions();
             }
         }, CoreActionType.CLIENT_CLOSED);
 
@@ -148,15 +144,6 @@ public final class ActionManager {
         });
     }
 
-    /**
-     * Saves all actions.
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static void saveActions() {
-        INSTANCE.saveAllActions();
-    }
-
     /**
      * Saves all actions.
      */
@@ -168,18 +155,6 @@ public final class ActionManager {
         }
     }
 
-    /**
-     * Registers the specified default setting for actions.
-     *
-     * @param name The name of the setting to be registered
-     * @param value The default value for the setting
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static void registerDefault(final String name, final String value) {
-        INSTANCE.registerSetting(name, value);
-    }
-
     /**
      * Registers the specified default setting for actions.
      *
@@ -190,17 +165,6 @@ public final class ActionManager {
         IdentityManager.getAddonIdentity().setOption("actions", name, value);
     }
 
-    /**
-     * Registers the specified group of actions with the manager.
-     *
-     * @param group The group of actions to be registered
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static void registerGroup(final ActionGroup group) {
-        INSTANCE.addGroup(group);
-    }
-
     /**
      * Registers the specified group of actions with the manager.
      *
@@ -211,19 +175,7 @@ public final class ActionManager {
     }
 
     /**
-     * Registers a set of actiontypes with the manager.
-     *
-     * @param types An array of ActionTypes to be registered
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    @Precondition("None of the specified ActionTypes are null")
-    public static void registerActionTypes(final ActionType[] types) {
-        INSTANCE.registerTypes(types);
-    }
-
-    /**
-     * Registers a set of actiontypes with the manager.
+     * Registers a set of action types with the manager.
      *
      * @param newTypes An array of ActionTypes to be registered
      */
@@ -233,24 +185,13 @@ public final class ActionManager {
             Logger.assertTrue(type != null);
 
             if (!types.contains(type)) {
+                LOGGER.log(Level.FINEST, "Registering action type: {0}", type);
                 types.add(type);
                 typeGroups.add(type.getType().getGroup(), type);
             }
         }
     }
 
-    /**
-     * Registers a set of action components with the manager.
-     *
-     * @param comps An array of ActionComponents to be registered
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    @Precondition("None of the specified ActionComponents are null")
-    public static void registerActionComponents(final ActionComponent[] comps) {
-        INSTANCE.registerComponents(comps);
-    }
-
     /**
      * Registers a set of action components with the manager.
      *
@@ -261,22 +202,11 @@ public final class ActionManager {
         for (ActionComponent comp : comps) {
             Logger.assertTrue(comp != null);
 
+            LOGGER.log(Level.FINEST, "Registering action component: {0}", comp);
             components.add(comp);
         }
     }
 
-    /**
-     * Registers a set of action comparisons with the manager.
-     *
-     * @param comps An array of ActionComparisons to be registered
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    @Precondition("None of the specified ActionComparisons are null")
-    public static void registerActionComparisons(final ActionComparison[] comps) {
-        INSTANCE.registerComparisons(comps);
-    }
-
     /**
      * Registers a set of action comparisons with the manager.
      *
@@ -287,21 +217,11 @@ public final class ActionManager {
         for (ActionComparison comp : comps) {
             Logger.assertTrue(comp != null);
 
+            LOGGER.log(Level.FINEST, "Registering action comparison: {0}", comp);
             comparisons.add(comp);
         }
     }
 
-    /**
-     * Returns a map of groups to action lists.
-     *
-     * @return a map of groups to action lists
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static Map<String, ActionGroup> getGroups() {
-        return INSTANCE.getGroupsMap();
-    }
-
     /**
      * Returns a map of groups to action lists.
      *
@@ -311,17 +231,6 @@ public final class ActionManager {
         return groups;
     }
 
-    /**
-     * Returns a map of type groups to types.
-     *
-     * @return A map of type groups to types
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static MapList<String, ActionType> getTypeGroups() {
-        return INSTANCE.getGroupedTypes();
-    }
-
     /**
      * Returns a map of type groups to types.
      *
@@ -331,15 +240,6 @@ public final class ActionManager {
         return typeGroups;
     }
 
-    /**
-     * Loads actions from the user's directory.
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static void loadActions() {
-        INSTANCE.loadUserActions();
-    }
-
     /**
      * Loads actions from the user's directory.
      */
@@ -394,6 +294,8 @@ public final class ActionManager {
         Logger.assertTrue(dir != null);
         Logger.assertTrue(dir.isDirectory());
 
+        LOGGER.log(Level.FINER, "Loading actions from directory: {0}", dir.getAbsolutePath());
+
         if (!groups.containsKey(dir.getName())) {
             groups.put(dir.getName(), new ActionGroup(dir.getName()));
         }
@@ -403,18 +305,6 @@ public final class ActionManager {
         }
     }
 
-    /**
-     * Registers an action with the manager.
-     *
-     * @param action The action to be registered
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    @Precondition("The specified action is not null")
-    public static void registerAction(final Action action) {
-        INSTANCE.addAction(action);
-    }
-
     /**
      * Registers an action with the manager.
      *
@@ -424,24 +314,17 @@ public final class ActionManager {
     public void addAction(final Action action) {
         Logger.assertTrue(action != null);
 
-        for (ActionType trigger : action.getTriggers()) {
-            actions.add(trigger, action);
-        }
+        LOGGER.log(Level.FINE, "Registering action: {0}/{1} (status: {2})",
+                new Object[] { action.getGroup(), action.getName(), action.getStatus() });
 
-        getGroup(action.getGroup()).add(action);
-    }
+        if (action.getStatus() != ActionStatus.FAILED) {
+            for (ActionType trigger : action.getTriggers()) {
+                LOGGER.log(Level.FINER, "Action has trigger {0}", trigger);
+                actions.add(trigger, 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
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static ActionGroup getGroup(final String name) {
-        return INSTANCE.getOrCreateGroup(name);
+        getOrCreateGroup(action.getGroup()).add(action);
     }
 
     /**
@@ -459,18 +342,6 @@ public final class ActionManager {
         return groups.get(name);
     }
 
-    /**
-     * Unregisters an action with the manager.
-     *
-     * @param action The action to be unregistered
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    @Precondition("The specified action is not null")
-    public static void unregisterAction(final Action action) {
-        INSTANCE.removeAction(action);
-    }
-
     /**
      * Unregisters an action with the manager.
      *
@@ -481,7 +352,7 @@ public final class ActionManager {
         Logger.assertTrue(action != null);
 
         actions.removeFromAll(action);
-        getGroup(action.getGroup()).remove(action);
+        getOrCreateGroup(action.getGroup()).remove(action);
     }
 
     /**
@@ -489,50 +360,10 @@ public final class ActionManager {
      * triggers change.
      *
      * @param action The action to be reregistered
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static void reregisterAction(final Action action) {
-        unregisterAction(action);
-        registerAction(action);
-    }
-
-    /**
-     * Deletes the specified action.
-     *
-     * @param action The action to be deleted
-     * @deprecated Use {@link ActionGroup#deleteAction(com.dmdirc.actions.Action)} instead.
-     */
-    @Precondition("The specified Action is not null")
-    @Deprecated
-    public static void deleteAction(final Action action) {
-        Logger.assertTrue(action != null);
-
-        unregisterAction(action);
-
-        action.delete();
-    }
-
-    /**
-     * Processes an event of the specified type.
-     *
-     * @param type The type of the event to process
-     * @param format The format of the message that's going to be displayed for
-     * the event. Actions may change this format.
-     * @param arguments The arguments for the event
-     * @return True if the event should be processed, or false if an action
-     * listener has requested the event be skipped.
-     * @deprecated Use {@link #getActionManager()} and non-static methods
      */
-    @Deprecated
-    @Precondition({
-        "The specified ActionType is not null",
-        "The specified ActionType has a valid ActionMetaType",
-        "The length of the arguments array equals the arity of the ActionType's ActionMetaType"
-    })
-    public static boolean processEvent(final ActionType type,
-            final StringBuffer format, final Object ... arguments) {
-        return INSTANCE.triggerEvent(type, format, arguments);
+    public void reregisterAction(final Action action) {
+        removeAction(action);
+        addAction(action);
     }
 
     /**
@@ -631,23 +462,6 @@ public final class ActionManager {
         return Main.getConfigDir() + "actions" + System.getProperty("file.separator");
     }
 
-    /**
-     * Creates a new group with the specified name.
-     *
-     * @param group The group to be created
-     *
-     * @return The newly created group
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    @Precondition({
-        "The specified group is non-null and not empty",
-        "The specified group is not an existing group"
-    })
-    public static ActionGroup makeGroup(final String group) {
-        return INSTANCE.createGroup(group);
-    }
-
     /**
      * Creates a new group with the specified name.
      *
@@ -675,21 +489,6 @@ public final class ActionManager {
         }
     }
 
-    /**
-     * Removes the group with the specified name.
-     *
-     * @param group The group to be removed
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    @Precondition({
-        "The specified group is non-null and not empty",
-        "The specified group is an existing group"
-    })
-    public static void removeGroup(final String group) {
-        INSTANCE.deleteGroup(group);
-    }
-
     /**
      * Removes the group with the specified name.
      *
@@ -705,7 +504,7 @@ public final class ActionManager {
         Logger.assertTrue(groups.containsKey(group));
 
         for (Action action : groups.get(group).getActions()) {
-            unregisterAction(action);
+            removeAction(action);
         }
 
         final File dir = new File(getDirectory() + group);
@@ -729,25 +528,6 @@ public final class ActionManager {
         groups.remove(group);
     }
 
-    /**
-     * Renames the specified group.
-     *
-     * @param oldName The old name of the group
-     * @param newName The new name of the group
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    @Precondition({
-        "The old name is non-null and not empty",
-        "The old name is an existing group",
-        "The new name is non-null and not empty",
-        "The new name is not an existing group",
-        "The old name does not equal the new name"
-    })
-    public static void renameGroup(final String oldName, final String newName) {
-        INSTANCE.changeGroupName(oldName, newName);
-    }
-
     /**
      * Renames the specified group.
      *
@@ -770,28 +550,15 @@ public final class ActionManager {
         Logger.assertTrue(!groups.containsKey(newName));
         Logger.assertTrue(!newName.equals(oldName));
 
-        makeGroup(newName);
+        createGroup(newName);
 
         for (Action action : groups.get(oldName).getActions()) {
             action.setGroup(newName);
-            getGroup(oldName).remove(action);
-            getGroup(newName).add(action);
+            getOrCreateGroup(oldName).remove(action);
+            getOrCreateGroup(newName).add(action);
         }
 
-        removeGroup(oldName);
-    }
-
-    /**
-     * Returns the action comparison specified by the given string, or null if it
-     * doesn't match a valid registered action comparison.
-     *
-     * @param type The name of the action comparison to try and find
-     * @return The type with the specified name, or null on failure
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static ActionType getActionType(final String type) {
-        return INSTANCE.getType(type);
+        deleteGroup(oldName);
     }
 
     /**
@@ -815,20 +582,6 @@ public final class ActionManager {
         return null;
     }
 
-    /**
-     * Returns a list of action types that are compatible with the one
-     * specified.
-     *
-     * @param type The type to be checked against
-     * @return A list of compatible action types
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    @Precondition("The specified type is not null")
-    public static List<ActionType> getCompatibleTypes(final ActionType type) {
-        return INSTANCE.findCompatibleTypes(type);
-    }
-
     /**
      * Returns a list of action types that are compatible with the one
      * specified.
@@ -850,20 +603,6 @@ public final class ActionManager {
         return res;
     }
 
-    /**
-     * Returns a list of action components that are compatible with the
-     * specified class.
-     *
-     * @param target The class to be tested
-     * @return A list of compatible action components
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    @Precondition("The specified target is not null")
-    public static List<ActionComponent> getCompatibleComponents(final Class<?> target) {
-        return INSTANCE.findCompatibleComponents(target);
-    }
-
     /**
      * Returns a list of action components that are compatible with the
      * specified class.
@@ -885,20 +624,6 @@ public final class ActionManager {
         return res;
     }
 
-    /**
-     * Returns a list of action comparisons that are compatible with the
-     * specified class.
-     *
-     * @param target The class to be tested
-     * @return A list of compatible action comparisons
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    @Precondition("The specified target is not null")
-    public static List<ActionComparison> getCompatibleComparisons(final Class<?> target) {
-        return INSTANCE.findCompatibleComparisons(target);
-    }
-
     /**
      * Returns a list of action comparisons that are compatible with the
      * specified class.
@@ -920,17 +645,6 @@ public final class ActionManager {
         return res;
     }
 
-    /**
-     * Returns a list of all the action types registered by this manager.
-     *
-     * @return A list of registered action types
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static List<ActionType> getTypes() {
-        return INSTANCE.getAllTypes();
-    }
-
     /**
      * Returns a list of all the action types registered by this manager.
      *
@@ -940,17 +654,6 @@ public final class ActionManager {
         return types;
     }
 
-    /**
-     * Returns a list of all the action types registered by this manager.
-     *
-     * @return A list of registered action comparisons
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static List<ActionComparison> getComparisons() {
-        return INSTANCE.getAllComparisons();
-    }
-
     /**
      * Returns a list of all the action types registered by this manager.
      *
@@ -960,20 +663,6 @@ public final class ActionManager {
         return comparisons;
     }
 
-    /**
-     * Returns the action component specified by the given string, or null if it
-     * doesn't match a valid registered action component.
-     *
-     * @param type The name of the action component to try and find
-     * @return The actioncomponent with the specified name, or null on failure
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    @Precondition("The specified type is non-null and not empty")
-    public static ActionComponent getActionComponent(final String type) {
-        return INSTANCE.getComponent(type);
-    }
-
     /**
      * Returns the action component specified by the given string, or null if it
      * doesn't match a valid registered action component.
@@ -995,20 +684,6 @@ public final class ActionManager {
         return null;
     }
 
-    /**
-     * Returns the action type specified by the given string, or null if it
-     * doesn't match a valid registered action type.
-     *
-     * @param type The name of the action type to try and find
-     * @return The actiontype with the specified name, or null on failure
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    @Precondition("The specified type is non-null and not empty")
-    public static ActionComparison getActionComparison(final String type) {
-        return INSTANCE.getComparison(type);
-    }
-
     /**
      * Returns the action type specified by the given string, or null if it
      * doesn't match a valid registered action type.
@@ -1041,23 +716,11 @@ public final class ActionManager {
 
         ziprm.extractResources("", getDirectory());
 
-        loadActions();
+        getActionManager().loadUserActions();
 
         new File(path).delete();
     }
 
-    /**
-     * Adds a new listener for the specified action type.
-     *
-     * @param types The action types that are to be listened for
-     * @param listener The listener to be added
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static void addListener(final ActionListener listener, final ActionType ... types) {
-        INSTANCE.registerListener(listener, types);
-    }
-
     /**
      * Adds a new listener for the specified action type.
      *
@@ -1070,18 +733,6 @@ public final class ActionManager {
         }
     }
 
-    /**
-     * Removes a listener for the specified action type.
-     *
-     * @param types The action types that were being listened for
-     * @param listener The listener to be removed
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static void removeListener(final ActionListener listener, final ActionType ... types) {
-        INSTANCE.unregisterListener(listener, types);
-    }
-
     /**
      * Removes a listener for the specified action type.
      *
@@ -1094,17 +745,6 @@ public final class ActionManager {
         }
     }
 
-    /**
-     * Removes a listener for all action types.
-     *
-     * @param listener The listener to be removed
-     * @deprecated Use {@link #getActionManager()} and non-static methods
-     */
-    @Deprecated
-    public static void removeListener(final ActionListener listener) {
-        INSTANCE.unregisterListener(listener);
-    }
-
     /**
      * Removes a listener for all action types.
      *

src/com/dmdirc/actions/ActionModel.java

@@ -70,6 +70,15 @@ public class ActionModel {
     /** The concurrency group this action belongs to, if any. */
     protected String concurrencyGroup;
 
+    /** The status of this action. */
+    protected ActionStatus status = ActionStatus.ACTIVE;
+
+    /** A description of any error that occurs while creating the action. */
+    protected String error;
+
+    /** The type of error that occurred, if any. */
+    protected ActionErrorType errorType;
+
     /**
      * Creates a new instance of ActionModel with the specified properties.
      *
@@ -96,8 +105,7 @@ public class ActionModel {
             final ActionType[] triggers, final String[] response,
             final List<ActionCondition> conditions,
             final ConditionTree conditionTree, final String newFormat) {
-        this.group = group;
-        this.name = name;
+        this(group, name);
         this.triggers = triggers.clone();
         this.response = response.clone();
         this.conditions = conditions;
@@ -123,6 +131,10 @@ public class ActionModel {
         assert triggers.length > 0;
         assert triggers[0] != null;
 
+        if (status != ActionStatus.ACTIVE) {
+            return false;
+        }
+
         final ActionSubstitutor sub = new ActionSubstitutor(triggers[0]);
 
         if (!test(sub, arguments)) {
@@ -200,6 +212,37 @@ public class ActionModel {
         this.modified = true;
     }
 
+    /**
+     * Retrieves the status of this action.
+     *
+     * @since 0.6.5
+     * @return This action's current status
+     */
+    public ActionStatus getStatus() {
+        return status;
+    }
+
+    /**
+     * Retrieves a plain text description of any error that occurred while
+     * loading this action.
+     *
+     * @since 0.6.5
+     * @return This action's error message, or null if no error was encountered
+     */
+    public String getError() {
+        return error;
+    }
+
+    /**
+     * Retrieves the type of the error that occurred while loading this action.
+     *
+     * @since 0.6.5
+     * @return This action's error's type, or null if no error was encountered
+     */
+    public ActionErrorType getErrorType() {
+        return errorType;
+    }
+
     /**
      * Retrieves this action's triggers.
      *

src/com/dmdirc/actions/ActionStatus.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.actions;
+
+/**
+ * An enumeration of possible statuses for actions.
+ *
+ * @since 0.6.6
+ */
+public enum ActionStatus {
+
+    /** The action is active and will run if triggered. */
+    ACTIVE,
+    /** The action is disabled by the user. */
+    DISABLED,
+    /** The action has failed to load. */
+    FAILED;
+
+}

test/com/dmdirc/actions/ActionComponentChainTest.java

@@ -34,7 +34,7 @@ public class ActionComponentChainTest {
     @BeforeClass
     public static void setUp() throws Exception {
         IdentityManager.load();
-        ActionManager.init();
+        ActionManager.getActionManager().initialise();
     }
 
     @Test

test/com/dmdirc/actions/ActionConditionTest.java

@@ -33,7 +33,7 @@ public class ActionConditionTest {
     @BeforeClass
     public static void setUp() throws Exception {
         IdentityManager.load();
-        ActionManager.init();
+        ActionManager.getActionManager().initialise();
     }
 
     @Test

test/com/dmdirc/actions/ActionManagerTest.java

@@ -36,26 +36,26 @@ public class ActionManagerTest {
     @BeforeClass
     public static void setUpClass() throws Exception {
         IdentityManager.load();
-        ActionManager.init();
-        ActionManager.loadActions();
+        ActionManager.getActionManager().initialise();
+        ActionManager.getActionManager().loadUserActions();
 
         tearDownClass();
     }
 
     @AfterClass
     public static void tearDownClass() throws Exception {
-        if (ActionManager.getGroups().containsKey("unit-test")) {
-            ActionManager.removeGroup("unit-test");
+        if (ActionManager.getActionManager().getGroupsMap().containsKey("unit-test")) {
+            ActionManager.getActionManager().deleteGroup("unit-test");
         }
 
-        if (ActionManager.getGroups().containsKey("unit-test-two")) {
-            ActionManager.removeGroup("unit-test-two");
+        if (ActionManager.getActionManager().getGroupsMap().containsKey("unit-test-two")) {
+            ActionManager.getActionManager().deleteGroup("unit-test-two");
         }
     }
 
     @Test
     public void testMakeGroup() {
-        ActionManager.makeGroup("unit-test");
+        ActionManager.getActionManager().createGroup("unit-test");
 
         assertTrue("makeGroup must create the group directory",
                 new File(ActionManager.getDirectory() + "unit-test").isDirectory());
@@ -63,7 +63,7 @@ public class ActionManagerTest {
 
     @Test
     public void testGetGroup() {
-        final ActionGroup group = ActionManager.getGroup("unit-test");
+        final ActionGroup group = ActionManager.getActionManager().getOrCreateGroup("unit-test");
 
         assertEquals("getGroup must return an ActionGroup with the right name",
                 "unit-test", group.getName());
@@ -71,7 +71,7 @@ public class ActionManagerTest {
 
     @Test
     public void testRenameGroup() {
-        ActionManager.renameGroup("unit-test", "unit-test-two");
+        ActionManager.getActionManager().changeGroupName("unit-test", "unit-test-two");
         assertFalse("renameGroup must unlink the old directory",
                 new File(ActionManager.getDirectory() + "unit-test").isDirectory());
         assertTrue("renameGroup must create the target directory",
@@ -83,26 +83,26 @@ public class ActionManagerTest {
         final Action action = new Action("unit-test-two", "test1", new ActionType[0],
                 new String[0], new ArrayList<ActionCondition>(), null);
         assertSame("Creating a new action must add it to the correct group",
-                action, ActionManager.getGroup("unit-test-two").get(0));
+                action, ActionManager.getActionManager().getOrCreateGroup("unit-test-two").get(0));
 
-        ActionManager.renameGroup("unit-test-two", "unit-test");
+        ActionManager.getActionManager().changeGroupName("unit-test-two", "unit-test");
         assertFalse("renameGroup must unlink the old directory",
                 new File(ActionManager.getDirectory() + "unit-test-two").isDirectory());
         assertTrue("renameGroup must create the target directory",
                 new File(ActionManager.getDirectory() + "unit-test").isDirectory());
         assertSame("renameGroup must move actions to new group",
-                action, ActionManager.getGroup("unit-test").get(0));
+                action, ActionManager.getActionManager().getOrCreateGroup("unit-test").get(0));
         assertEquals("renameGroup must remove actions from old group",
-                0, ActionManager.getGroup("unit-test-two").size());
+                0, ActionManager.getActionManager().getOrCreateGroup("unit-test-two").size());
     }
 
     @Test
     public void testRemoveGroup() {
-        ActionManager.removeGroup("unit-test");
+        ActionManager.getActionManager().deleteGroup("unit-test");
         assertFalse("removeGroup must unlink directory",
                 new File(ActionManager.getDirectory() + "unit-test").isDirectory());
 
-        ActionManager.saveActions();
+        ActionManager.getActionManager().saveAllActions();
         assertFalse("saveActions must not restore removed groups",
                 new File(ActionManager.getDirectory() + "unit-test").isDirectory());
     }

test/com/dmdirc/actions/ActionSubstitutorTest.java

@@ -55,7 +55,7 @@ public class ActionSubstitutorTest {
     @BeforeClass
     public static void setup() throws InvalidIdentityFileException {
         IdentityManager.load();
-        ActionManager.init();
+        ActionManager.getActionManager().initialise();
 
         SETTINGS.put("alpha", "A");
         SETTINGS.put("bravo", "$alpha");

test/com/dmdirc/actions/ActionTest.java

@@ -44,7 +44,7 @@ public class ActionTest {
     @BeforeClass
     public static void setUp() throws Exception {
         IdentityManager.load();
-        ActionManager.init();
+        ActionManager.getActionManager().initialise();
     }
 
     private static Action action;
@@ -115,9 +115,9 @@ public class ActionTest {
         action.config.read();
         action.loadActionFromConfig();
 
-        assertEquals(1, ActionManager.getGroup("unit-test").getSettings().size());
+        assertEquals(1, ActionManager.getActionManager().getOrCreateGroup("unit-test").getSettings().size());
 
-        final PreferencesSetting setting = ActionManager.getGroup("unit-test")
+        final PreferencesSetting setting = ActionManager.getActionManager().getOrCreateGroup("unit-test")
                 .getSettings().values().iterator().next();
         assertEquals(PreferencesType.TEXT, setting.getType());
         assertEquals("Highlight Regex", setting.getTitle());

test/com/dmdirc/actions/validators/ActionGroupValidatorTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.actions.validators;
 
-import com.dmdirc.actions.validators.ActionGroupValidator;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.config.IdentityManager;
 import org.junit.BeforeClass;
@@ -34,12 +33,12 @@ public class ActionGroupValidatorTest {
     @BeforeClass
     public static void setUpClass() throws Exception {
         IdentityManager.load();
+        ActionManager.getActionManager().initialise();
     }
 
     @Test
     public void testValidate() {
         final ActionGroupValidator rv = new ActionGroupValidator();
-        ActionManager.init();
 
         assertFalse(rv.validate("filename").isFailure());
         assertTrue(rv.validate("aliases").isFailure());

test/com/dmdirc/config/prefs/PreferencesManagerTest.java

@@ -124,8 +124,8 @@ public class PreferencesManagerTest {
     public void testOpenAction() {
         final ActionListener tal = mock(ActionListener.class);
 
-        ActionManager.init();
-        ActionManager.addListener(tal, CoreActionType.CLIENT_PREFS_OPENED);
+        ActionManager.getActionManager().initialise();
+        ActionManager.getActionManager().registerListener(tal, CoreActionType.CLIENT_PREFS_OPENED);
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
 
@@ -137,8 +137,8 @@ public class PreferencesManagerTest {
     public void testCloseAction() {
         final ActionListener tal = mock(ActionListener.class);
 
-        ActionManager.init();
-        ActionManager.addListener(tal, CoreActionType.CLIENT_PREFS_CLOSED);
+        ActionManager.getActionManager().initialise();
+        ActionManager.getActionManager().registerListener(tal, CoreActionType.CLIENT_PREFS_CLOSED);
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
         pm.close();