Remove actions. Entirely.

"Death is nothing, but to live defeated and inglorious is to die daily."

Happy new year! :)

res/com/dmdirc/actions/defaults/umodes/ohv

@@ -1,20 +0,0 @@
-# This is a DMDirc configuration file.
-# Written on: Mon Dec 17 23:32:19 GMT 2007
-
-# This section indicates which sections below take key/value
-# pairs, rather than a simple list. It should be placed above
-# any sections that take key/values.
-keysections:
-  condition 0
-
-triggers:
-  SERVER_CONNECTED
-
-response:
-  /.set --server popup umodes <umodes-op\n<umodes-hop\n<umodes-voice
-
-condition 0:
-  argument=0
-  component=SERVER_CHANNELUMODES
-  target=ohv
-  comparison=STRING_EQUALS

res/com/dmdirc/actions/defaults/umodes/ov

@@ -1,27 +0,0 @@
-# This is a DMDirc configuration file.
-# Written on: Mon Dec 17 23:32:19 GMT 2007
-
-# This section indicates which sections below take key/value
-# pairs, rather than a simple list. It should be placed above
-# any sections that take key/values.
-keysections:
-  condition 0
-  metadata
-
-triggers:
-  SERVER_CONNECTED
-
-response:
-  /.set --server popup umodes <umodes-op\n<umodes-voice
-
-condition 0:
-  argument=0
-  component=SERVER_CHANNELUMODES
-  target=ov
-  comparison=STRING_EQUALS
-
-metadata:
-  description=Automatically sets the popup.umodes setting when connecting to a server, so that the correct user modes appear in the nicklist popup.
-  author=Chris <chris@dmdirc.com>
-  version=2
-  component=19

res/com/dmdirc/actions/defaults/umodes/qaohv

@@ -1,20 +0,0 @@
-# This is a DMDirc configuration file.
-# Written on: Mon Dec 17 23:32:19 GMT 2007
-
-# This section indicates which sections below take key/value
-# pairs, rather than a simple list. It should be placed above
-# any sections that take key/values.
-keysections:
-  condition 0
-
-triggers:
-  SERVER_CONNECTED
-
-response:
-  /.set --server popup umodes <umodes-op\n<umodes-hop\n<umodes-voice\n-\n<umodes-admin\n<umodes-owner
-
-condition 0:
-  argument=0
-  component=SERVER_CHANNELUMODES
-  target=qaohv
-  comparison=STRING_EQUALS

res/com/dmdirc/actions/defaults/umodes/qaov

@@ -1,20 +0,0 @@
-# This is a DMDirc configuration file.
-# Written on: Mon Dec 17 23:32:19 GMT 2007
-
-# This section indicates which sections below take key/value
-# pairs, rather than a simple list. It should be placed above
-# any sections that take key/values.
-keysections:
-  condition 0
-
-triggers:
-  SERVER_CONNECTED
-
-response:
-  /.set --server popup umodes <umodes-op\n<umodes-voice\n-\n<umodes-admin\n<umodes-owner
-
-condition 0:
-  argument=0
-  component=SERVER_CHANNELUMODES
-  target=qaov
-  comparison=STRING_EQUALS

src/com/dmdirc/ClientModule.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc;
 
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.commandline.CommandLineOptionsModule;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
@@ -33,7 +32,6 @@ import com.dmdirc.commandparser.auto.AutoCommandModule;
 import com.dmdirc.commandparser.commands.CommandModule;
 import com.dmdirc.config.ConfigModule;
 import com.dmdirc.config.profiles.ProfilesModule;
-import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ConnectionFactory;
 import com.dmdirc.interfaces.ConnectionManager;
@@ -120,11 +118,6 @@ public class ClientModule {
         return new IconManager(globalConfig, urlBuilder);
     }
 
-    @Provides
-    public ActionController getActionController(final ActionManager actionManager) {
-        return actionManager;
-    }
-
     @Provides
     public LifecycleController getLifecycleController(final SystemLifecycleController controller) {
         return controller;

src/com/dmdirc/Main.java

@@ -23,8 +23,6 @@
 package com.dmdirc;
 
 import com.dmdirc.GlobalWindow.GlobalWindowManager;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.ColourActionComparison;
 import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.events.ClientClosedEvent;
@@ -71,8 +69,6 @@ public class Main {
     private final IdentityController identityManager;
     /** The server manager the client will use. */
     private final ConnectionManager connectionManager;
-    /** The action manager the client will use. */
-    private final ActionManager actionManager;
     /** The command-line parser used for this instance. */
     private final CommandLineParser commandLineParser;
     /** The plugin manager the client will use. */
@@ -83,8 +79,6 @@ public class Main {
     private final CommandManager commandManager;
     /** The global window manager to use. */
     private final GlobalWindowManager globalWindowManager;
-    /** The colour-based action comparisons. */
-    private final ColourActionComparison colourActionComparison;
     /** The set of known lifecycle components. */
     private final Set<SystemLifecycleComponent> lifecycleComponents;
     /** The set of migrators to execute on startup. */
@@ -103,13 +97,11 @@ public class Main {
     public Main(
             final IdentityController identityManager,
             final ConnectionManager connectionManager,
-            final ActionManager actionManager,
             final CommandLineParser commandLineParser,
             final PluginManager pluginManager,
             final CommandManager commandManager,
             final CorePluginExtractor corePluginExtractor,
             final GlobalWindowManager globalWindowManager,
-            final ColourActionComparison colourActionComparison,
             final Set<SystemLifecycleComponent> lifecycleComponents,
             final Set<Migrator> migrators,
             final DMDircMBassador eventBus,
@@ -117,13 +109,11 @@ public class Main {
             final ModeAliasReporter reporter) {
         this.identityManager = identityManager;
         this.connectionManager = connectionManager;
-        this.actionManager = actionManager;
         this.commandLineParser = commandLineParser;
         this.pluginManager = pluginManager;
         this.corePluginExtractor = corePluginExtractor;
         this.commandManager = commandManager;
         this.globalWindowManager = globalWindowManager;
-        this.colourActionComparison = colourActionComparison;
         this.lifecycleComponents = lifecycleComponents;
         this.migrators = migrators;
         this.eventBus = eventBus;
@@ -177,9 +167,7 @@ public class Main {
 
         lifecycleComponents.forEach(SystemLifecycleComponent::startUp);
 
-        actionManager.initialise(colourActionComparison);
         pluginManager.doAutoLoad();
-        actionManager.loadUserActions();
 
         eventBus.publishAsync(new ClientOpenedEvent());
         eventBus.subscribe(reporter);

src/com/dmdirc/actions/Action.java

@@ -1,639 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.GlobalWindow;
-import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.events.ActionCreatedEvent;
-import com.dmdirc.events.ActionDeletedEvent;
-import com.dmdirc.events.ActionUpdatedEvent;
-import com.dmdirc.events.AppErrorEvent;
-import com.dmdirc.events.UserErrorEvent;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.actions.ActionComparison;
-import com.dmdirc.interfaces.actions.ActionComponent;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.updater.Version;
-import com.dmdirc.util.io.ConfigFile;
-import com.dmdirc.util.io.InvalidConfigFileException;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Provider;
-
-/**
- * Describes a single action.
- */
-public class Action extends ActionModel implements ConfigChangeListener {
-
-    /** The domain name for condition trees. */
-    private static final String DOMAIN_CONDITIONTREE = "conditiontree";
-    /** The domain name for format changes. */
-    private static final String DOMAIN_FORMAT = "format";
-    /** The domain name for meta-data. */
-    private static final String DOMAIN_METADATA = "metadata";
-    /** The domain name for response information. */
-    private static final String DOMAIN_RESPONSE = "response";
-    /** The domain name for triggers. */
-    private static final String DOMAIN_TRIGGERS = "triggers";
-    /** The domain name for concurrency. */
-    private static final String DOMAIN_CONCURRENCY = "concurrency";
-    /** The domain name for misc settings. */
-    private static final String DOMAIN_MISC = "misc";
-    /** The base directory to save actions in. */
-    private final Path actionsDirectory;
-    /** The controller to use to read and update settings. */
-    private final IdentityController identityController;
-    /** The controller to use to retrieve components, comparisons, etc. */
-    private final ActionController actionController;
-    /** Event bus to post events to. */
-    private final DMDircMBassador eventBus;
-    /** The config file we're using. */
-    protected ConfigFile config;
-    /** The location of the file we're reading/saving. */
-    private Path location;
-
-    /**
-     * Creates a new instance of Action. The group and name specified must be the group and name of
-     * a valid action already saved to disk.
-     *
-     * @param eventBus                    Event bus to post events to
-     * @param globalWindowProvider        Provider of global windows for triggering actions.
-     * @param substitutorFactory          Factory to use to create action substitutors.
-     * @param actionController            The controller that owns this action.
-     * @param identityController          The controller to use to retrieve and update settings.
-     * @param actionsDirectory            The base directory to store actions in.
-     * @param group                       The group the action belongs to
-     * @param name                        The name of the action
-     */
-    public Action(final DMDircMBassador eventBus,
-            final Provider<GlobalWindow> globalWindowProvider,
-            final ActionSubstitutorFactory substitutorFactory,
-            final ActionController actionController, final IdentityController identityController,
-            final Path actionsDirectory, final String group, final String name) {
-        super(globalWindowProvider, substitutorFactory, group, name);
-
-        this.eventBus = eventBus;
-        this.actionController = actionController;
-        this.identityController = identityController;
-        this.actionsDirectory = actionsDirectory;
-        this.location = actionsDirectory.resolve(group).resolve(name);
-
-        try {
-            config = new ConfigFile(location);
-            config.read();
-            loadActionFromConfig();
-            actionController.addAction(this);
-        } catch (InvalidConfigFileException ex) {
-            error(ActionErrorType.FILE, "Unable to parse action file: " + ex.getMessage());
-        } catch (IOException ex) {
-            error(ActionErrorType.FILE, "I/O error when loading action: " + ex.getMessage());
-        }
-
-        identityController.getGlobalConfiguration().addChangeListener("disable_action",
-                (group + "/" + name).replace(' ', '.'), this);
-        checkDisabled();
-    }
-
-    /**
-     * Creates a new instance of Action with the specified properties and saves it to disk.
-     *
-     * @param eventBus                    Event bus to post events to
-     * @param globalWindowProvider        Provider of global windows for triggering actions.
-     * @param substitutorFactory          Factory to use to create action substitutors.
-     * @param actionController            The controller that owns this action.
-     * @param identityController          The controller to use to retrieve and update settings.
-     * @param actionsDirectory            The base directory to store actions in.
-     * @param group                       The group the action belongs to
-     * @param name                        The name of the action
-     * @param triggers                    The triggers to use
-     * @param response                    The response to use
-     * @param conditions                  The conditions to use
-     * @param conditionTree               The condition tree to use
-     * @param newFormat                   The new formatter to use
-     */
-    public Action(final DMDircMBassador eventBus,
-            final Provider<GlobalWindow> globalWindowProvider,
-            final ActionSubstitutorFactory substitutorFactory,
-            final ActionController actionController, final IdentityController identityController,
-            final Path actionsDirectory, final String group, final String name,
-            final ActionType[] triggers, final String[] response,
-            final List<ActionCondition> conditions, final ConditionTree conditionTree,
-            final String newFormat) {
-        super(globalWindowProvider, substitutorFactory, group, name,
-                triggers, response, conditions, conditionTree, newFormat);
-
-        this.eventBus = eventBus;
-        this.actionController = actionController;
-        this.identityController = identityController;
-        this.actionsDirectory = actionsDirectory;
-        this.location = actionsDirectory.resolve(group)
-                .resolve(name.replaceAll("[^A-Za-z0-9\\-_]", "_"));
-
-        try {
-            Files.createDirectories(location.getParent());
-        } catch (IOException ex) {
-            //TODO we don't handle the error now, but we should
-        }
-
-        save();
-
-        identityController.getGlobalConfiguration().addChangeListener("disable_action",
-                (group + "/" + name).replace(' ', '.'), this);
-        checkDisabled();
-
-        actionController.addAction(this);
-        //TODO This needs to be done somewhere else, remove eventbus when it is.
-        eventBus.publishAsync(new ActionCreatedEvent(this));
-    }
-
-    /**
-     * Loads this action from the config instance.
-     */
-    protected void loadActionFromConfig() {
-        if (config.isFlatDomain(DOMAIN_TRIGGERS)) {
-            if (!loadTriggers(config.getFlatDomain(DOMAIN_TRIGGERS))) {
-                return;
-            }
-        } else {
-            error(ActionErrorType.TRIGGERS, "No trigger specified");
-            return;
-        }
-
-        if (config.isFlatDomain(DOMAIN_RESPONSE)) {
-            response = new String[config.getFlatDomain(DOMAIN_RESPONSE).size()];
-
-            int i = 0;
-            for (String line : config.getFlatDomain(DOMAIN_RESPONSE)) {
-                response[i++] = line;
-            }
-        } else {
-            error(ActionErrorType.RESPONSE, "No response specified");
-            return;
-        }
-
-        if (config.isFlatDomain(DOMAIN_FORMAT)) {
-            newFormat = config.getFlatDomain(DOMAIN_FORMAT).isEmpty() ? ""
-                    : config.getFlatDomain(DOMAIN_FORMAT).get(0);
-        }
-
-        for (int cond = 0; config.isKeyDomain("condition " + cond); cond++) {
-            if (!readCondition(config.getKeyDomain("condition " + cond))) {
-                return;
-            }
-        }
-
-        if (config.isFlatDomain(DOMAIN_CONDITIONTREE)
-                && !config.getFlatDomain(DOMAIN_CONDITIONTREE).isEmpty()) {
-            conditionTree = ConditionTree.parseString(
-                    config.getFlatDomain(DOMAIN_CONDITIONTREE).get(0));
-
-            if (conditionTree == null) {
-                error(ActionErrorType.CONDITION_TREE, "Unable to parse condition tree");
-                return;
-            }
-
-            if (conditionTree.getMaximumArgument() >= conditions.size()) {
-                error(ActionErrorType.CONDITION_TREE, "Condition tree references condition "
-                        + conditionTree.getMaximumArgument() + " but there are"
-                        + " only " + conditions.size() + " conditions");
-                return;
-            }
-        }
-
-        if (config.isKeyDomain(DOMAIN_CONCURRENCY)
-                && config.getKeyDomain(DOMAIN_CONCURRENCY).containsKey("group")) {
-            setConcurrencyGroup(config.getKeyDomain(DOMAIN_CONCURRENCY).get("group"));
-        }
-
-        if (config.isKeyDomain(DOMAIN_MISC)
-                && config.getKeyDomain(DOMAIN_MISC).containsKey("stopping")) {
-            setStopping(Boolean.parseBoolean(config.getKeyDomain(DOMAIN_MISC).get("stopping")));
-        }
-
-        if (status == ActionStatus.DISABLED) {
-            status = ActionStatus.ACTIVE;
-        }
-
-        checkMetaData();
-    }
-
-    /**
-     * Checks to see if this action contains group meta-data, and adds it to the group as
-     * appropriate.
-     */
-    private void checkMetaData() {
-        if (config.isKeyDomain(DOMAIN_METADATA)) {
-            final ActionGroup myGroup = actionController.getOrCreateGroup(group);
-            final Map<String, String> data = config.getKeyDomain(DOMAIN_METADATA);
-
-            if (data.containsKey("description")) {
-                myGroup.setDescription(data.get("description"));
-            }
-
-            if (data.containsKey("author")) {
-                myGroup.setAuthor(data.get("author"));
-            }
-
-            if (data.containsKey("version")) {
-                myGroup.setVersion(new Version(data.get("version")));
-            }
-
-            if (data.containsKey("component")) {
-                try {
-                    myGroup.setComponent(Integer.parseInt(data.get("component")));
-                } catch (NumberFormatException ex) {
-                    // Do nothing
-                }
-            }
-        }
-
-        for (int i = 0; config.isKeyDomain("setting " + i); i++) {
-            final ActionGroup myGroup = actionController.getOrCreateGroup(group);
-            final Map<String, String> data = config.getKeyDomain("setting " + i);
-
-            if (data.containsKey("type") && data.containsKey("setting")
-                    && data.containsKey("title") && data.containsKey("default")
-                    && data.containsKey("tooltip")) {
-                actionController.registerSetting(data.get("setting"), data.get("default"));
-                myGroup.getSettings().put(data.get("setting"), new PreferencesSetting(
-                        PreferencesType.valueOf(data.get("type")), "actions",
-                        data.get("setting"), data.get("title"), data.get("tooltip"),
-                        identityController.getGlobalConfiguration(),
-                        identityController.getUserSettings()));
-            }
-        }
-    }
-
-    /**
-     * Loads a list of triggers with the specified names.
-     *
-     * @param newTriggers A list of trigger names
-     *
-     * @return True if all triggers are valid and compatible, false otherwise.
-     */
-    private boolean loadTriggers(final List<String> newTriggers) {
-        triggers = new ActionType[newTriggers.size()];
-
-        for (int i = 0; i < triggers.length; i++) {
-            triggers[i] = actionController.getType(newTriggers.get(i));
-
-            if (triggers[i] == null) {
-                error(ActionErrorType.TRIGGERS, "Invalid trigger specified: " + newTriggers.get(i));
-                return false;
-            } else if (i != 0 && !triggers[i].getType().equals(triggers[0].getType())) {
-                error(ActionErrorType.TRIGGERS, "Triggers are not compatible");
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Called to save the action.
-     */
-    public void save() {
-        if (!isModified()) {
-            return;
-        }
-
-        final ConfigFile newConfig = new ConfigFile(location);
-
-        final List<String> triggerNames = new ArrayList<>();
-        final List<String> responseLines = new ArrayList<>();
-        responseLines.addAll(Arrays.asList(response));
-
-        for (ActionType trigger : triggers) {
-            if (trigger == null) {
-                eventBus.publish(new AppErrorEvent(ErrorLevel.LOW,
-                        new IllegalArgumentException("Triggers: "+ Arrays.toString(triggers)),
-                        "ActionType was null", ""));
-                continue;
-            }
-
-            triggerNames.add(trigger.toString());
-        }
-
-        newConfig.addDomain(DOMAIN_TRIGGERS, triggerNames);
-        newConfig.addDomain(DOMAIN_RESPONSE, responseLines);
-
-        if (conditionTree != null) {
-            newConfig.addDomain(DOMAIN_CONDITIONTREE, new ArrayList<>());
-            newConfig.getFlatDomain(DOMAIN_CONDITIONTREE).add(conditionTree.toString());
-        }
-
-        if (newFormat != null) {
-            newConfig.addDomain(DOMAIN_FORMAT, new ArrayList<>());
-            newConfig.getFlatDomain(DOMAIN_FORMAT).add(newFormat);
-        }
-
-        if (concurrencyGroup != null) {
-            newConfig.addDomain(DOMAIN_CONCURRENCY, new HashMap<>());
-            newConfig.getKeyDomain(DOMAIN_CONCURRENCY).put("group", concurrencyGroup);
-        }
-
-        if (stop) {
-            newConfig.addDomain(DOMAIN_MISC, new HashMap<>());
-            newConfig.getKeyDomain(DOMAIN_MISC).put("stopping", "true");
-        }
-
-        int i = 0;
-        for (ActionCondition condition : conditions) {
-            final Map<String, String> data = new HashMap<>();
-
-            data.put("argument", String.valueOf(condition.getArg()));
-
-            if (condition.getArg() == -1) {
-                data.put("starget", condition.getStarget());
-            } else {
-                data.put("component", condition.getComponent().toString());
-            }
-
-            data.put("comparison", condition.getComparison().toString());
-            data.put("target", condition.getTarget());
-
-            newConfig.addDomain("condition " + i, data);
-            i++;
-        }
-
-        if (config != null) {
-            // Preserve any meta-data
-            if (config.isKeyDomain(DOMAIN_METADATA)) {
-                newConfig.addDomain(DOMAIN_METADATA, config.getKeyDomain(DOMAIN_METADATA));
-            }
-
-            for (i = 0; config.isKeyDomain("setting " + i); i++) {
-                newConfig.addDomain("setting " + i, config.getKeyDomain("setting " + i));
-            }
-        }
-
-        try {
-            newConfig.write();
-
-            resetModified();
-        } catch (IOException ex) {
-            eventBus.publish(new UserErrorEvent(ErrorLevel.HIGH, ex,
-                    "I/O error when saving action: " + group + '/' + name + ": " + ex.getMessage(),
-                    ""));
-        }
-
-        eventBus.publishAsync(new ActionUpdatedEvent(this));
-    }
-
-    /**
-     * Reads a condition from the specified configuration section.
-     *
-     * @param data The relevant section of the action configuration
-     *
-     * @return True if the condition is valid, false otherwise
-     */
-    private boolean readCondition(final Map<String, String> data) {
-        final int arg;
-        ActionComponent component = null;
-        final ActionComparison comparison;
-        final String target;
-        String starget = null;
-
-        // ------ Read the argument
-        try {
-            arg = Integer.parseInt(data.get("argument"));
-        } catch (NumberFormatException ex) {
-            error(ActionErrorType.CONDITIONS,
-                    "Invalid argument number specified: " + data.get("argument"));
-            return false;
-        }
-
-        if (arg < -1 || arg >= triggers[0].getType().getArity()) {
-            error(ActionErrorType.CONDITIONS, "Invalid argument number specified: " + arg);
-            return false;
-        }
-
-        // ------ Read the component or the source
-        if (arg == -1) {
-            starget = data.get("starget");
-
-            if (starget == null) {
-                error(ActionErrorType.CONDITIONS, "No starget specified");
-                return false;
-            }
-        } else {
-            component = readComponent(data, arg);
-            if (component == null) {
-                return false;
-            }
-        }
-
-        // ------ Read the comparison
-        comparison = actionController.getComparison(data.get("comparison"));
-        if (comparison == null) {
-            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(ActionErrorType.CONDITIONS,
-                    "Comparison cannot be applied to specified component: " + data.get("comparison"));
-            return false;
-        }
-
-        // ------ Read the target
-        target = data.get("target");
-
-        if (target == null) {
-            error(ActionErrorType.CONDITIONS, "No target specified for condition");
-            return false;
-        }
-
-        if (arg == -1) {
-            conditions.add(new ActionCondition(starget, comparison, target));
-        } else {
-            conditions.add(new ActionCondition(arg, component, comparison, target));
-        }
-
-        return true;
-    }
-
-    /**
-     * Reads a component from the specified data section for the specified argument.
-     *
-     * @param data The relevant section of the action configuration
-     * @param arg  The argument number that the component should apply to
-     *
-     * @return The corresponding ActionComponent, or null if the specified component is invalid.
-     */
-    private ActionComponent readComponent(final Map<String, String> data, final int arg) {
-        final String componentName = data.get("component");
-        final ActionComponent component;
-
-        if (componentName.indexOf('.') == -1) {
-            component = actionController.getComponent(componentName);
-        } else {
-            try {
-                component = new ActionComponentChain(triggers[0].getType().getArgTypes()[arg],
-                        componentName, actionController);
-            } catch (IllegalArgumentException iae) {
-                error(ActionErrorType.CONDITIONS, iae.getMessage());
-                return null;
-            }
-        }
-
-        if (component == null) {
-            error(ActionErrorType.CONDITIONS, "Unknown component: " + componentName);
-            return null;
-        }
-
-        if (!component.appliesTo().equals(triggers[0].getType().getArgTypes()[arg])) {
-            error(ActionErrorType.CONDITIONS,
-                    "Component cannot be applied to specified arg in condition: " + componentName);
-            return null;
-        }
-
-        return component;
-    }
-
-    /**
-     * Raises a trivial error, informing the user of the problem.
-     *
-     * @param type    The type of error that occurred.
-     * @param message The message to be raised
-     */
-    private void error(final ActionErrorType type, final String message) {
-        this.error = message;
-        this.errorType = type;
-        this.status = ActionStatus.FAILED;
-
-        eventBus.publish(new UserErrorEvent(ErrorLevel.LOW,
-                new IllegalStateException("Error when parsing action: " + group + '/' + name + ": "
-                        + message),
-                "Error when parsing action" + group + '/' + name + ": " + message, ""));
-    }
-
-    @Override
-    public void setName(final String newName) {
-        super.setName(newName);
-
-        try {
-            Files.delete(location);
-        } catch (IOException ex) {
-            //TODO we don't handle the error now, but we should
-        }
-        location = actionsDirectory.resolve(group).resolve(newName);
-
-        save();
-    }
-
-    @Override
-    public void setGroup(final String newGroup) {
-        super.setGroup(newGroup);
-
-        try {
-            Files.delete(location);
-        } catch (IOException ex) {
-            //TODO we don't handle the error now, but we should
-        }
-
-        location = actionsDirectory.resolve(group).resolve(name);
-
-        try {
-            Files.createDirectories(location);
-        } catch (IOException ex) {
-            //TODO we don't handle the error now, but we should
-        }
-
-
-        save();
-    }
-
-    /**
-     * Deletes this action.
-     */
-    public void delete() {
-        eventBus.publishAsync(new ActionDeletedEvent(actionController.getOrCreateGroup(getGroup()), this));
-        try {
-            Files.delete(location);
-        } catch (IOException ex) {
-            //TODO we don't handle the error now, but we should
-        }
-    }
-
-    @Override
-    public String toString() {
-        final String parent = super.toString();
-
-        return parent.substring(0, parent.length() - 1) + ",location=" + location + "]";
-    }
-
-    @Override
-    public void configChanged(final String domain, final String key) {
-        checkDisabled();
-    }
-
-    /**
-     * Checks if this action is disabled or not.
-     *
-     * @since 0.6.3
-     */
-    protected void checkDisabled() {
-        final String key = (group + "/" + name).replace(' ', '.');
-        final boolean disabled = identityController.getGlobalConfiguration().hasOptionBool(
-                "disable_action", key)
-                && identityController.getGlobalConfiguration().getOptionBool("disable_action", key);
-
-        if (disabled && status == ActionStatus.ACTIVE) {
-            status = ActionStatus.DISABLED;
-        } else if (!disabled && status == ActionStatus.DISABLED) {
-            status = ActionStatus.ACTIVE;
-        }
-    }
-
-    /**
-     * Sets whether this action is enabled or not.
-     *
-     * @param enabled true to enable, false to disable
-     */
-    public void setEnabled(final boolean enabled) {
-        if (enabled) {
-            identityController.getUserSettings().unsetOption("disable_action",
-                    (group + "/" + name).replace(' ', '.'));
-        } else {
-            identityController.getUserSettings().setOption("disable_action",
-                    (group + "/" + name).replace(' ', '.'), true);
-        }
-    }
-
-}

src/com/dmdirc/actions/ActionComponentChain.java

@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.Precondition;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.actions.ActionComponent;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-/**
- * An action component chain supports chaining of multiple action components together.
- */
-public class ActionComponentChain implements ActionComponent {
-
-    /**
-     * A list of components in this chain.
-     */
-    private final List<ActionComponent> components = new ArrayList<>();
-
-    /**
-     * Creates a new component chain from the specified text representation. Chains are separated
-     * with full stops (.).
-     *
-     * @param source  The class that this chain needs to start with
-     * @param chain   The textual representation of the chain
-     * @param manager The action manager to use to look up components
-     */
-    public ActionComponentChain(final Class<?> source, final String chain,
-            final ActionController manager) {
-        Class<?> current = source;
-
-        for (String componentName : chain.split("\\.")) {
-            final ActionComponent component = manager.getComponent(componentName);
-
-            if (component == null) {
-                throw new IllegalArgumentException("Component " + componentName
-                        + " not found");
-            } else if (component.appliesTo().isAssignableFrom(current)) {
-                components.add(component);
-                current = component.getType();
-            } else {
-                throw new IllegalArgumentException("Component " + componentName
-                        + " cannot be applied to " + current.getName());
-            }
-        }
-    }
-
-    @Override
-    public Object get(final Object arg) {
-        Object res = arg;
-
-        for (ActionComponent component : components) {
-            if (res == null) {
-                return null;
-            }
-
-            res = component.get(res);
-        }
-
-        return res;
-    }
-
-    @Precondition("This component chain has one or more components")
-    @Override
-    public Class<?> appliesTo() {
-        checkArgument(!components.isEmpty());
-
-        return components.get(0).appliesTo();
-    }
-
-    @Precondition("This component chain has one or more components")
-    @Override
-    public Class<?> getType() {
-        checkArgument(!components.isEmpty());
-
-        return components.get(components.size() - 1).getType();
-    }
-
-    @Precondition("This component chain has one or more components")
-    @Override
-    public String getName() {
-        checkArgument(!components.isEmpty());
-
-        final StringBuilder name = new StringBuilder();
-
-        for (ActionComponent component : components) {
-            name.append("'s ");
-            name.append(component.getName());
-        }
-
-        return name.substring(3);
-    }
-
-    @Override
-    @Precondition("This component chain has one or more components")
-    public String toString() {
-        checkArgument(!components.isEmpty());
-
-        final StringBuilder name = new StringBuilder();
-
-        for (ActionComponent component : components) {
-            name.append('.');
-            name.append(component.toString());
-        }
-
-        return name.substring(1);
-    }
-
-    @Override
-    public String name() {
-        return toString();
-    }
-
-    /**
-     * Determines if any components in this chain require a server to have an established connection
-     * in order to function.
-     *
-     * @since 0.6.4
-     * @return True iff at least one component requires a connection
-     */
-    public boolean requiresConnection() {
-        boolean res = false;
-
-        for (ActionComponent component : components) {
-            try {
-                final ComponentOptions options = component.getClass()
-                        .getMethod("get", Object.class).getAnnotation(ComponentOptions.class);
-                if (options != null) {
-                    res |= options.requireConnected();
-                }
-            } catch (NoSuchMethodException ex) {
-                // Do nothing
-            }
-        }
-
-        return res;
-    }
-
-}

src/com/dmdirc/actions/ActionCondition.java

@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.interfaces.actions.ActionComparison;
-import com.dmdirc.interfaces.actions.ActionComponent;
-
-/**
- * An action condition represents one condition within an action.
- */
-public class ActionCondition {
-
-    /** The argument number that this action condition applies to. */
-    private int arg;
-    /** The component that this action condition applies to. */
-    private ActionComponent component;
-    /** The comparison that should be used for this condition. */
-    private ActionComparison comparison;
-    /** The target of the comparison for this condition. */
-    private String target = "";
-    /** The source target for this comparison. */
-    private String starget = "";
-
-    /**
-     * Creates a new instance of ActionCondition that compares the output of a component to a
-     * string.
-     *
-     * @param arg        The argument number to be tested
-     * @param component  The component to be tested
-     * @param comparison The comparison to be used
-     * @param target     The target of the comparison
-     */
-    public ActionCondition(final int arg, final ActionComponent component,
-            final ActionComparison comparison, final String target) {
-
-        this.arg = arg;
-        this.component = component;
-        this.comparison = comparison;
-        this.target = target;
-    }
-
-    /**
-     * Creates a new instance of ActionCondition that compares two strings.
-     *
-     * @param starget    The first target for comparison.
-     * @param comparison The comparison to be used
-     * @param target     The second target for the comparison
-     */
-    public ActionCondition(final String starget, final ActionComparison comparison,
-            final String target) {
-
-        this.arg = -1;
-        this.starget = starget;
-        this.comparison = comparison;
-        this.target = target;
-    }
-
-    /**
-     * Tests to see if this condition holds.
-     *
-     * @param sub  The substitutor to use for this
-     * @param args The event arguments to be tested
-     *
-     * @return True if the condition holds, false otherwise
-     */
-    public boolean test(final ActionSubstitutor sub, final Object... args) {
-        final String thisTarget = sub.doSubstitution(getTarget(), args);
-
-        if (arg == -1) {
-            final String thisStarget = sub.doSubstitution(starget, args);
-            return getComparison().test(thisStarget, thisTarget);
-        } else {
-            return getComparison().test(getComponent().get(args[getArg()]), thisTarget);
-        }
-    }
-
-    /**
-     * Returns the argument number this condition applies to.
-     *
-     * @return Argument number
-     */
-    public int getArg() {
-        return arg;
-    }
-
-    /**
-     * Returns the component this condition applies to.
-     *
-     * @return Component to apply condition to
-     */
-    public ActionComponent getComponent() {
-        return component;
-    }
-
-    /**
-     * Returns the comparison this condition applies to.
-     *
-     * @return Comparison to be used
-     */
-    public ActionComparison getComparison() {
-        return comparison;
-    }
-
-    /**
-     * Returns the target of the comparison for this condition.
-     *
-     * @return Target for comparison
-     */
-    public String getTarget() {
-        return target;
-    }
-
-    /**
-     * Sets the argument number this condition applies to.
-     *
-     * @param arg Argument number
-     */
-    public void setArg(final int arg) {
-        this.arg = arg;
-    }
-
-    /**
-     * Sets the component this condition applies to.
-     *
-     * @param component Component to apply condition to
-     */
-    public void setComponent(final ActionComponent component) {
-        this.component = component;
-    }
-
-    /**
-     * Sets the comparison this condition applies to.
-     *
-     * @param comparison Comparison to be used
-     */
-    public void setComparison(final ActionComparison comparison) {
-        this.comparison = comparison;
-    }
-
-    /**
-     * Sets the target of the comparison for this condition.
-     *
-     * @param target Target for comparison
-     */
-    public void setTarget(final String target) {
-        this.target = target;
-    }
-
-    /**
-     * Retrieves the starget of this condition.
-     *
-     * @return This condition's starget, or null if none was set.
-     */
-    public String getStarget() {
-        return starget;
-    }
-
-    /**
-     * Sets the starget for this condition.
-     *
-     * @param starget The new starget for this condition.
-     */
-    public void setStarget(final String starget) {
-        this.starget = starget;
-    }
-
-    @Override
-    public String toString() {
-        return "[ arg=" + arg + ", component=" + component + ", comparison="
-                + comparison + ", target=" + target + ", starget=" + starget + " ]";
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        if (!(obj instanceof ActionCondition)) {
-            return false;
-        }
-
-        final ActionCondition o = (ActionCondition) obj;
-
-        return arg == o.getArg() && component == o.getComponent()
-                && comparison == o.getComparison() && target.equals(o.getTarget())
-                && starget.equals(o.getStarget());
-    }
-
-    @Override
-    public int hashCode() {
-        return arg + 100 * (arg == -1 ? starget.hashCode() : component.hashCode())
-                + 10000 * comparison.hashCode() + 100000 * target.hashCode();
-    }
-
-}

src/com/dmdirc/actions/ActionErrorType.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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/ActionFactory.java

@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.GlobalWindow;
-import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
-import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.interfaces.config.IdentityController;
-
-import java.nio.file.Path;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-
-/**
- * Factory for creating {@link Action}s.
- */
-@Singleton
-public class ActionFactory {
-
-    /** The controller that will own actions. */
-    private final Provider<ActionController> actionController;
-    /** The controller to use to retrieve and update settings. */
-    private final Provider<IdentityController> identityController;
-    /** The global window to use for actions without windows. */
-    private final Provider<GlobalWindow> globalWindowProvider;
-    /** The factory to use to create substitutors. */
-    private final ActionSubstitutorFactory substitutorFactory;
-    /** The base directory to store actions in. */
-    private final Path actionsDirectory;
-    /** Event bus to post events on. */
-    private final DMDircMBassador eventBus;
-
-    /**
-     * Creates a new instance of {@link ActionFactory}.
-     *
-     * @param eventBus                    The event bus to post events on.
-     * @param actionController            The controller that will own actions.
-     * @param identityController          The controller to use to retrieve and update settings.
-     * @param globalWindowProvider        The global window to use for actions without windows.
-     * @param substitutorFactory          The factory to use to create substitutors.
-     * @param actionsDirectory            The base directory to store actions in.
-     */
-    @Inject
-    public ActionFactory(final DMDircMBassador eventBus, final Provider<ActionController> actionController,
-            final Provider<IdentityController> identityController,
-            final Provider<GlobalWindow> globalWindowProvider,
-            final ActionSubstitutorFactory substitutorFactory,
-            @Directory(DirectoryType.ACTIONS) final Path actionsDirectory) {
-        this.eventBus = eventBus;
-        this.actionController = actionController;
-        this.identityController = identityController;
-        this.globalWindowProvider = globalWindowProvider;
-        this.substitutorFactory = substitutorFactory;
-        this.actionsDirectory = actionsDirectory;
-    }
-
-    /**
-     * Creates a new instance of Action. The group and name specified must be the group and name of
-     * a valid action already saved to disk.
-     *
-     * @param group The group the action belongs to
-     * @param name  The name of the action
-     *
-     * @return A relevant action.
-     */
-    public Action getAction(final String group, final String name) {
-        return new Action(
-                eventBus, globalWindowProvider,
-                substitutorFactory,
-                actionController.get(),
-                identityController.get(),
-                actionsDirectory,
-                group,
-                name);
-    }
-
-    /**
-     * Creates a new instance of Action with the specified properties and saves it to disk.
-     *
-     * @param group         The group the action belongs to
-     * @param name          The name of the action
-     * @param triggers      The triggers to use
-     * @param response      The response to use
-     * @param conditions    The conditions to use
-     * @param conditionTree The condition tree to use
-     * @param newFormat     The new formatter to use
-     *
-     * @return A relevant action.
-     */
-    public Action getAction(final String group, final String name,
-            final ActionType[] triggers, final String[] response,
-            final List<ActionCondition> conditions,
-            final ConditionTree conditionTree, final String newFormat) {
-        return new Action(
-                eventBus, globalWindowProvider,
-                substitutorFactory,
-                actionController.get(),
-                identityController.get(),
-                actionsDirectory,
-                group,
-                name,
-                triggers,
-                response,
-                conditions,
-                conditionTree,
-                newFormat);
-    }
-
-}

src/com/dmdirc/actions/ActionGroup.java

@@ -1,239 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.Precondition;
-import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.updater.Version;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-/**
- * Represents a group of actions, along with their meta-data.
- */
-public class ActionGroup implements Iterable<Action> {
-
-    /** The actions in this group. */
-    private final List<Action> actions = new ArrayList<>();
-    /** The name of this action group. */
-    private final String name;
-    /** The description of this action group. */
-    private String description;
-    /** The author of this action group. */
-    private String author;
-    /** The component number of this action group (for updating). */
-    private int component = -1;
-    /** The version of this action group. */
-    private Version version;
-    /** A list of settings used by this action group. */
-    private final Map<String, PreferencesSetting> settings = new HashMap<>();
-    /** Action manager. */
-    private final ActionManager actionManager;
-
-    /**
-     * Creates a new instance of ActionGroup.
-     *
-     * @param actionManager The action manager used to manager this group.
-     * @param name          The name of this action group
-     */
-    public ActionGroup(final ActionManager actionManager, final String name) {
-        this.actionManager = actionManager;
-        this.name = name;
-    }
-
-    /**
-     * Retrieves the author of this ActionGroup.
-     *
-     * @return This action group's author, or null if the author isn't specified
-     */
-    public String getAuthor() {
-        return author;
-    }
-
-    /**
-     * Sets the author of this ActionGroup.
-     *
-     * @param author The new author for this action group
-     */
-    public void setAuthor(final String author) {
-        this.author = author;
-    }
-
-    /**
-     * Retrieves the description of this action group.
-     *
-     * @return This action group's description, or null if none is specified
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the description for this action group.
-     *
-     * @param description The new description for this action group
-     */
-    public void setDescription(final String description) {
-        this.description = description;
-    }
-
-    /**
-     * Retrieves the name of this action group.
-     *
-     * @return This action group's name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Retrieves a map settings used by this action group.
-     *
-     * @return A map of setting names to values
-     */
-    public Map<String, PreferencesSetting> getSettings() {
-        return settings;
-    }
-
-    /**
-     * Retrieves the version number of this action group.
-     *
-     * @return This action group's version number, or null if none is specified.
-     *
-     * @since 0.6.4
-     */
-    public Version getVersion() {
-        return version;
-    }
-
-    /**
-     * Sets the version of this action group.
-     *
-     * @param version This action group's new version.
-     *
-     * @since 0.6.4
-     */
-    public void setVersion(final Version version) {
-        this.version = version;
-    }
-
-    /**
-     * Retrieves the addon site component number for this action group.
-     *
-     * @return The component number for this action group, or -1 if none is specified.
-     */
-    public int getComponent() {
-        return component;
-    }
-
-    /**
-     * Sets the addon site component number for this action group.
-     *
-     * @param component The component number for this action group
-     */
-    public void setComponent(final int component) {
-        this.component = component;
-    }
-
-    /**
-     * Removes the specified action from this group.
-     *
-     * @param action The action to be removed
-     */
-    public void remove(final Action action) {
-        actions.remove(action);
-    }
-
-    @Override
-    public Iterator<Action> iterator() {
-        return actions.iterator();
-    }
-
-    /**
-     * Removes all actions from this group, and removes all meta-data.
-     */
-    public void clear() {
-        new ArrayList<>(actions).forEach(this::remove);
-
-        settings.clear();
-        description = null;
-        author = null;
-        version = null;
-        component = -1;
-    }
-
-    /**
-     * Adds the specified action to this group.
-     *
-     * @param action The action to be added
-     */
-    public void add(final Action action) {
-        actions.add(action);
-    }
-
-    /**
-     * Retrieves a copy of the list of all actions in this group.
-     *
-     * @return A list of actions in this group
-     */
-    public List<Action> getActions() {
-        return new ArrayList<>(actions);
-    }
-
-    /**
-     * Deletes an action from this group.
-     *
-     * @param action The action to be deleted
-     *
-     * @since 0.6.3
-     */
-    @Precondition({
-        "The specified action is non-null",
-        "The specified action exists in this group"
-    })
-    @SuppressWarnings("deprecation")
-    public void deleteAction(final Action action) {
-        checkNotNull(action);
-        checkArgument(actions.contains(action));
-
-        actionManager.removeAction(action);
-        action.delete();
-    }
-
-    /**
-     * Determines if this action group is delible or not.
-     *
-     * @return True if the group may be deleted, false if it may not.
-     */
-    public boolean isDelible() {
-        return true;
-    }
-
-}

src/com/dmdirc/actions/ActionManager.java

@@ -1,628 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.Precondition;
-import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
-import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
-import com.dmdirc.config.ConfigBinding;
-import com.dmdirc.events.AppErrorEvent;
-import com.dmdirc.events.ClientClosedEvent;
-import com.dmdirc.events.DMDircEvent;
-import com.dmdirc.events.DisplayableEvent;
-import com.dmdirc.events.UserErrorEvent;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.actions.ActionComparison;
-import com.dmdirc.interfaces.actions.ActionComponent;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.updater.components.ActionGroupComponent;
-import com.dmdirc.updater.manager.UpdateManager;
-import com.dmdirc.util.collections.MapList;
-import com.dmdirc.util.io.FileUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.engio.mbassy.listener.Handler;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-/**
- * Manages all actions for the client.
- */
-@Singleton
-public class ActionManager implements ActionController {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ActionManager.class);
-    /** The identity manager to load configuration from. */
-    private final IdentityController identityManager;
-    /** The factory to use to create actions. */
-    private final ActionFactory factory;
-    /** Provider of an update manager. */
-    private final Provider<UpdateManager> updateManagerProvider;
-    /** A list of registered action types. */
-    private final Collection<ActionType> types = new ArrayList<>();
-    /** A list of registered action components. */
-    private final Collection<ActionComponent> components = new ArrayList<>();
-    /** A list of registered action comparisons. */
-    private final Collection<ActionComparison> comparisons = new ArrayList<>();
-    /** A map linking types and a list of actions that're registered for them. */
-    private final MapList<ActionType, Action> actions = new MapList<>();
-    /** A map linking groups and a list of actions that're in them. */
-    private final Map<String, ActionGroup> groups = new HashMap<>();
-    /** A map of objects to synchronise on for concurrency groups. */
-    private final Map<String, Object> locks = new HashMap<>();
-    /** A map of the action type groups to the action types within. */
-    private final MapList<String, ActionType> typeGroups = new MapList<>();
-    /** The global event bus to monitor. */
-    private final DMDircMBassador eventBus;
-    /** The directory to load and save actions in. */
-    private final String directory;
-    /** Indicates whether or not user actions should be killed (not processed). */
-    @ConfigBinding(domain = "actions", key = "killswitch")
-    private boolean killSwitch;
-
-    /**
-     * Creates a new instance of ActionManager.
-     *
-     * @param identityManager        The IdentityManager to load configuration from.
-     * @param factory                The factory to use to create new actions.
-     * @param updateManagerProvider  Provider of an update manager, to register components.
-     * @param eventBus               The global event bus to monitor.
-     * @param directory              The directory to load and save actions in.
-     */
-    @Inject
-    public ActionManager(
-            final IdentityController identityManager,
-            final ActionFactory factory,
-            final Provider<UpdateManager> updateManagerProvider,
-            final DMDircMBassador eventBus,
-            @Directory(DirectoryType.ACTIONS) final String directory) {
-        this.identityManager = identityManager;
-        this.factory = factory;
-        this.updateManagerProvider = updateManagerProvider;
-        this.eventBus = eventBus;
-        this.directory = directory;
-    }
-
-    /**
-     * Initialiases the actions manager.
-     *
-     * @param colourComparisons The colour comparisons to use.
-     */
-    // TODO: Refactor to take a list of comparisons/sources.
-    public void initialise(final ColourActionComparison colourComparisons) {
-        LOG.info("Initialising the actions manager");
-
-        identityManager.getGlobalConfiguration().getBinder().bind(this, ActionManager.class);
-
-        registerTypes(CoreActionType.values());
-        registerComparisons(CoreActionComparison.values());
-        registerComparisons(colourComparisons.getComparisons());
-        registerComponents(CoreActionComponent.values());
-
-        eventBus.subscribe(this);
-    }
-
-    @Override
-    public void saveAllActions() {
-        for (ActionGroup group : groups.values()) {
-            for (Action action : group) {
-                action.save();
-            }
-        }
-    }
-
-    /**
-     * Saves all actions when the client is being closed.
-     *
-     * @param event The event that was raised.
-     */
-    @Handler
-    public void handleClientClosed(final ClientClosedEvent event) {
-        LOG.debug("Client closed - saving all actions");
-        saveAllActions();
-    }
-
-    @Override
-    public void registerSetting(final String name, final String value) {
-        LOG.debug("Registering new action setting: {} = {}", name, value);
-        identityManager.getAddonSettings().setOption("actions", name, value);
-    }
-
-    @Override
-    public void addGroup(final ActionGroup group) {
-        groups.put(group.getName(), group);
-    }
-
-    @Override
-    public void registerTypes(final ActionType[] newTypes) {
-        for (ActionType type : newTypes) {
-            checkNotNull(type);
-
-            if (!types.contains(type)) {
-                LOG.debug("Registering action type: {}", type);
-                types.add(type);
-                typeGroups.add(type.getType().getGroup(), type);
-            }
-        }
-    }
-
-    @Override
-    public void registerComponents(final ActionComponent[] comps) {
-        for (ActionComponent comp : comps) {
-            checkNotNull(comp);
-
-            LOG.debug("Registering action component: {}", comp);
-            components.add(comp);
-        }
-    }
-
-    @Override
-    public void registerComparisons(final ActionComparison[] comps) {
-        for (ActionComparison comp : comps) {
-            checkNotNull(comp);
-
-            LOG.debug("Registering action comparison: {}", comp);
-            comparisons.add(comp);
-        }
-    }
-
-    @Override
-    public Map<String, ActionGroup> getGroupsMap() {
-        return Collections.unmodifiableMap(groups);
-    }
-
-    @Override
-    public MapList<String, ActionType> getGroupedTypes() {
-        return new MapList<>(typeGroups);
-    }
-
-    @Override
-    public void loadUserActions() {
-        actions.clear();
-
-        groups.values().forEach(ActionGroup::clear);
-
-        final File dir = new File(directory);
-
-        if (!dir.exists()) {
-            try {
-                dir.mkdirs();
-                dir.createNewFile();
-            } catch (IOException ex) {
-                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, null,
-                        "I/O error when creating actions directory: " + ex.getMessage(), ""));
-            }
-        }
-
-        if (dir.listFiles() == null) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
-                    "Unable to load user action files", ""));
-        } else {
-            for (File file : dir.listFiles()) {
-                if (file.isDirectory()) {
-                    loadActions(file);
-                }
-            }
-        }
-
-        registerComponents(updateManagerProvider.get());
-    }
-
-    /**
-     * Creates new ActionGroupComponents for each action group.
-     *
-     * @param updateManager The update manager to register components with
-     */
-    private void registerComponents(final UpdateManager updateManager) {
-        groups.values().stream()
-                .filter(group -> group.getComponent() != -1 && group.getVersion() != null)
-                .forEach(group -> updateManager.addComponent(
-                        new ActionGroupComponent(this, group)));
-    }
-
-    /**
-     * Loads action files from a specified group directory.
-     *
-     * @param dir The directory to scan.
-     */
-    @Precondition("The specified File is not null and represents a directory")
-    private void loadActions(final File dir) {
-        checkNotNull(dir);
-        checkArgument(dir.isDirectory());
-
-        LOG.debug("Loading actions from directory: {}", dir.getAbsolutePath());
-
-        if (!groups.containsKey(dir.getName())) {
-            groups.put(dir.getName(), new ActionGroup(this, dir.getName()));
-        }
-
-        for (File file : dir.listFiles()) {
-            factory.getAction(dir.getName(), file.getName());
-        }
-    }
-
-    @Override
-    public void addAction(final Action action) {
-        checkNotNull(action);
-
-        LOG.debug("Registering action: {}/{} (status: {})", action.getGroup(), action.getName(),
-                action.getStatus());
-
-        if (action.getStatus() != ActionStatus.FAILED) {
-            for (ActionType trigger : action.getTriggers()) {
-                LOG.trace("Action has trigger {}", trigger);
-                actions.add(trigger, action);
-            }
-        }
-
-        getOrCreateGroup(action.getGroup()).add(action);
-    }
-
-    @Override
-    public ActionGroup getOrCreateGroup(final String name) {
-        if (!groups.containsKey(name)) {
-            groups.put(name, new ActionGroup(this, name));
-        }
-
-        return groups.get(name);
-    }
-
-    @Override
-    public void removeAction(final Action action) {
-        checkNotNull(action);
-
-        actions.removeFromAll(action);
-        getOrCreateGroup(action.getGroup()).remove(action);
-    }
-
-    @Override
-    public void reregisterAction(final Action action) {
-        removeAction(action);
-        addAction(action);
-    }
-
-    @Override
-    public boolean triggerEvent(final ActionType type,
-            final StringBuffer format, final Object... arguments) {
-        checkNotNull(type);
-        checkNotNull(type.getType());
-        checkArgument(type.getType().getArity() == arguments.length);
-
-        LOG.trace("Calling listeners for event of type {}", type);
-
-        return killSwitch || !triggerActions(type, format, arguments);
-    }
-
-    /**
-     * Triggers actions that respond to 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 skipped, or false if it can continue
-     */
-    @Precondition("The specified ActionType is not null")
-    private boolean triggerActions(final ActionType type,
-            final StringBuffer format, final Object... arguments) {
-        checkNotNull(type);
-
-        LOG.trace("Executing actions for event of type {}", type);
-
-        boolean res = false;
-        if (actions.containsKey(type)) {
-            for (Action action : new ArrayList<>(actions.get(type))) {
-                try {
-                    if (action.getConcurrencyGroup() == null) {
-                        res |= action.trigger(format, arguments);
-                    } else {
-                        synchronized (locks) {
-                            if (!locks.containsKey(action.getConcurrencyGroup())) {
-                                locks.put(action.getConcurrencyGroup(), new Object());
-                            }
-                        }
-
-                        synchronized (locks.get(action.getConcurrencyGroup())) {
-                            res |= action.trigger(format, arguments);
-                        }
-                    }
-                } catch (LinkageError | Exception e) {
-                    eventBus.publishAsync(new AppErrorEvent(ErrorLevel.MEDIUM, e,
-                            "Error processing action: " + e.getMessage(), ""));
-                }
-            }
-        }
-
-        return res;
-    }
-
-    /**
-     * Processes an event from the event bus.
-     *
-     * @param event The event that was raised.
-     */
-    @Handler
-    public void processEvent(final DMDircEvent event) {
-        final ActionType type = getType(getLegacyActionTypeName(event));
-        if (type == null) {
-            LOG.warn("Unable to locate legacy type for event {}", event.getClass().getName());
-            return;
-        }
-
-        final Class<?>[] argTypes = type.getType().getArgTypes();
-        final Object[] arguments = getLegacyArguments(event, argTypes);
-
-        if (event instanceof DisplayableEvent) {
-            final DisplayableEvent displayable = (DisplayableEvent) event;
-            final StringBuffer buffer = new StringBuffer(displayable.getDisplayFormat());
-            triggerEvent(type, buffer, arguments);
-            displayable.setDisplayFormat(buffer.toString());
-        } else {
-            triggerEvent(type, null, arguments);
-        }
-    }
-
-    /**
-     * Gets the name of the legacy {@link ActionType} to which the given event corresponds.
-     *
-     * @param event The event to obtain the name of.
-     *
-     * @return The legacy action type name.
-     */
-    private static String getLegacyActionTypeName(final DMDircEvent event) {
-        return event.getClass().getSimpleName()
-                .replaceAll("Event$", "")
-                .replaceAll("(.)([A-Z])", "$1_$2")
-                .toUpperCase();
-    }
-
-    /**
-     * Attempts to obtain a legacy arguments array from the given event. Arguments will be matched
-     * based on their expected classes. Where an event provides multiple getters of the same type,
-     * the one closest in index to the argument index will be used.
-     *
-     * @param event    The event to get legacy arguments for.
-     * @param argTypes The type of arguments expected for the action type.
-     *
-     * @return An array of objects containing the legacy arguments.
-     */
-    private static Object[] getLegacyArguments(final DMDircEvent event, final Class<?>[] argTypes) {
-        final Object[] arguments = new Object[argTypes.length];
-        final Method[] methods = event.getClass().getMethods();
-
-        for (int i = 0; i < argTypes.length; i++) {
-            final Class<?> target = argTypes[i];
-            Method best = null;
-            int bestDistance = Integer.MAX_VALUE;
-
-            for (int j = 0; j < methods.length; j++) {
-                final Method method = methods[j];
-                if (method.getParameterTypes().length == 0
-                        && method.getName().startsWith("get")
-                        && !"getDisplayFormat".equals(method.getName())
-                        && method.getReturnType().equals(target)
-                        && Math.abs(j - i) < bestDistance) {
-                    bestDistance = Math.abs(j - i);
-                    best = method;
-                }
-            }
-
-            if (best == null) {
-                LOG.error("Unable to find method on event {} to satisfy argument #{} of class {}",
-                        event.getClass().getName(), i, target.getName());
-                arguments[i] = null;
-            } else {
-                try {
-                    arguments[i] = best.invoke(event);
-                } catch (ReflectiveOperationException ex) {
-                    LOG.error("Unable to invoke method {} on {} to get action argument",
-                            best.getName(), event.getClass().getName(), ex);
-                }
-            }
-        }
-
-        return arguments;
-    }
-
-    @Override
-    public ActionGroup createGroup(final String group) {
-        checkNotNull(group);
-        checkArgument(!group.isEmpty());
-        checkArgument(!groups.containsKey(group));
-
-        final File file = new File(directory + group);
-        if (file.isDirectory() || file.mkdir()) {
-            final ActionGroup actionGroup = new ActionGroup(this, group);
-            groups.put(group, actionGroup);
-            return actionGroup;
-        } else {
-            throw new IllegalArgumentException("Unable to create action group directory"
-                    + "\n\nDir: " + directory + group);
-        }
-    }
-
-    @Override
-    public void deleteGroup(final String group) {
-        checkNotNull(group);
-        checkArgument(!group.isEmpty());
-        checkArgument(groups.containsKey(group));
-
-        groups.get(group).getActions().forEach(this::removeAction);
-
-        final File dir = new File(directory + group);
-
-        if (dir.isDirectory()) {
-            for (File file : dir.listFiles()) {
-                if (!file.delete()) {
-                    eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
-                            "Unable to remove file: " + file.getAbsolutePath(), ""));
-                    return;
-                }
-            }
-        }
-
-        if (!dir.delete()) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
-                    "Unable to remove directory: " + dir.getAbsolutePath(), ""));
-            return;
-        }
-
-        groups.remove(group);
-    }
-
-    @Override
-    public void changeGroupName(final String oldName, final String newName) {
-        checkNotNull(oldName);
-        checkArgument(!oldName.isEmpty());
-        checkNotNull(newName);
-        checkArgument(!newName.isEmpty());
-        checkArgument(groups.containsKey(oldName));
-        checkArgument(!groups.containsKey(newName));
-        checkArgument(!newName.equals(oldName));
-
-        createGroup(newName);
-
-        for (Action action : groups.get(oldName).getActions()) {
-            action.setGroup(newName);
-            getOrCreateGroup(oldName).remove(action);
-            getOrCreateGroup(newName).add(action);
-        }
-
-        deleteGroup(oldName);
-    }
-
-    @Override
-    public ActionType getType(final String type) {
-        if (type == null || type.isEmpty()) {
-            return null;
-        }
-
-        for (ActionType target : types) {
-            if (target.name().equals(type)) {
-                return target;
-            }
-        }
-
-        return null;
-    }
-
-    @Override
-    public List<ActionType> findCompatibleTypes(final ActionType type) {
-        checkNotNull(type);
-
-        final List<ActionType> res = types.stream()
-                .filter(target -> !target.equals(type) && target.getType().equals(type.getType()))
-                .collect(Collectors.toList());
-
-        return res;
-    }
-
-    @Override
-    public List<ActionComponent> findCompatibleComponents(final Class<?> target) {
-        checkNotNull(target);
-
-        final List<ActionComponent> res =
-                components.stream().filter(subject -> subject.appliesTo().equals(target))
-                        .collect(Collectors.toList());
-
-        return res;
-    }
-
-    @Override
-    public List<ActionComparison> findCompatibleComparisons(final Class<?> target) {
-        checkNotNull(target);
-
-        final List<ActionComparison> res =
-                comparisons.stream().filter(subject -> subject.appliesTo().equals(target))
-                        .collect(Collectors.toList());
-
-        return res;
-    }
-
-    @Override
-    public ActionComponent getComponent(final String type) {
-        checkNotNull(type);
-        checkArgument(!type.isEmpty());
-
-        for (ActionComponent target : components) {
-            if (target.name().equals(type)) {
-                return target;
-            }
-        }
-
-        return null;
-    }
-
-    @Override
-    public ActionComparison getComparison(final String type) {
-        checkNotNull(type);
-        checkArgument(!type.isEmpty());
-
-        for (ActionComparison target : comparisons) {
-            if (target.name().equals(type)) {
-                return target;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Installs an action pack located at the specified path.
-     *
-     * @param path The full path of the action pack .zip.
-     *
-     * @throws IOException If the zip cannot be extracted
-     */
-    public void installActionPack(final Path path) throws IOException {
-        FileUtils.copyRecursively(path, Paths.get(directory));
-        loadUserActions();
-        Files.delete(path);
-    }
-
-}

src/com/dmdirc/actions/ActionModel.java

@@ -1,442 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.FrameContainer;
-import com.dmdirc.GlobalWindow;
-import com.dmdirc.Precondition;
-import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.interfaces.actions.ActionType;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.inject.Provider;
-
-/**
- * Represents the basic model of an action, and its triggering mechanism. Saving and loading are
- * handled by the Action class.
- */
-public class ActionModel {
-
-    // TODO: Sort out the mess of protected fields here.
-
-    /** Provider of global windows for global actions. */
-    private final Provider<GlobalWindow> globalWindowProvider;
-    /** Factory to use to creator substitutors. */
-    private final ActionSubstitutorFactory substitutorFactory;
-    /** The group this action belongs to. */
-    protected String group;
-    /** The name of this action. */
-    protected String name;
-    /** The ActionTypes that trigger this action. */
-    protected ActionType[] triggers;
-    /** The commands to execute if this action is triggered. */
-    protected String[] response;
-    /** The change that should be made to the format string, if any. */
-    protected String newFormat;
-    /** The conditions for this action. */
-    protected List<ActionCondition> conditions = new ArrayList<>();
-    /** The condition tree used for evaluating conditions. */
-    protected ConditionTree conditionTree;
-    /** Whether this action has been modified or not. */
-    protected boolean modified;
-    /** Whether this action wishes the event to be stopped. */
-    protected boolean stop;
-    /** 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.
-     *
-     * @param globalWindowProvider        Provider of global windows for global actions.
-     * @param substitutorFactory          Factory to use to create action substitutors.
-     * @param group                       The group the action belongs to
-     * @param name                        The name of the action
-     */
-    public ActionModel(
-            final Provider<GlobalWindow> globalWindowProvider,
-            final ActionSubstitutorFactory substitutorFactory,
-            final String group,
-            final String name) {
-        this.globalWindowProvider = globalWindowProvider;
-        this.substitutorFactory = substitutorFactory;
-        this.group = group;
-        this.name = name;
-    }
-
-    /**
-     * Creates a new instance of ActionModel with the specified properties.
-     *  @param globalWindowProvider        Provider of global windows for global actions.
-     * @param substitutorFactory          Factory to use to create action substitutors.
-     * @param group                       The group the action belongs to
-     * @param name                        The name of the action
-     * @param triggers                    The triggers to use
-     * @param response                    The response to use
-     * @param conditions                  The conditions to use
-     * @param conditionTree               The condition tree to use
-     * @param newFormat                   The new formatter to use
-     */
-    public ActionModel(
-            final Provider<GlobalWindow> globalWindowProvider,
-            final ActionSubstitutorFactory substitutorFactory,
-            final String group, final String name,
-            final ActionType[] triggers, final String[] response,
-            final List<ActionCondition> conditions,
-            final ConditionTree conditionTree, final String newFormat) {
-        this(globalWindowProvider, substitutorFactory, group, name);
-        this.triggers = triggers.clone();
-        this.response = response.clone();
-        this.conditions = conditions;
-        this.conditionTree = conditionTree;
-        this.newFormat = newFormat;
-        this.modified = true;
-    }
-
-    /**
-     * Triggers this action.
-     *
-     * @param format        The format of the message that's going to be displayed.
-     * @param arguments     The arguments from the action that caused this trigger.
-     *
-     * @return True if the execution of the event should be stopped, or false if the event may
-     *         continue
-     */
-    @Precondition({
-        "This action has at least one trigger",
-        "This action's primary trigger is non-null"
-    })
-    public boolean trigger(final StringBuffer format, final Object... arguments) {
-        assert triggers.length > 0;
-        assert triggers[0] != null;
-
-        if (status != ActionStatus.ACTIVE) {
-            return false;
-        }
-
-        final ActionSubstitutor sub = substitutorFactory.getActionSubstitutor(triggers[0]);
-
-        if (!test(sub, arguments)) {
-            return false;
-        }
-
-        final FrameContainer container;
-        if (arguments.length > 0 && arguments[0] instanceof FrameContainer
-                && ((FrameContainer) arguments[0]).isWritable()) {
-            container = (FrameContainer) arguments[0];
-        } else {
-            container = globalWindowProvider.get();
-        }
-
-        final CommandParser cp = container.getCommandParser();
-        for (String command : response) {
-            cp.parseCommand(container, sub.doSubstitution(command, arguments));
-        }
-
-        if (newFormat != null && format != null) {
-            format.setLength(0);
-            format.append(newFormat);
-        }
-
-        return stop;
-    }
-
-    /**
-     * Tests to see if this action should be triggered or not.
-     *
-     * @param sub       The ActionsSubstitutor to use to substitute args
-     * @param arguments The arguments for the action event
-     *
-     * @return True if the action should be executed, false otherwise
-     */
-    public boolean test(final ActionSubstitutor sub,
-            final Object... arguments) {
-        final boolean[] results = new boolean[conditions.size()];
-
-        int i = 0;
-        for (ActionCondition condition : conditions) {
-            results[i++] = condition.test(sub, arguments);
-        }
-
-        return getRealConditionTree().evaluate(results);
-    }
-
-    /**
-     * Retrieves a list of this action's conditions.
-     *
-     * @return A list of this action's conditions
-     */
-    public List<ActionCondition> getConditions() {
-        return conditions;
-    }
-
-    /**
-     * Sets this action's conditions.
-     *
-     * @param conditions A list of conditions to use
-     */
-    public void setConditions(final List<ActionCondition> conditions) {
-        this.conditions = conditions;
-        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.
-     *
-     * @return The triggers used by this action
-     */
-    public ActionType[] getTriggers() {
-        return triggers == null ? null : triggers.clone();
-    }
-
-    /**
-     * Sets this action's triggers.
-     *
-     * @param triggers The new triggers to use
-     */
-    public void setTriggers(final ActionType[] triggers) {
-        this.triggers = triggers.clone();
-        this.modified = true;
-    }
-
-    /**
-     * Retrieves this action's new format setting.
-     *
-     * @return The format that this action will use, or null if no change
-     */
-    public String getNewFormat() {
-        return newFormat;
-    }
-
-    /**
-     * Sets this action's new format setting.
-     *
-     * @param newFormat The new 'new format' setting
-     */
-    public void setNewFormat(final String newFormat) {
-        this.newFormat = newFormat;
-        this.modified = true;
-    }
-
-    /**
-     * Retrieves this action's response.
-     *
-     * @return The commands that will be executed if this action is triggered
-     */
-    public String[] getResponse() {
-        return response == null ? null : response.clone();
-    }
-
-    /**
-     * Sets this action's response.
-     *
-     * @param response The new response to use
-     */
-    public void setResponse(final String[] response) {
-        this.response = response.clone();
-        this.modified = true;
-    }
-
-    /**
-     * Retrieves this action's group name.
-     *
-     * @return This action's group name
-     */
-    public String getGroup() {
-        return group;
-    }
-
-    /**
-     * Sets the group of this action.
-     *
-     * @param newGroup The new group for this action
-     */
-    public void setGroup(final String newGroup) {
-        this.group = newGroup;
-        this.modified = true;
-    }
-
-    /**
-     * Retrieves this action's name.
-     *
-     * @return This action's name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the name of this action.
-     *
-     * @param newName The new name for this action
-     */
-    public void setName(final String newName) {
-        this.name = newName;
-        this.modified = true;
-    }
-
-    /**
-     * Retrieves the condition tree used for this action. Condition trees may be null, in which case
-     * the arguments are conjoined together.
-     *
-     * @return This action's condition tree
-     */
-    public ConditionTree getConditionTree() {
-        return conditionTree;
-    }
-
-    /**
-     * Retrieves a concrete condition tree used for this action. If there is no condition tree
-     * defined for this action, returns a conjunction tree for the arguments.
-     *
-     * @since 0.6
-     * @return A {@link ConditionTree} object for this action
-     */
-    public ConditionTree getRealConditionTree() {
-        return conditionTree == null ? ConditionTree.createConjunction(
-                conditions.size()) : conditionTree;
-    }
-
-    /**
-     * Sets the condition tree used for this action.
-     *
-     * @param conditionTree The new condition tree to be used
-     */
-    public void setConditionTree(final ConditionTree conditionTree) {
-        this.conditionTree = conditionTree;
-        this.modified = true;
-    }
-
-    /**
-     * Retrieves the concurrency group of this action.
-     *
-     * @return This action's concurrency group
-     *
-     * @since 0.6.3
-     */
-    public String getConcurrencyGroup() {
-        return concurrencyGroup;
-    }
-
-    /**
-     * Sets the concurrency group of this action.
-     *
-     * @param concurrencyGroup This action's new concurrency group
-     *
-     * @since 0.6.3
-     */
-    public void setConcurrencyGroup(final String concurrencyGroup) {
-        this.concurrencyGroup = (concurrencyGroup == null
-                || concurrencyGroup.isEmpty()) ? null : concurrencyGroup;
-    }
-
-    /**
-     * Determines whether or not this action will stop the event execution if it is triggered.
-     *
-     * @return The stopping preference of this action
-     *
-     * @see #setStopping(boolean)
-     * @since 0.6.4
-     */
-    public boolean isStopping() {
-        return stop;
-    }
-
-    /**
-     * Sets the stopping preference of this action. If the stopping preference is {@code true} then
-     * when this action is successfully triggered,it will request that execution of the event is
-     * stopped. This will prevent the default behaviour of the callee being executed.
-     *
-     * @param stop The new stopping preference of this action
-     *
-     * @see #isStopping()
-     * @since 0.6.4
-     */
-    public void setStopping(final boolean stop) {
-        this.stop = stop;
-    }
-
-    /**
-     * Determine if this model has been modified since it was constructed or its modified status was
-     * reset.
-     *
-     * @return True if this model has been modified, false otherwise
-     */
-    public boolean isModified() {
-        return modified;
-    }
-
-    /**
-     * Resets the modified status of this model. After a call to resetModified(), this model will
-     * report that it has not been modified, until one of the set* methods is used.
-     */
-    public void resetModified() {
-        this.modified = false;
-    }
-
-    @Override
-    public String toString() {
-        return "[name=" + group + "/" + name + ", triggers="
-                + Arrays.toString(triggers) + ", response="
-                + Arrays.toString(response) + ", "
-                + conditions + ", format='" + newFormat + "']";
-    }
-
-}

src/com/dmdirc/actions/ActionStatus.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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
-
-}

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -1,361 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.FrameContainer;
-import com.dmdirc.Precondition;
-import com.dmdirc.ServerState;
-import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.actions.ActionComponent;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.ui.Window;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Handles the substitution of variables into action targets and responses.
- */
-public class ActionSubstitutor {
-
-    /** Substitution to use when a component requires a connected server. */
-    private static final String ERR_NOT_CONNECTED = "not_connected";
-    /** Substitution to use to replace an unknown substitution. */
-    private static final String ERR_NOT_DEFINED = "not_defined";
-    /** Substitution to use to replace a chain that evaluates to null. */
-    private static final String ERR_NULL_CHAIN = "null_component";
-    /** Substitution to use to replace subs with illegal components. */
-    private static final String ERR_ILLEGAL_COMPONENT = "illegal_component";
-    /** Pattern used to match braced substitutions. */
-    private static final Pattern BRACES_PATTERN = Pattern.compile("(?<!\\\\)((?:\\\\\\\\)*)"
-            + "(\\$\\{([^{}]*?)\\})");
-    /** Pattern used to match all other substitutions. */
-    private static final Pattern OTHER_PATTERN = Pattern.compile("(?<!\\\\)((?:\\\\\\\\)*)(\\$("
-            + "[0-9]+(-([0-9]+)?)?|" // Word subs - $1, $1-, $1-2
-            + "[0-9]+(\\.([A-Z_]+))+|" // Component subs - 2.FOO_BAR
-            + "[a-z0-9A-Z_\\.]+" // Config/server subs
-            + "))");
-    /** Pattern to determine if a substitution is a word number type. */
-    private static final Pattern NUMBER_PATTERN = Pattern.compile("([0-9]+)(-([0-9]+)?)?");
-    /** Pattern to determine if a substitution is an argument+component type. */
-    private static final Pattern COMP_PATTERN = Pattern.compile("([0-9]+)\\.([A-Z_]+(\\.[A-Z_]+)*)");
-    /** Pattern to determine if a substitution is a server component type. */
-    private static final Pattern SERVER_PATTERN = Pattern.compile("[A-Z_]+(\\.[A-Z_]+)*");
-    /** The action controller to use to find components. */
-    private final ActionController actionController;
-    /** The global config to read settings from. */
-    private final AggregateConfigProvider globalConfig;
-    /** The command controller to use when building command arguments. */
-    private final CommandController commandController;
-    /** The action type this substitutor is for. */
-    private final ActionType type;
-
-    /**
-     * Creates a new substitutor for the specified action type.
-     *
-     * @param actionController  The action controller to use to find components.
-     * @param commandController The command controller to use when building command arguments.
-     * @param globalConfig      The global config to read settings from.
-     * @param type              The action type this substitutor is for
-     */
-    public ActionSubstitutor(
-            final ActionController actionController,
-            final CommandController commandController,
-            final AggregateConfigProvider globalConfig,
-            final ActionType type) {
-        this.actionController = actionController;
-        this.globalConfig = globalConfig;
-        this.commandController = commandController;
-        this.type = type;
-    }
-
-    /**
-     * Retrieves a list of global config variables that will be substituted. Note: does not include
-     * initial $.
-     *
-     * @return A list of global variable names that will be substituted
-     */
-    public Set<String> getConfigSubstitutions() {
-        return globalConfig.getOptions("actions").keySet();
-    }
-
-    /**
-     * Retrieves a list of substitutions derived from argument and component combinations, along
-     * with a corresponding friendly name for them. Note: does not include initial $.
-     *
-     * @return A map of component substitution names and their descriptions
-     */
-    public Map<String, String> getComponentSubstitutions() {
-        final Map<String, String> res = new HashMap<>();
-
-        int i = 0;
-        for (Class<?> myClass : type.getType().getArgTypes()) {
-            for (ActionComponent comp : actionController.findCompatibleComponents(myClass)) {
-                final String key = "{" + i + "." + comp.toString() + "}";
-                final String desc = type.getType().getArgNames()[i] + "'s " + comp.getName();
-
-                res.put(key, desc);
-            }
-
-            i++;
-        }
-
-        return res;
-    }
-
-    /**
-     * Retrieves a list of server substitutions, if this action type supports them. Note: does not
-     * include initial $.
-     *
-     * @return A map of server substitution names and their descriptions.
-     */
-    public Map<String, String> getServerSubstitutions() {
-        final Map<String, String> res = new HashMap<>();
-
-        if (hasFrameContainer()) {
-            for (ActionComponent comp : actionController
-                    .findCompatibleComponents(Connection.class)) {
-                final String key = "{" + comp.toString() + "}";
-                final String desc = "The connection's " + comp.getName();
-
-                res.put(key, desc);
-            }
-        }
-
-        return res;
-    }
-
-    /**
-     * Returns true if this action type's first argument is a frame container, or descendant of one.
-     *
-     * @return True if this action type's first arg extends or is a FrameContainer
-     */
-    private boolean hasFrameContainer() {
-        Class<?> target = null;
-
-        if (type.getType().getArgTypes().length > 0) {
-            target = type.getType().getArgTypes()[0];
-
-            while (target != null && target != FrameContainer.class) {
-                target = target.getSuperclass();
-            }
-        }
-
-        return target == FrameContainer.class;
-    }
-
-    /**
-     * Determines whether or not word substitutions will work for this action type. Word
-     * substitutions take the form $1, $1-5, $6-, etc.
-     *
-     * @return True if word substitutions are supported, false otherwise.
-     */
-    public boolean usesWordSubstitutions() {
-        return type.getType().getArgTypes().length > 2
-                && (type.getType().getArgTypes()[2] == String[].class
-                || type.getType().getArgTypes()[2] == String.class);
-    }
-
-    /**
-     * Performs all applicable substitutions on the specified string, with the specified arguments.
-     *
-     * @param target The string to be altered
-     * @param args   The arguments for the action type
-     *
-     * @return The substituted string
-     */
-    @Precondition("Number of arguments given equals the number of arguments "
-            + "required by this substitutor's type")
-    public String doSubstitution(final String target, final Object... args) {
-        if (type.getType().getArity() != args.length) {
-            throw new IllegalArgumentException("Invalid number of arguments "
-                    + "for doSubstitution: expected " + type.getType().getArity() + ", got "
-                    + args.length + ". Type: " + type.getName());
-        }
-
-        final StringBuilder res = new StringBuilder(target);
-
-        Matcher bracesMatcher = BRACES_PATTERN.matcher(res);
-        Matcher otherMatcher = OTHER_PATTERN.matcher(res);
-
-        boolean first;
-
-        while ((first = bracesMatcher.find()) || otherMatcher.find()) {
-            final Matcher matcher = first ? bracesMatcher : otherMatcher;
-
-            final String group = matcher.group(3);
-            final int start = matcher.start() + matcher.group(1).length();
-            final int end = matcher.end();
-
-            res.delete(start, end);
-            res.insert(start, getSubstitution(doSubstitution(group, args), args));
-
-            bracesMatcher = BRACES_PATTERN.matcher(res);
-            otherMatcher = OTHER_PATTERN.matcher(res);
-        }
-
-        return res.toString().replaceAll("\\\\(.)", "$1");
-    }
-
-    /**
-     * Retrieves the value which should be used for the specified substitution.
-     *
-     * @param substitution The substitution, without leading $
-     * @param args         The arguments for the action
-     *
-     * @return The substitution to be used
-     */
-    private String getSubstitution(final String substitution, final Object... args) {
-        final Matcher numberMatcher = NUMBER_PATTERN.matcher(substitution);
-        final Matcher compMatcher = COMP_PATTERN.matcher(substitution);
-        final Matcher serverMatcher = SERVER_PATTERN.matcher(substitution);
-
-        if (usesWordSubstitutions() && numberMatcher.matches()) {
-            final CommandArguments words = args[2] instanceof String
-                    ? new CommandArguments(commandController, (String) args[2])
-                    : new CommandArguments(commandController, Arrays.asList((String[]) args[2]));
-
-            final int start;
-            int end;
-
-            start = end = Integer.parseInt(numberMatcher.group(1)) - 1;
-
-            if (numberMatcher.group(3) != null) {
-                end = Integer.parseInt(numberMatcher.group(3)) - 1;
-            } else if (numberMatcher.group(2) != null) {
-                end = words.getWords().length - 1;
-            }
-
-            return words.getWordsAsString(start, end);
-        }
-
-        if (compMatcher.matches()) {
-            final int argument = Integer.parseInt(compMatcher.group(1));
-
-            try {
-                final ActionComponentChain chain = new ActionComponentChain(
-                        type.getType().getArgTypes()[argument], compMatcher.group(2),
-                        actionController);
-                return escape(checkConnection(chain, args, args[argument]));
-            } catch (IllegalArgumentException ex) {
-                return ERR_ILLEGAL_COMPONENT;
-            }
-        }
-
-        final AggregateConfigProvider manager = getConfigManager(args);
-
-        if (manager.hasOptionString("actions", substitution)) {
-            return manager.getOption("actions", substitution);
-        }
-
-        if (hasFrameContainer() && serverMatcher.matches()) {
-            final Optional<Connection> connection =
-                    ((FrameContainer) args[0]).getConnection();
-
-            if (connection.isPresent()) {
-                try {
-                    final ActionComponentChain chain = new ActionComponentChain(
-                            Connection.class, substitution, actionController);
-                    return escape(checkConnection(chain, args, connection.get()));
-                } catch (IllegalArgumentException ex) {
-                    return ERR_ILLEGAL_COMPONENT;
-                }
-            }
-        }
-
-        return ERR_NOT_DEFINED;
-    }
-
-    /**
-     * Checks the connection status of any server associated with the specified arguments. If the
-     * specified component chain requires a server with an established connection and no such server
-     * is present, this method returns the string {@code not_connected} without attempting to
-     * evaluate any components in the chain.
-     *
-     * @since 0.6.4
-     * @param chain    The chain to be checked
-     * @param args     The arguments for this invocation
-     * @param argument The argument used as a base for the chain
-     *
-     * @return The value of the evaluated chain, or <code>not_connected</code>
-     */
-    protected String checkConnection(final ActionComponentChain chain,
-            final Object[] args, final Object argument) {
-        if ((chain.requiresConnection() && args[0] instanceof FrameContainer
-                && ((FrameContainer) args[0]).getConnection().get().getState()
-                == ServerState.CONNECTED) || !chain.requiresConnection()) {
-            final Object res = chain.get(argument);
-            return res == null ? ERR_NULL_CHAIN : res.toString();
-        }
-
-        return ERR_NOT_CONNECTED;
-    }
-
-    /**
-     * Tries to retrieve an appropriate configuration manager from the specified set of arguments.
-     * If any of the arguments is an instance of {@link FrameContainer} or {@link Window}, the
-     * config manager is requested from them. Otherwise, the global config is returned.
-     *
-     * @param args The arguments to be tested
-     *
-     * @return The best config manager to use for those arguments
-     *
-     * @since 0.6.3m2
-     */
-    protected AggregateConfigProvider getConfigManager(final Object... args) {
-        for (Object arg : args) {
-            if (arg instanceof FrameContainer) {
-                return ((FrameContainer) arg).getConfigManager();
-            } else if (arg instanceof Window) {
-                return ((Window) arg).getContainer().getConfigManager();
-            }
-        }
-
-        return globalConfig;
-    }
-
-    /**
-     * Escapes all special characters in the specified input. This will result in the input being
-     * treated as a plain string when passed through the substitutor (i.e., no substitutions will
-     * occur).
-     *
-     * @param input The string to be escaped
-     *
-     * @return An escaped version of the specified string
-     *
-     * @since 0.6.4
-     */
-    protected static String escape(final String input) {
-        return input.replace("\\", "\\\\").replace("$", "\\$");
-    }
-
-}

src/com/dmdirc/actions/ActionSubstitutorFactory.java

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.ClientModule;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-
-/**
- * Factory for {@link ActionSubstitutor}s.
- */
-@Singleton
-public class ActionSubstitutorFactory {
-
-    private final Provider<ActionController> actionController;
-    private final CommandController commandController;
-    private final AggregateConfigProvider globalConfig;
-
-    @Inject
-    public ActionSubstitutorFactory(
-            final Provider<ActionController> actionController,
-            final CommandController commandController,
-            @ClientModule.GlobalConfig final AggregateConfigProvider globalConfig) {
-        this.actionController = actionController;
-        this.commandController = commandController;
-        this.globalConfig = globalConfig;
-    }
-
-    public ActionSubstitutor getActionSubstitutor(final ActionType type) {
-        return new ActionSubstitutor(actionController.get(), commandController, globalConfig, type);
-    }
-
-}

src/com/dmdirc/actions/ActionTypeComparator.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.interfaces.actions.ActionType;
-
-import java.io.Serializable;
-import java.util.Comparator;
-
-/**
- * Implements a comparator for action types that compares their names.
- */
-public final class ActionTypeComparator implements Comparator<ActionType>, Serializable {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-
-    @Override
-    public int compare(final ActionType o1, final ActionType o2) {
-        return o1.getName().compareTo(o2.getName());
-    }
-
-}

src/com/dmdirc/actions/ColourActionComparison.java

@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.ClientModule;
-import com.dmdirc.interfaces.actions.ActionComparison;
-import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.util.colours.Colour;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-
-/**
- * Core action comparisons dependent on a colour manager.
- */
-public class ColourActionComparison {
-
-    /** Instance of the equals comparison. */
-    private final Equals equalsComparison;
-    /** Instance of the not equals comparison. */
-    private final NotEquals notEqualsComparison;
-    /** Colour manager to use to parse colours. */
-    private final Provider<ColourManager> colourManager;
-
-    /**
-     * Creates a new instance of {@link ColourActionComparison}.
-     *
-     * @param colourManager The colour manager to use.
-     */
-    @Inject
-    public ColourActionComparison(@ClientModule.GlobalConfig final Provider<ColourManager> colourManager) {
-        this.equalsComparison = new Equals();
-        this.notEqualsComparison = new NotEquals();
-        this.colourManager = colourManager;
-    }
-
-    /**
-     * Gets the available colour comparisons.
-     *
-     * @return The available comparisons.
-     */
-    public ActionComparison[] getComparisons() {
-        return new ActionComparison[]{equalsComparison, notEqualsComparison};
-    }
-
-    /** Checks if the colour is the same as another colour. */
-    private class Equals implements ActionComparison {
-
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            return arg1.equals(colourManager.get().getColourFromString((String) arg2, null));
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Colour.class;
-        }
-
-        @Override
-        public String getName() {
-            return "equals";
-        }
-
-        @Override
-        public String name() {
-            return "COLOUR_EQUALS";
-        }
-
-    }
-
-    /** Checks if the colour is not the same as another colour. */
-    private class NotEquals implements ActionComparison {
-
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            return !equalsComparison.test(arg1, arg2);
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Colour.class;
-        }
-
-        @Override
-        public String getName() {
-            return "does not equal";
-        }
-
-        @Override
-        public String name() {
-            return "COLOUR_NEQUALS";
-        }
-
-    }
-
-}

src/com/dmdirc/actions/ConditionTree.java

@@ -1,388 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import java.util.ArrayDeque;
-import java.util.Deque;
-
-/**
- * A condition tree specifies in which order a group of conditions will be executed.
- */
-public final class ConditionTree {
-
-    /** The possible operations on a condition tree. */
-    public enum OPERATION {
-
-        /** Only passes if both subtrees are true. */
-        AND,
-        /** Passes if either of the subtrees are true. */
-        OR,
-        /** Passes if the specified argument is true. */
-        VAR,
-        /** Only passes iof the left subtree fails to pass. */
-        NOT,
-        /** Doesn't do anything (an empty tree). */
-        NOOP
-
-    }
-    /** The left subtree of this tree. */
-    private ConditionTree leftArg;
-    /** The right subtree of this tree. */
-    private ConditionTree rightArg;
-    /** The argument of this tree (only used for VAR ops). */
-    private int argument = -1;
-    /** The operation that this tree performs. */
-    private final OPERATION op;
-
-    /**
-     * Creates a new ConditionTree for a binary operation.
-     *
-     * @param op       The binary operation to perform
-     * @param leftArg  The left argument/subtree
-     * @param rightArg The right argument/subtree
-     */
-    private ConditionTree(final OPERATION op, final ConditionTree leftArg,
-            final ConditionTree rightArg) {
-        this.op = op;
-        this.leftArg = leftArg;
-        this.rightArg = rightArg;
-    }
-
-    /**
-     * Creates a new ConditionTree for a unary operation.
-     *
-     * @param op       The unary operation to perform.
-     * @param argument The argument/subtree to perform it on.
-     */
-    private ConditionTree(final OPERATION op, final ConditionTree argument) {
-        this.op = op;
-        this.leftArg = argument;
-    }
-
-    /**
-     * Creates a new ConditionTree for a VAR operation with the specified argument number.
-     *
-     * @param argument The number of the argument that's to be tested.
-     */
-    private ConditionTree(final int argument) {
-        this.op = OPERATION.VAR;
-        this.argument = argument;
-    }
-
-    /**
-     * Creates a new ConditionTree for a NOOP operation.
-     */
-    private ConditionTree() {
-        this.op = OPERATION.NOOP;
-    }
-
-    /**
-     * Retrieves the highest argument number that is used in this condition tree.
-     *
-     * @return The highest argument number used in this tree
-     */
-    public int getMaximumArgument() {
-        if (this.op == OPERATION.NOOP) {
-            return 0;
-        } else if (this.op == OPERATION.VAR) {
-            return argument;
-        } else if (this.op == OPERATION.NOT) {
-            return leftArg.getMaximumArgument();
-        } else {
-            return Math.max(leftArg.getMaximumArgument(), rightArg.getMaximumArgument());
-        }
-    }
-
-    /**
-     * Evaluates this tree with the specified conditions. Returns the result of the evaluation.
-     *
-     * @param conditions The binary values of each of the conditions used in this three
-     *
-     * @return The result of the evaluation of this tree
-     */
-    public boolean evaluate(final boolean[] conditions) {
-        switch (op) {
-            case VAR:
-                return conditions[argument];
-            case NOT:
-                return !leftArg.evaluate(conditions);
-            case AND:
-                return leftArg.evaluate(conditions) && rightArg.evaluate(conditions);
-            case OR:
-                return leftArg.evaluate(conditions) || rightArg.evaluate(conditions);
-            default:
-                return true;
-        }
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        return obj instanceof ConditionTree
-                && toString().equals(obj.toString());
-    }
-
-    @Override
-    public int hashCode() {
-        return toString().hashCode();
-    }
-
-    /**
-     * Retrieves a String representation of this ConditionTree. The string representation is a
-     * normalised formula describing this tree and all of its children. The output of this method
-     * will generate an identical tree if passed to parseString.
-     *
-     * @return A string representation of this tree
-     */
-    @Override
-    public String toString() {
-        switch (op) {
-            case VAR:
-                return String.valueOf(argument);
-            case NOT:
-                return "!" + leftArg;
-            case AND:
-                return "(" + leftArg + "&" + rightArg + ")";
-            case OR:
-                return "(" + leftArg + "|" + rightArg + ")";
-            default:
-                return "";
-        }
-    }
-
-    /**
-     * Parses the specified string into a condition tree.
-     *
-     * @param string The string to be parsed
-     *
-     * @return The corresponding condition tree, or null if there was an error while parsing the
-     *         data
-     */
-    public static ConditionTree parseString(final String string) {
-        final Deque<Object> stack = new ArrayDeque<>();
-
-        for (int i = 0; i < string.length(); i++) {
-            final char m = string.charAt(i);
-
-            if (isInt(m)) {
-                final StringBuilder temp = new StringBuilder(String.valueOf(m));
-
-                while (i + 1 < string.length() && isInt(string.charAt(i + 1))) {
-                    temp.append(string.charAt(i + 1));
-                    i++;
-                }
-
-                try {
-                    stack.add(new ConditionTree(Integer.parseInt(temp.toString())));
-                } catch (NumberFormatException ex) {
-                    return null;
-                }
-            } else if (m != ' ' && m != '\t' && m != '\n' && m != '\r') {
-                stack.add(m);
-            }
-        }
-
-        return parseStack(stack);
-    }
-
-    /**
-     * Parses the specified stack of elements, and returns a corresponding ConditionTree.
-     *
-     * @param stack The stack to be read.
-     *
-     * @return The corresponding condition tree, or null if there was an error while parsing the
-     *         data.
-     */
-    private static ConditionTree parseStack(final Deque<Object> stack) {
-        final Deque<Object> myStack = new ArrayDeque<>();
-
-        while (!stack.isEmpty()) {
-            final Object object = stack.poll();
-
-            if (object instanceof Character && ((Character) object) == ')') {
-                final ConditionTree bracket = readBracket(myStack);
-
-                if (bracket == null) {
-                    return null;
-                } else {
-                    myStack.add(bracket);
-                }
-            } else {
-                myStack.add(object);
-            }
-        }
-
-        while (!myStack.isEmpty()) {
-            if (myStack.size() == 1) {
-                final Object first = myStack.pollFirst();
-                if (first instanceof ConditionTree) {
-                    return (ConditionTree) first;
-                } else {
-                    return null;
-                }
-            }
-
-            final ConditionTree first = readTerm(myStack);
-
-            if (first == null) {
-                return null;
-            } else if (myStack.isEmpty()) {
-                return first;
-            }
-
-            final Object second = myStack.pollFirst();
-
-            if (myStack.isEmpty()) {
-                return null;
-            } else {
-                final ConditionTree third = readTerm(myStack);
-
-                if (third != null && second instanceof Character) {
-                    final OPERATION op;
-
-                    if ((Character) second == '&') {
-                        op = OPERATION.AND;
-                    } else if ((Character) second == '|') {
-                        op = OPERATION.OR;
-                    } else {
-                        return null;
-                    }
-
-                    myStack.addFirst(new ConditionTree(op, first, third));
-                } else {
-                    return null;
-                }
-            }
-        }
-
-        return new ConditionTree();
-    }
-
-    /**
-     * Reads and returns a single term from the specified stack.
-     *
-     * @param stack The stack to be read
-     *
-     * @return The ConditionTree representing the last element on the stack, or null if it was not
-     *         possible to create one.
-     */
-    private static ConditionTree readTerm(final Deque<Object> stack) {
-        final Object first = stack.pollFirst();
-
-        if (first instanceof Character && (Character) first == '!') {
-            if (stack.isEmpty()) {
-                return null;
-            }
-
-            return new ConditionTree(OPERATION.NOT, readTerm(stack));
-        } else {
-            if (!(first instanceof ConditionTree)) {
-                return null;
-            }
-
-            return (ConditionTree) first;
-        }
-    }
-
-    /**
-     * Pops elements off of the end of the specified stack until an opening bracket is reached, and
-     * then returns the parsed content of the bracket.
-     *
-     * @param stack The stack to be read for the bracket
-     *
-     * @return The parsed contents of the bracket, or null if the brackets were mismatched.
-     */
-    private static ConditionTree readBracket(final Deque<Object> stack) {
-        final Deque<Object> tempStack = new ArrayDeque<>();
-        boolean found = false;
-
-        while (!found && !stack.isEmpty()) {
-            final Object object = stack.pollLast();
-
-            if (object instanceof Character && ((Character) object) == '(') {
-                found = true;
-            } else {
-                tempStack.addFirst(object);
-            }
-        }
-
-        if (found) {
-            return parseStack(tempStack);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Determines if the specified character represents a single digit.
-     *
-     * @param target The character to be tested
-     *
-     * @return True if the character is a digit, false otherwise
-     */
-    private static boolean isInt(final char target) {
-        return target >= '0' && target <= '9';
-    }
-
-    /**
-     * Creates a condition tree by disjointing the specified number of arguments together.
-     *
-     * @param numArgs The number of arguments to be disjointed
-     *
-     * @return The corresponding condition tree
-     */
-    public static ConditionTree createDisjunction(final int numArgs) {
-        final StringBuilder builder = new StringBuilder();
-
-        for (int i = 0; i < numArgs; i++) {
-            if (builder.length() != 0) {
-                builder.append('|');
-            }
-
-            builder.append(i);
-        }
-
-        return parseString(builder.toString());
-    }
-
-    /**
-     * Creates a condition tree by conjoining the specified number of arguments together.
-     *
-     * @param numArgs The number of arguments to be conjoined
-     *
-     * @return The corresponding condition tree
-     */
-    public static ConditionTree createConjunction(final int numArgs) {
-        final StringBuilder builder = new StringBuilder();
-
-        for (int i = 0; i < numArgs; i++) {
-            if (builder.length() != 0) {
-                builder.append('&');
-            }
-
-            builder.append(i);
-        }
-
-        return parseString(builder.toString());
-    }
-
-}

src/com/dmdirc/actions/ConditionTreeFactory.java

@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-/**
- * Provides methods to automatically generated condition tree for a specified number of arguments.
- *
- * @since 0.6
- */
-public abstract class ConditionTreeFactory {
-
-    /**
-     * Retrieves a condition tree for the specified number of arguments.
-     *
-     * @param args The number of arguments in the {@link Action}
-     *
-     * @return A ConditionTree for the specified number of args
-     */
-    public abstract ConditionTree getConditionTree(final int args);
-
-    /**
-     * Retrieves the type this of factory.
-     *
-     * @return This factory's type
-     */
-    public abstract ConditionTreeFactoryType getType();
-
-    /**
-     * The possible types of ConditionTreeFactories.
-     */
-    public enum ConditionTreeFactoryType {
-
-        /** Factories that produce disjunction (OR) trees. */
-        DISJUNCTION,
-        /** Factories that produce conjunction (AND) trees. */
-        CONJUNCTION,
-        /** Factories that produce custom trees. */
-        CUSTOM,
-
-    }
-
-    /**
-     * Retrieves a factory that will extrapolate the specified {@link ConditionTree} for different
-     * number of arguments, if applicable.
-     *
-     * @param tree The {@link ConditionTree} that's in use
-     * @param args The number of conditions currently in use
-     *
-     * @return A {@link ConditionTreeFactory} that will create relevant {@link ConditionTree}s
-     */
-    public static ConditionTreeFactory getFactory(final ConditionTree tree, final int args) {
-        if (tree.equals(ConditionTree.createConjunction(args))) {
-            return new ConjunctionFactory();
-        } else if (tree.equals(ConditionTree.createDisjunction(args))) {
-            return new DisjunctionFactory();
-        } else {
-            return new CustomFactory(tree);
-        }
-    }
-
-    /**
-     * Creates condition trees where the arguments are conjoined together.
-     */
-    public static class ConjunctionFactory extends ConditionTreeFactory {
-
-        @Override
-        public ConditionTree getConditionTree(final int args) {
-            return ConditionTree.createConjunction(args);
-        }
-
-        @Override
-        public ConditionTreeFactoryType getType() {
-            return ConditionTreeFactoryType.CONJUNCTION;
-        }
-
-    }
-
-    /**
-     * Creates condition trees where the arguments are disjointed together.
-     */
-    public static class DisjunctionFactory extends ConditionTreeFactory {
-
-        @Override
-        public ConditionTree getConditionTree(final int args) {
-            return ConditionTree.createDisjunction(args);
-        }
-
-        @Override
-        public ConditionTreeFactoryType getType() {
-            return ConditionTreeFactoryType.DISJUNCTION;
-        }
-
-    }
-
-    /**
-     * Creates condition trees with a custom structure.
-     */
-    public static class CustomFactory extends ConditionTreeFactory {
-
-        /** The condition tree to use. */
-        protected final ConditionTree tree;
-
-        /**
-         * Creates a new CustomFactory for the specified tree.
-         *
-         * @param tree The tree to use
-         */
-        public CustomFactory(final ConditionTree tree) {
-            this.tree = tree;
-        }
-
-        @Override
-        public ConditionTree getConditionTree(final int args) {
-            return tree;
-        }
-
-        @Override
-        public ConditionTreeFactoryType getType() {
-            return ConditionTreeFactoryType.CUSTOM;
-        }
-
-    }
-
-}

src/com/dmdirc/actions/CoreActionComparison.java

@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.interfaces.actions.ActionComparison;
-
-import java.util.regex.PatternSyntaxException;
-
-/**
- * A CoreActionComparison represents a possible comparison between two types of data used in an
- * action condition.
- */
-public enum CoreActionComparison implements ActionComparison {
-
-    /** Compares a string to another using a regular expression. */
-    STRING_REGEX {
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            try {
-                return ((String) arg1).matches((String) arg2);
-            } catch (PatternSyntaxException pse) {
-                return false;
-            }
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "matches regex";
-        }
-    },
-    /**
-     * Compares if two strings content are the same, case insensitive.
-     */
-    STRING_EQUALS {
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            return ((String) arg1).equalsIgnoreCase((String) arg2);
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "equals";
-        }
-    },
-    /**
-     * Compares if two strings content aren't the same, case insensitive.
-     */
-    STRING_NEQUALS {
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            return !STRING_EQUALS.test(arg1, arg2);
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "does not equal";
-        }
-    },
-    /** Checks if the string starts with another strings. */
-    STRING_STARTSWITH {
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            return ((String) arg1).startsWith((String) arg2);
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "starts with";
-        }
-    },
-    /** Checks if the string contains another string. */
-    STRING_CONTAINS {
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            return ((String) arg1).contains((CharSequence) arg2);
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "contains";
-        }
-    },
-    /** Checks if the string doesn't contain another string. */
-    STRING_NCONTAINS {
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            return !((String) arg1).contains((CharSequence) arg2);
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "doesn't contain";
-        }
-    },
-    /** Checks if two boolean values are equal. */
-    BOOL_IS {
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            return arg1.equals(Boolean.valueOf((String) arg2));
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Boolean.class;
-        }
-
-        @Override
-        public String getName() {
-            return "is";
-        }
-    },
-    /** Checks if the int is equals to another int. */
-    INT_EQUALS {
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            try {
-                return 0 == ((Integer) arg1).compareTo(Integer.parseInt((String) arg2));
-            } catch (NumberFormatException ex) {
-                return false;
-            }
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Integer.class;
-        }
-
-        @Override
-        public String getName() {
-            return "equals";
-        }
-    },
-    /** Checks if the int is larger than another int. */
-    INT_GREATER {
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            try {
-                return 0 < ((Integer) arg1).compareTo(Integer.parseInt((String) arg2));
-            } catch (NumberFormatException ex) {
-                return false;
-            }
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Integer.class;
-        }
-
-        @Override
-        public String getName() {
-            return "is greater than";
-        }
-    },
-    /** Checks if the int is smaller than another int. */
-    INT_LESS {
-        @Override
-        public boolean test(final Object arg1, final Object arg2) {
-            try {
-                return 0 > ((Integer) arg1).compareTo(Integer.parseInt((String) arg2));
-            } catch (NumberFormatException ex) {
-                return false;
-            }
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Integer.class;
-        }
-
-        @Override
-        public String getName() {
-            return "is less than";
-        }
-    }
-
-}

src/com/dmdirc/actions/CoreActionComponent.java

@@ -1,721 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.Channel;
-import com.dmdirc.FrameContainer;
-import com.dmdirc.Query;
-import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.PrivateChat;
-import com.dmdirc.interfaces.actions.ActionComponent;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.ui.Window;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.LocalClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.ui.messages.Styliser;
-
-import java.awt.AWTKeyStroke;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-import java.util.Calendar;
-import java.util.Optional;
-
-import javax.swing.KeyStroke;
-
-/**
- * A CoreActionComponent represents a component of some object that the user can use as the subject
- * of a condition within an action.
- */
-public enum CoreActionComponent implements ActionComponent {
-
-    /** Returns the name of the server. */
-    SERVER_NAME {
-        @Override
-        public Object get(final Object arg) {
-            return ((Connection) arg).getAddress();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Connection.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "name";
-        }
-    },
-    /** Returns the network of the server. */
-    SERVER_NETWORK {
-        @Override
-        @ComponentOptions(requireConnected = true)
-        public Object get(final Object arg) {
-            return ((Connection) arg).getNetwork();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Connection.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "network";
-        }
-    },
-    /**
-     * Returns the protocol of the server.
-     *
-     * @since 0.6.4
-     */
-    SERVER_PROTOCOL {
-        @Override
-        public Object get(final Object arg) {
-            return ((Connection) arg).getProtocol();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Connection.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "protocol";
-        }
-    },
-    /** Returns the away reason for the server. */
-    SERVER_MYAWAYREASON {
-        @Override
-        public Object get(final Object arg) {
-            return ((Connection) arg).getAwayMessage();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Connection.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "away reason";
-        }
-    },
-    /** Returns the channel umodes for the server. */
-    SERVER_CHANNELUMODES {
-        @Override
-        @ComponentOptions(requireConnected = true)
-        public Object get(final Object arg) {
-            return ((Connection) arg).getParser().get().getChannelUserModes();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Connection.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "list of channel usermodes";
-        }
-    },
-    /** Returns the nickname for the server. */
-    SERVER_MYNICKNAME {
-        @Override
-        @ComponentOptions(requireConnected = true)
-        public Object get(final Object arg) {
-            return Optional.ofNullable((Connection) arg)
-                    .flatMap(Connection::getParser)
-                    .map(Parser::getLocalClient)
-                    .map(LocalClientInfo::getNickname)
-                    .orElse("null");
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Connection.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "nickname";
-        }
-    },
-    /** Returns the name of the server. */
-    SERVER_PROFILE {
-        @Override
-        public Object get(final Object arg) {
-            return ((Connection) arg).getProfile();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Connection.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return ConfigProvider.class;
-        }
-
-        @Override
-        public String getName() {
-            return "profile";
-        }
-    },
-    /** Returns the name of the channel. */
-    CHANNEL_NAME {
-        @Override
-        public Object get(final Object arg) {
-            return ((Channel) arg).getChannelInfo().getName();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Channel.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "name";
-        }
-    },
-    /** Returns the name of a client. */
-    CLIENT_NAME {
-        @Override
-        public Object get(final Object arg) {
-            return ((ClientInfo) arg).getNickname();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return ClientInfo.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "nickname";
-        }
-    },
-    /** Returns the host of a client. */
-    CLIENT_HOST {
-        @Override
-        public Object get(final Object arg) {
-            return ((ClientInfo) arg).getHostname();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return ClientInfo.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "host";
-        }
-    },
-    /** Returns the name of a client. */
-    USER_NAME {
-        @Override
-        public Object get(final Object arg) {
-            return ((ChannelClientInfo) arg).getClient().getNickname();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return ChannelClientInfo.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "nickname";
-        }
-    },
-    /** Returns the modes of a client. */
-    USER_MODES {
-        @Override
-        public Object get(final Object arg) {
-            return ((ChannelClientInfo) arg).getAllModes();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return ChannelClientInfo.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "modes";
-        }
-    },
-    /** Returns the host of a client. */
-    USER_HOST {
-        @Override
-        public Object get(final Object arg) {
-            return ((ChannelClientInfo) arg).getClient().getHostname();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return ChannelClientInfo.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "host";
-        }
-    },
-    /**
-     * Returns the number of common channels the client is on.
-     */
-    USER_COMCHANS {
-        @Override
-        public Object get(final Object arg) {
-            return ((ChannelClientInfo) arg).getClient().getChannelCount();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return ChannelClientInfo.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return Integer.class;
-        }
-
-        @Override
-        public String getName() {
-            return "number of common channels";
-        }
-    },
-    /** Returns the content of a string. */
-    STRING_STRING {
-        @Override
-        public Object get(final Object arg) {
-            return arg;
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "content";
-        }
-    },
-    /**
-     * Returns the content of a string, stripped of formatting.
-     */
-    STRING_STRIPPED {
-        @Override
-        public Object get(final Object arg) {
-            return Styliser.stipControlCodes((String) arg);
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "content (without formatting)";
-        }
-    },
-    /** Returns the length of a string. */
-    STRING_LENGTH {
-        @Override
-        public Object get(final Object arg) {
-            return ((CharSequence) arg).length();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return String.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return Integer.class;
-        }
-
-        @Override
-        public String getName() {
-            return "length";
-        }
-    },
-    /** Returns the size of a string array. */
-    STRINGARRAY_LENGTH {
-        @Override
-        public Object get(final Object arg) {
-            return ((String[]) arg).length;
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return String[].class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return Integer.class;
-        }
-
-        @Override
-        public String getName() {
-            return "size";
-        }
-    },
-    /**
-     * Returns the readable representation of a date.
-     */
-    CALENDAR_FULLSTRING {
-        @Override
-        public Object get(final Object arg) {
-            return ((Calendar) arg).getTime().toString();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Calendar.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "full date";
-        }
-    },
-    /**
-     * Returns the name of the key that was pressed.
-     */
-    KEYEVENT_KEYNAME {
-        @Override
-        public Object get(final Object arg) {
-            return KeyEvent.getKeyText(((AWTKeyStroke) arg).getKeyCode());
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return KeyStroke.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "key name";
-        }
-    },
-    /**
-     * Returns the state of the control key for a key press event.
-     */
-    KEYEVENT_CTRLSTATE {
-        @Override
-        public Object get(final Object arg) {
-            return (((AWTKeyStroke) arg).getModifiers() & InputEvent.CTRL_DOWN_MASK) != 0;
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return KeyStroke.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return Boolean.class;
-        }
-
-        @Override
-        public String getName() {
-            return "control key state";
-        }
-    },
-    /**
-     * Returns the state of the shift key for a key press event.
-     */
-    KEYEVENT_SHIFTSTATE {
-        @Override
-        public Object get(final Object arg) {
-            return (((AWTKeyStroke) arg).getModifiers() & InputEvent.SHIFT_DOWN_MASK) != 0;
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return KeyStroke.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return Boolean.class;
-        }
-
-        @Override
-        public String getName() {
-            return "shift key state";
-        }
-    },
-    /**
-     * Returns the state of the shift key for a key press event.
-     */
-    KEYEVENT_ALTSTATE {
-        @Override
-        public Object get(final Object arg) {
-            return (((AWTKeyStroke) arg).getModifiers() & InputEvent.ALT_DOWN_MASK) != 0;
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return KeyStroke.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return Boolean.class;
-        }
-
-        @Override
-        public String getName() {
-            return "alt key state";
-        }
-    },
-    /** Returns the host of the query. */
-    QUERY_HOST {
-        @Override
-        public Object get(final Object arg) {
-            return ((PrivateChat) arg).getHost();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Query.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "host";
-        }
-    },
-    /** Returns the host of the query. */
-    QUERY_NICK {
-        @Override
-        public Object get(final Object arg) {
-            return ((FrameContainer) arg).getName();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Query.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "nick";
-        }
-    },
-    /** The name of a window. */
-    WINDOW_NAME {
-        @Override
-        public Object get(final Object arg) {
-            return ((FrameContainer) arg).getName();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return FrameContainer.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "name";
-        }
-    },
-    /**
-     * Returns the server of the window.
-     *
-     * @since 0.6.4
-     */
-    WINDOW_SERVER {
-        @Override
-        public Object get(final Object arg) {
-            return ((Window) arg).getContainer().getConnection().orElse(null);
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Window.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return Connection.class;
-        }
-
-        @Override
-        public String getName() {
-            return "server";
-        }
-    },
-    /** Returns the name of an identity. */
-    IDENTITY_NAME {
-        @Override
-        public Object get(final Object arg) {
-            return ((ConfigProvider) arg).getName();
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return ConfigProvider.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return String.class;
-        }
-
-        @Override
-        public String getName() {
-            return "name";
-        }
-    },
-    /** Returns the value of an integer. */
-    INTEGER_VALUE {
-        @Override
-        public Object get(final Object arg) {
-            return arg;
-        }
-
-        @Override
-        public Class<?> appliesTo() {
-            return Integer.class;
-        }
-
-        @Override
-        public Class<?> getType() {
-            return Integer.class;
-        }
-
-        @Override
-        public String getName() {
-            return "value";
-        }
-    }
-
-}

src/com/dmdirc/actions/CoreActionExtractor.java

@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
-import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
-import com.dmdirc.events.UserErrorEvent;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.util.io.FileUtils;
-
-import java.io.IOException;
-import java.nio.file.Path;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-/**
- * Utility class that can extract bundled actions.
- */
-@Singleton
-public class CoreActionExtractor {
-
-    /** The action manager to inform when actions are updated. */
-    private final ActionController actionManager;
-    /** The directory to extract actions to. */
-    private final Path actionsDir;
-    /** The event bus to post events to. */
-    private final DMDircMBassador eventBus;
-
-    /**
-     * Creates a new instance of {@link CoreActionExtractor}.
-     *
-     * @param actionManager  The action manager to inform when actions are updated.
-     * @param actionsDir     The directory to extract actions to.
-     * @param eventBus       The event bus to post events to.
-     */
-    @Inject
-    public CoreActionExtractor(final ActionController actionManager,
-            @Directory(DirectoryType.ACTIONS) final Path actionsDir,
-            final DMDircMBassador eventBus) {
-        this.actionManager = actionManager;
-        this.actionsDir = actionsDir;
-        this.eventBus = eventBus;
-    }
-
-    /**
-     * Extracts actions bundled with DMDirc to the user's profile's actions directory.
-     */
-    public void extractCoreActions() {
-        try {
-            FileUtils.copyResourcesContents(getClass().getResource("/com/dmdirc/actions/defaults/"),
-                    actionsDir);
-            actionManager.loadUserActions();
-        } catch (IOException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
-                    "Failed to extract actions: " + ex.getMessage(), ""));
-        }
-    }
-
-}

src/com/dmdirc/actions/CoreActionType.java

@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.actions.metatypes.ActionEvents;
-import com.dmdirc.actions.metatypes.ChannelEvents;
-import com.dmdirc.actions.metatypes.ClientEvents;
-import com.dmdirc.actions.metatypes.LinkEvents;
-import com.dmdirc.actions.metatypes.PluginEvents;
-import com.dmdirc.actions.metatypes.QueryEvents;
-import com.dmdirc.actions.metatypes.ServerEvents;
-import com.dmdirc.interfaces.actions.ActionMetaType;
-import com.dmdirc.interfaces.actions.ActionType;
-
-/**
- * An enumeration of actions that are raised by the core.
- */
-public enum CoreActionType implements ActionType {
-
-    /** Client opened. */
-    @Deprecated
-    CLIENT_OPENED(ClientEvents.CLIENT_EVENT, "Client opened"),
-    /** Client closed. */
-    @Deprecated
-    CLIENT_CLOSED(ClientEvents.CLIENT_EVENT, "Client closed"),
-    /** Client closing. */
-    @Deprecated
-    CLIENT_CLOSING(ClientEvents.CLIENT_EVENT, "Client closing"),
-    /** Client minimised. */
-    @Deprecated
-    CLIENT_MINIMISED(ClientEvents.CLIENT_EVENT, "Client minimised"),
-    /** Client unminimised. */
-    @Deprecated
-    CLIENT_UNMINIMISED(ClientEvents.CLIENT_EVENT, "Client unminimised"),
-    /** Client lost focus. */
-    @Deprecated
-    CLIENT_FOCUS_LOST(ClientEvents.CLIENT_EVENT, "Client lost focus"),
-    /** Client gained focus. */
-    @Deprecated
-    CLIENT_FOCUS_GAINED(ClientEvents.CLIENT_EVENT, "Client gained focus"),
-    /** Function key pressed. */
-    @Deprecated
-    CLIENT_KEY_PRESSED(ClientEvents.CLIENT_EVENT_WITH_KEY, "Function key pressed"),
-    /** Frame changed. */
-    @Deprecated
-    CLIENT_FRAME_CHANGED(ClientEvents.WINDOW_EVENT, "Frame changed"),
-    /** User input. */
-    @Deprecated
-    CLIENT_USER_INPUT(ClientEvents.CLIENT_EVENT_WITH_BUFFER, "User input"),
-    /** Line added. */
-    @Deprecated
-    CLIENT_LINE_ADDED(ClientEvents.WINDOW_EVENT_WITH_MESSAGE, "Line added to a window"),
-    /** Popup generated. */
-    @Deprecated
-    CLIENT_POPUP_GENERATED(ClientEvents.POPUP_EVENT, "Popup menu generated"),
-    /** Prefs dialog opened. */
-    @Deprecated
-    CLIENT_PREFS_OPENED(ClientEvents.CLIENT_EVENT_WITH_PREFS, "Preferences dialog opened"),
-    /** Context-specific prefs requested. */
-    @Deprecated
-    CLIENT_PREFS_REQUESTED(ClientEvents.CLIENT_EVENT_WITH_PREFS_CAT, "Preferences requested"),
-    /** Prefs dialog closed. */
-    @Deprecated
-    CLIENT_PREFS_CLOSED(ClientEvents.CLIENT_EVENT, "Preferences dialog opened"),
-    /** Unknown command. */
-    @Deprecated
-    UNKNOWN_COMMAND(ClientEvents.UNKNOWN_COMMAND, "Unknown command entered"),
-    /** Server numeric received. */
-    @Deprecated
-    SERVER_NUMERIC(ServerEvents.SERVER_NUMERIC, "Numeric event received"),
-    /** Server connected. */
-    @Deprecated
-    SERVER_CONNECTED(ServerEvents.SERVER_EVENT, "Server connected"),
-    /** Server connecting. */
-    @Deprecated
-    SERVER_CONNECTING(ServerEvents.SERVER_EVENT, "Server connecting"),
-    /** Server connection error. */
-    @Deprecated
-    SERVER_CONNECTERROR(ServerEvents.SERVER_EVENT_WITH_ARG, "Server connection error"),
-    /** Server disconnected. */
-    @Deprecated
-    SERVER_DISCONNECTED(ServerEvents.SERVER_EVENT, "Server disconnected"),
-    /** Marked as away. */
-    @Deprecated
-    SERVER_BACK(ServerEvents.SERVER_EVENT, "Marked as 'back'"),
-    /** Marked as back. */
-    @Deprecated
-    SERVER_AWAY(ServerEvents.SERVER_EVENT_WITH_ARG, "Marked as 'away'"),
-    /** Error. */
-    @Deprecated
-    SERVER_ERROR(ServerEvents.SERVER_EVENT_WITH_ARG, "Server error"),
-    /** Auth notice received. */
-    @Deprecated
-    SERVER_AUTHNOTICE(ServerEvents.SERVER_EVENT_WITH_ARG, "Received auth notice"),
-    /** Unknown action received. */
-    @Deprecated
-    SERVER_UNKNOWNACTION(ServerEvents.SERVER_UNKNOWN_EVENT, "Received unknown action"),
-    /** Unknown notice received. */
-    @Deprecated
-    SERVER_UNKNOWNNOTICE(ServerEvents.SERVER_UNKNOWN_EVENT, "Received unknown notice"),
-    /** Unknown message received. */
-    @Deprecated
-    SERVER_UNKNOWNMESSAGE(ServerEvents.SERVER_UNKNOWN_EVENT, "Received unknown message"),
-    /** User modes changed. */
-    @Deprecated
-    SERVER_USERMODES(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "User modes changed"),
-    /** Private CTCP received. */
-    @Deprecated
-    SERVER_CTCP(ServerEvents.SERVER_CTCP_EVENT, "CTCP received"),
-    /** Private CTCPR received. */
-    @Deprecated
-    SERVER_CTCPR(ServerEvents.SERVER_CTCP_EVENT, "CTCP reply received"),
-    /** Private notice received. */
-    @Deprecated
-    SERVER_NOTICE(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Notice received"),
-    /** Private server notice received. */
-    @Deprecated
-    SERVER_SERVERNOTICE(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Server notice received"),
-    /** MOTD starting. */
-    @Deprecated
-    SERVER_MOTDSTART(ServerEvents.SERVER_EVENT_WITH_ARG, "Start of MOTD received"),
-    /** MOTD ended. */
-    @Deprecated
-    SERVER_MOTDEND(ServerEvents.SERVER_EVENT_WITH_ARG, "End of MOTD received"),
-    /** MOTD line. */
-    @Deprecated
-    SERVER_MOTDLINE(ServerEvents.SERVER_EVENT_WITH_ARG, "MOTD line received"),
-    /** Ping reply received. */
-    @Deprecated
-    SERVER_GOTPING(ServerEvents.SERVER_PING, "Received server ping reply"),
-    /** Missed server ping reply. */
-    @Deprecated
-    SERVER_NOPING(ServerEvents.SERVER_PING, "Missed server ping reply"),
-    /** Ping sent. */
-    @Deprecated
-    SERVER_PINGSENT(ServerEvents.SERVER_EVENT, "Ping request sent"),
-    /** Invite received. */
-    @Deprecated
-    SERVER_INVITERECEIVED(ServerEvents.SERVER_INVITE, "Invite received"),
-    /** Wallops. */
-    @Deprecated
-    SERVER_WALLOPS(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Wallop received"),
-    /** Wallusers. */
-    @Deprecated
-    SERVER_WALLUSERS(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Walluser received"),
-    /** Walldesync. */
-    @Deprecated
-    SERVER_WALLDESYNC(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Walldesync received"),
-    /** Nick change. */
-    @Deprecated
-    SERVER_NICKCHANGE(ServerEvents.SERVER_NICKCHANGE, "My nickname changed"),
-    /** Names reply received. */
-    @Deprecated
-    CHANNEL_GOTNAMES(ChannelEvents.CHANNEL_EVENT, "Channel names reply received"),
-    /** Channel topic is not set. */
-    @Deprecated
-    CHANNEL_NOTOPIC(ChannelEvents.CHANNEL_EVENT, "Channel topic is not set"),
-    /** Channel topic received. */
-    @Deprecated
-    CHANNEL_GOTTOPIC(ChannelEvents.CHANNEL_TOPICEVENT, "Channel topic received"),
-    /** Channel message sent. */
-    @Deprecated
-    CHANNEL_SELF_MESSAGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Channel message sent"),
-    /** Channel action sent. */
-    @Deprecated
-    CHANNEL_SELF_ACTION(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Channel action sent"),
-    /** Channel message received. */
-    @Deprecated
-    CHANNEL_MESSAGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Channel message received"),
-    /** Channel actions received. */
-    @Deprecated
-    CHANNEL_ACTION(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Channel action received"),
-    /** Channel notice received. */
-    @Deprecated
-    CHANNEL_NOTICE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Channel notice received"),
-    /** Channel mode notice received. */
-    @Deprecated
-    CHANNEL_MODE_NOTICE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_CHARARG,
-            "Channel mode notice received"),
-    /** Channel CTCP received. */
-    @Deprecated
-    CHANNEL_CTCP(ChannelEvents.CHANNEL_CTCP, "Channel CTCP received"),
-    /** Someone joined a channel. */
-    @Deprecated
-    CHANNEL_JOIN(ChannelEvents.CHANNEL_SOURCED_EVENT, "Someone joined a channel"),
-    /** Someone left a channel. */
-    @Deprecated
-    CHANNEL_PART(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Someone left a channel"),
-    /** Someone quit. */
-    @Deprecated
-    CHANNEL_QUIT(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Someone quit IRC"),
-    /** Someone was kicked. */
-    @Deprecated
-    CHANNEL_KICK(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_VICTIM, "Someone kicked someone"),
-    /** Someone marked as away. */
-    @Deprecated
-    CHANNEL_USERAWAY(ChannelEvents.CHANNEL_SOURCED_EVENT, "Someone is marked as 'away'"),
-    /** Someone marked as back. */
-    @Deprecated
-    CHANNEL_USERBACK(ChannelEvents.CHANNEL_SOURCED_EVENT, "Someone is marked as 'back'"),
-    /** Channel list mode retrieved. */
-    @Deprecated
-    CHANNEL_LISTMODERETRIEVED(ChannelEvents.CHANNEL_LISTMODEEVENT,
-            "Channel list mode value retrieved"),
-    /** Channel mode discovered. */
-    @Deprecated
-    CHANNEL_MODESDISCOVERED(ChannelEvents.CHANNEL_MODEEVENT, "Channel modes discovered"),
-    /** Channel mode changes. */
-    @Deprecated
-    CHANNEL_MODECHANGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Someone changed channel modes"),
-    /** Someone changed someone else's user modes. */
-    @Deprecated
-    CHANNEL_USERMODECHANGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_VICTIM,
-            "Someone changed someone else's modes"),
-    /** Someone changed nickname. */
-    @Deprecated
-    CHANNEL_NICKCHANGE(ChannelEvents.CHANNEL_NICKEVENT, "Someone changed nicknames"),
-    /** Someone changed a topic. */
-    @Deprecated
-    CHANNEL_TOPICCHANGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG,
-            "Someone changed channel topic"),
-    /** Query opened. */
-    @Deprecated
-    QUERY_OPENED(QueryEvents.QUERY_EVENT, "Query window opened"),
-    /** Query closed. */
-    @Deprecated
-    QUERY_CLOSED(QueryEvents.QUERY_EVENT, "Query window closed"),
-    /** Query message received. */
-    @Deprecated
-    QUERY_MESSAGE(QueryEvents.QUERY_SOURCED_EVENT_WITH_ARG, "Private message received"),
-    /** Query action received. */
-    @Deprecated
-    QUERY_ACTION(QueryEvents.QUERY_SOURCED_EVENT_WITH_ARG, "Private action received"),
-    /** Query message sent. */
-    @Deprecated
-    QUERY_SELF_MESSAGE(QueryEvents.QUERY_SOURCED_EVENT_WITH_ARG, "Private message sent"),
-    /** Query action sent. */
-    @Deprecated
-    QUERY_SELF_ACTION(QueryEvents.QUERY_SOURCED_EVENT_WITH_ARG, "Private action sent"),
-    /** Query quit event. */
-    @Deprecated
-    QUERY_QUIT(QueryEvents.QUERY_EVENT_WITH_ARG, "Query: user quit"),
-    /** Query nick change. */
-    @Deprecated
-    QUERY_NICKCHANGE(QueryEvents.QUERY_EVENT_WITH_ARG, "Query: user changed nicks"),
-    /** Plugin loaded. */
-    @Deprecated
-    PLUGIN_LOADED(PluginEvents.PLUGIN_EVENT, "Plugin loaded"),
-    /** Plugin unloaded. */
-    @Deprecated
-    PLUGIN_UNLOADED(PluginEvents.PLUGIN_EVENT, "Plugin unloaded"),
-    /** Plugins have been refreshed. */
-    @Deprecated
-    PLUGIN_REFRESH(PluginEvents.PLUGIN_EVENT, "Plugins refreshed"),
-    /** Action created. */
-    @Deprecated
-    ACTION_CREATED(ActionEvents.ACTION_EVENT, "Action created"),
-    /** Action updated. */
-    @Deprecated
-    ACTION_UPDATED(ActionEvents.ACTION_EVENT, "Action updated"),
-    /** Action deleted. */
-    @Deprecated
-    ACTION_DELETED(ActionEvents.ACTION_DELETED, "Action deleted"),
-    /** Channel clicked. */
-    @Deprecated
-    LINK_CHANNEL_CLICKED(LinkEvents.CHANNEL_CLICKED, "A channel link was clicked"),
-    /** Channel clicked. */
-    @Deprecated
-    LINK_NICKNAME_CLICKED(LinkEvents.NICKNAME_CLICKED, "A nickname link was clicked"),
-    /** Link clicked. */
-    @Deprecated
-    LINK_URL_CLICKED(LinkEvents.LINK_CLICKED, "A Link was clicked");
-    /** The type of this action. */
-    private final ActionMetaType type;
-    /** The name of this action. */
-    private final String name;
-
-    /**
-     * Constructs a new core action.
-     *
-     * @param type The type of this action
-     * @param name The name of this action
-     */
-    CoreActionType(final ActionMetaType type, final String name) {
-        this.type = type;
-        this.name = name;
-    }
-
-    @Override
-    public ActionMetaType getType() {
-        return type;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-}

src/com/dmdirc/actions/defaults/umodes/ohv

@@ -1,20 +0,0 @@
-# This is a DMDirc configuration file.
-# Written on: Mon Dec 17 23:32:19 GMT 2007
-
-# This section indicates which sections below take key/value
-# pairs, rather than a simple list. It should be placed above
-# any sections that take key/values.
-keysections:
-  condition 0
-
-triggers:
-  SERVER_CONNECTED
-
-response:
-  /.set --server popup umodes <umodes-op\n<umodes-hop\n<umodes-voice
-
-condition 0:
-  argument=0
-  component=SERVER_CHANNELUMODES
-  target=ohv
-  comparison=STRING_EQUALS

src/com/dmdirc/actions/defaults/umodes/ov

@@ -1,27 +0,0 @@
-# This is a DMDirc configuration file.
-# Written on: Mon Dec 17 23:32:19 GMT 2007
-
-# This section indicates which sections below take key/value
-# pairs, rather than a simple list. It should be placed above
-# any sections that take key/values.
-keysections:
-  condition 0
-  metadata
-
-triggers:
-  SERVER_CONNECTED
-
-response:
-  /.set --server popup umodes <umodes-op\n<umodes-voice
-
-condition 0:
-  argument=0
-  component=SERVER_CHANNELUMODES
-  target=ov
-  comparison=STRING_EQUALS
-
-metadata:
-  description=Automatically sets the popup.umodes setting when connecting to a server, so that the correct user modes appear in the nicklist popup.
-  author=Chris <chris@dmdirc.com>
-  version=2
-  component=19

src/com/dmdirc/actions/defaults/umodes/qaohv

@@ -1,20 +0,0 @@
-# This is a DMDirc configuration file.
-# Written on: Mon Dec 17 23:32:19 GMT 2007
-
-# This section indicates which sections below take key/value
-# pairs, rather than a simple list. It should be placed above
-# any sections that take key/values.
-keysections:
-  condition 0
-
-triggers:
-  SERVER_CONNECTED
-
-response:
-  /.set --server popup umodes <umodes-op\n<umodes-hop\n<umodes-voice\n-\n<umodes-admin\n<umodes-owner
-
-condition 0:
-  argument=0
-  component=SERVER_CHANNELUMODES
-  target=qaohv
-  comparison=STRING_EQUALS

src/com/dmdirc/actions/defaults/umodes/qaov

@@ -1,20 +0,0 @@
-# This is a DMDirc configuration file.
-# Written on: Mon Dec 17 23:32:19 GMT 2007
-
-# This section indicates which sections below take key/value
-# pairs, rather than a simple list. It should be placed above
-# any sections that take key/values.
-keysections:
-  condition 0
-
-triggers:
-  SERVER_CONNECTED
-
-response:
-  /.set --server popup umodes <umodes-op\n<umodes-voice\n-\n<umodes-admin\n<umodes-owner
-
-condition 0:
-  argument=0
-  component=SERVER_CHANNELUMODES
-  target=qaov
-  comparison=STRING_EQUALS

src/com/dmdirc/actions/metatypes/ActionEvents.java

@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.metatypes;
-
-import com.dmdirc.actions.Action;
-import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.interfaces.actions.ActionMetaType;
-
-/**
- * Defines action-related events.
- */
-public enum ActionEvents implements ActionMetaType {
-
-    /** Action event type. */
-    ACTION_EVENT(new String[]{"action"}, Action.class),
-    /** Action event type. */
-    ACTION_DELETED(new String[]{"Action group", "Action name"}, ActionGroup.class, String.class);
-    /** The names of the arguments for this meta type. */
-    private final String[] argNames;
-    /** The classes of the arguments for this meta type. */
-    private final Class<?>[] argTypes;
-
-    /**
-     * Creates a new instance of this meta-type.
-     *
-     * @param argNames The names of the meta-type's arguments
-     * @param argTypes The types of the meta-type's arguments
-     */
-    ActionEvents(final String[] argNames, final Class<?>... argTypes) {
-        this.argNames = argNames;
-        this.argTypes = argTypes;
-    }
-
-    @Override
-    public int getArity() {
-        return argNames.length;
-    }
-
-    @Override
-    public Class<?>[] getArgTypes() {
-        return argTypes;
-    }
-
-    @Override
-    public String[] getArgNames() {
-        return argNames;
-    }
-
-    @Override
-    public String getGroup() {
-        return "Action Events";
-    }
-
-}

src/com/dmdirc/actions/metatypes/ChannelEvents.java

@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.metatypes;
-
-import com.dmdirc.Channel;
-import com.dmdirc.Topic;
-import com.dmdirc.interfaces.actions.ActionMetaType;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-
-/**
- * Defines channel-related events.
- */
-public enum ChannelEvents implements ActionMetaType {
-
-    /** Channel event type. */
-    CHANNEL_EVENT(new String[]{"channel"}, Channel.class),
-    /** Channel mode event. */
-    CHANNEL_MODEEVENT(new String[]{"channel", "modes"}, Channel.class, String.class),
-    /** Channel list mode event. */
-    CHANNEL_LISTMODEEVENT(new String[]{"channel", "mode"}, Channel.class, Character.class),
-    /** Channel topic event type. */
-    CHANNEL_TOPICEVENT(new String[]{"channel", "topic"}, Channel.class, Topic.class),
-    /** Channel CTCP type. */
-    CHANNEL_CTCP(new String[]{"channel", "user", "type", "content"}, Channel.class,
-            ChannelClientInfo.class, String.class, String.class),
-    /** Channel event with source. */
-    CHANNEL_SOURCED_EVENT(new String[]{"channel", "user"}, Channel.class, ChannelClientInfo.class),
-    /** Chanel event with source and argument. */
-    CHANNEL_SOURCED_EVENT_WITH_ARG(new String[]{"channel", "user", "message"}, Channel.class,
-            ChannelClientInfo.class, String.class),
-    /** Chanel event with source and nickname. */
-    CHANNEL_NICKEVENT(new String[]{"channel", "user", "old nickname"}, Channel.class,
-            ChannelClientInfo.class, String.class),
-    /** Chanel event with source, message and mode character argument.
-     *
-     * @since 0.6.3m2 */
-    CHANNEL_SOURCED_EVENT_WITH_CHARARG(new String[]{"channel", "user", "mode", "message"},
-            Channel.class, ChannelClientInfo.class, String.class, String.class),
-    /** Channel event with source and victim. */
-    CHANNEL_SOURCED_EVENT_WITH_VICTIM(new String[]{"channel", "user", "victim", "message"},
-            Channel.class, ChannelClientInfo.class, ChannelClientInfo.class, String.class);
-    /** The names of the arguments for this meta type. */
-    private final String[] argNames;
-    /** The classes of the arguments for this meta type. */
-    private final Class<?>[] argTypes;
-
-    /**
-     * Creates a new instance of this meta-type.
-     *
-     * @param argNames The names of the meta-type's arguments
-     * @param argTypes The types of the meta-type's arguments
-     */
-    ChannelEvents(final String[] argNames, final Class<?>... argTypes) {
-        this.argNames = argNames;
-        this.argTypes = argTypes;
-    }
-
-    @Override
-    public int getArity() {
-        return argNames.length;
-    }
-
-    @Override
-    public Class<?>[] getArgTypes() {
-        return argTypes;
-    }
-
-    @Override
-    public String[] getArgNames() {
-        return argNames;
-    }
-
-    @Override
-    public String getGroup() {
-        return "Channel Events";
-    }
-
-}

src/com/dmdirc/actions/metatypes/ClientEvents.java

@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.metatypes;
-
-import com.dmdirc.FrameContainer;
-import com.dmdirc.commandparser.PopupMenu;
-import com.dmdirc.commandparser.PopupType;
-import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesDialogModel;
-import com.dmdirc.interfaces.actions.ActionMetaType;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-
-import javax.swing.KeyStroke;
-import javax.swing.text.StyledDocument;
-
-/**
- * Defines client-wide events.
- */
-public enum ClientEvents implements ActionMetaType {
-
-    /** Client event type. */
-    CLIENT_EVENT(new String[]{}),
-    /** Client event type, with a frame argument. */
-    WINDOW_EVENT(new String[]{"window"}, FrameContainer.class),
-    /** Client event with frame and message. */
-    WINDOW_EVENT_WITH_MESSAGE(new String[]{"window", "message"}, FrameContainer.class, String.class),
-    /** A popup-related event. */
-    POPUP_EVENT(new String[]{"popup type", "popup", "configuration provider"}, PopupType.class,
-            PopupMenu.class, AggregateConfigProvider.class),
-    /** Client event type, with a key argument. */
-    CLIENT_EVENT_WITH_KEY(new String[]{"key event"}, KeyStroke.class),
-    /** Client event with an origin and
-     * editable buffer. */
-    CLIENT_EVENT_WITH_BUFFER(new String[]{"origin", "buffer"}, FrameContainer.class,
-            StringBuffer.class),
-    /** Client event with preferences manager. */
-    CLIENT_EVENT_WITH_PREFS(new String[]{"preferences manager"}, PreferencesDialogModel.class),
-    /** Client event with preferences category. */
-    CLIENT_EVENT_WITH_PREFS_CAT(new String[]{"preferences category", "is server"},
-            PreferencesCategory.class, Boolean.class),
-    /** Client event with a styled doc. */
-    CLIENT_EVENT_WITH_STYLE(new String[]{"styled document", "start offset", "length"},
-            StyledDocument.class, Integer.class, Integer.class),
-    /** Unknown command event type. */
-    UNKNOWN_COMMAND(new String[]{"source", "command", "arguments"}, FrameContainer.class,
-            String.class, String[].class);
-    /** The names of the arguments for this meta type. */
-    private final String[] argNames;
-    /** The classes of the arguments for this meta type. */
-    private final Class<?>[] argTypes;
-
-    /**
-     * Creates a new instance of this meta-type.
-     *
-     * @param argNames The names of the meta-type's arguments
-     * @param argTypes The types of the meta-type's arguments
-     */
-    ClientEvents(final String[] argNames, final Class<?>... argTypes) {
-        this.argNames = argNames;
-        this.argTypes = argTypes;
-    }
-
-    @Override
-    public int getArity() {
-        return argNames.length;
-    }
-
-    @Override
-    public Class<?>[] getArgTypes() {
-        return argTypes;
-    }
-
-    @Override
-    public String[] getArgNames() {
-        return argNames;
-    }
-
-    @Override
-    public String getGroup() {
-        return "General Events";
-    }
-
-}

src/com/dmdirc/actions/metatypes/LinkEvents.java

@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.metatypes;
-
-import com.dmdirc.interfaces.actions.ActionMetaType;
-import com.dmdirc.interfaces.ui.Window;
-
-/**
- * Defines link-related events.
- */
-public enum LinkEvents implements ActionMetaType {
-
-    /** URL Link clicked. */
-    LINK_CLICKED(new String[]{"Window", "URL"}, Window.class, String.class),
-    /** Channel link clicked. */
-    CHANNEL_CLICKED(new String[]{"Window", "Channel"}, Window.class, String.class),
-    /** Nickname link clicked. */
-    NICKNAME_CLICKED(new String[]{"Window", "Nickname"}, Window.class, String.class);
-    /** The names of the arguments for this meta type. */
-    private final String[] argNames;
-    /** The classes of the arguments for this meta type. */
-    private final Class<?>[] argTypes;
-
-    /**
-     * Creates a new instance of this meta-type.
-     *
-     * @param argNames The names of the meta-type's arguments
-     * @param argTypes The types of the meta-type's arguments
-     */
-    LinkEvents(final String[] argNames, final Class<?>... argTypes) {
-        this.argNames = argNames;
-        this.argTypes = argTypes;
-    }
-
-    @Override
-    public int getArity() {
-        return argNames.length;
-    }
-
-    @Override
-    public Class<?>[] getArgTypes() {
-        return argTypes;
-    }
-
-    @Override
-    public String[] getArgNames() {
-        return argNames;
-    }
-
-    @Override
-    public String getGroup() {
-        return "Link Events";
-    }
-
-}

src/com/dmdirc/actions/metatypes/PluginEvents.java

@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.metatypes;
-
-import com.dmdirc.interfaces.actions.ActionMetaType;
-import com.dmdirc.plugins.PluginInfo;
-
-/**
- * Defines plugin-related events.
- */
-public enum PluginEvents implements ActionMetaType {
-
-    /** Plugin event type. */
-    PLUGIN_EVENT(new String[]{"plugin"}, PluginInfo.class);
-    /** The names of the arguments for this meta type. */
-    private final String[] argNames;
-    /** The classes of the arguments for this meta type. */
-    private final Class<?>[] argTypes;
-
-    /**
-     * Creates a new instance of this meta-type.
-     *
-     * @param argNames The names of the meta-type's arguments
-     * @param argTypes The types of the meta-type's arguments
-     */
-    PluginEvents(final String[] argNames, final Class<?>... argTypes) {
-        this.argNames = argNames;
-        this.argTypes = argTypes;
-    }
-
-    @Override
-    public int getArity() {
-        return argNames.length;
-    }
-
-    @Override
-    public Class<?>[] getArgTypes() {
-        return argTypes;
-    }
-
-    @Override
-    public String[] getArgNames() {
-        return argNames;
-    }
-
-    @Override
-    public String getGroup() {
-        return "Plugin Events";
-    }
-
-}

src/com/dmdirc/actions/metatypes/QueryEvents.java

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.metatypes;
-
-import com.dmdirc.Query;
-import com.dmdirc.interfaces.actions.ActionMetaType;
-import com.dmdirc.parser.interfaces.ClientInfo;
-
-/**
- * Defines query-related events.
- */
-public enum QueryEvents implements ActionMetaType {
-
-    /** Query event type. */
-    QUERY_EVENT(new String[]{"query"}, Query.class),
-    /** Query event with argument. */
-    QUERY_EVENT_WITH_ARG(new String[]{"query", "message"}, Query.class, String.class),
-    /** Query event with argument and source. */
-    QUERY_SOURCED_EVENT_WITH_ARG(new String[]{"query", "source", "message"}, Query.class,
-            ClientInfo.class, String.class);
-    /** The names of the arguments for this meta type. */
-    private final String[] argNames;
-    /** The classes of the arguments for this meta type. */
-    private final Class<?>[] argTypes;
-
-    /**
-     * Creates a new instance of this meta-type.
-     *
-     * @param argNames The names of the meta-type's arguments
-     * @param argTypes The types of the meta-type's arguments
-     */
-    QueryEvents(final String[] argNames, final Class<?>... argTypes) {
-        this.argNames = argNames;
-        this.argTypes = argTypes;
-    }
-
-    @Override
-    public int getArity() {
-        return argNames.length;
-    }
-
-    @Override
-    public Class<?>[] getArgTypes() {
-        return argTypes;
-    }
-
-    @Override
-    public String[] getArgNames() {
-        return argNames;
-    }
-
-    @Override
-    public String getGroup() {
-        return "Query Events";
-    }
-
-}

src/com/dmdirc/actions/metatypes/ServerEvents.java

@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.metatypes;
-
-import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.actions.ActionMetaType;
-import com.dmdirc.parser.interfaces.ClientInfo;
-
-/**
- * Defines server-related events.
- */
-public enum ServerEvents implements ActionMetaType {
-
-    /** Server ping event type. */
-    SERVER_PING(new String[]{"server", "ping"}, Connection.class, Long.class),
-    /** Server numeric event type. */
-    SERVER_NUMERIC(new String[]{"server", "numeric", "arguments"}, Connection.class, Integer.class,
-            String[].class),
-    /** Server event with argument. */
-    SERVER_EVENT_WITH_ARG(new String[]{"server", "message"}, Connection.class, String.class),
-    /** Server nick change. */
-    SERVER_NICKCHANGE(new String[]{"server", "old nickname", "new nickname"}, Connection.class,
-            String.class, String.class),
-    /** Server event, with source and argument. */
-    SERVER_SOURCED_EVENT_WITH_ARG(new String[]{"server", "user", "message"}, Connection.class,
-            ClientInfo.class, String.class),
-    /** Server CTCP event. */
-    SERVER_CTCP_EVENT(new String[]{"server", "user", "type", "content"}, Connection.class,
-            ClientInfo.class, String.class, String.class),
-    /** Server event with argument. */
-    SERVER_UNKNOWN_EVENT(new String[]{"server", "source", "target", "message"}, Connection.class,
-            String.class, String.class, String.class),
-    /** Server invite event. */
-    SERVER_INVITE(new String[]{"server", "source", "channel"}, Connection.class, ClientInfo.class,
-            String.class),
-    /** Server event type. */
-    SERVER_EVENT(new String[]{"server"}, Connection.class);
-    /** The names of the arguments for this meta type. */
-    private final String[] argNames;
-    /** The classes of the arguments for this meta type. */
-    private final Class<?>[] argTypes;
-
-    /**
-     * Creates a new instance of this meta-type.
-     *
-     * @param argNames The names of the meta-type's arguments
-     * @param argTypes The types of the meta-type's arguments
-     */
-    ServerEvents(final String[] argNames, final Class<?>... argTypes) {
-        this.argNames = argNames;
-        this.argTypes = argTypes;
-    }
-
-    @Override
-    public int getArity() {
-        return argNames.length;
-    }
-
-    @Override
-    public Class<?>[] getArgTypes() {
-        return argTypes;
-    }
-
-    @Override
-    public String[] getArgNames() {
-        return argNames;
-    }
-
-    @Override
-    public String getGroup() {
-        return "Server/Private Events";
-    }
-
-}

src/com/dmdirc/actions/package-info.java

@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.
- */
-
-/**
- * 'Actions' provide a way for users to execute commands in response to certain events.
- *
- * <h2>Action types and meta-types</h2>
- *
- * Actions are executed in response to events in the client. Each event has a corresponding
- * {@link com.dmdirc.interfaces.actions.ActionType}, which has both a user-friendly name and an
- * internal name, as well as a meta-type which describes the arguments it takes.
- *
- * <p>
- * For example, when a message on a channel is received, the client looks for actions that respond
- * to the {@link com.dmdirc.actions.CoreActionType#CHANNEL_MESSAGE} action type. The channel message
- * type has a meta-type of
- * {@link com.dmdirc.actions.metatypes.ChannelEvents#CHANNEL_SOURCED_EVENT_WITH_ARG} which says that
- * the event will come with three arguments: a channel, a user, and a message. It also defines the
- * types of those arguments ({@link com.dmdirc.Channel},
- * {@link com.dmdirc.parser.interfaces.ChannelClientInfo}, and {@link java.lang.String}
- * respectively).
- *
- * <h2>Conditions</h2>
- *
- * Before an action is executed, its 'conditions' are checked. These are a simple collection of
- * rules concerning the state of the client, or the event's arguments. There are two types of
- * condition: component-based and string-based.
- *
- * <p>
- * Component-based conditions start off with one of the action's arguments, and then apply one or
- * more components to it to get some useful property. Components all implement
- * {@link com.dmdirc.interfaces.actions.ActionComponent} and essentially transform one object into
- * another, somehow. A component may take a {@link com.dmdirc.Channel} object and return that
- * channel's name as a string, or could take a string and return the length of it as an integer
- * (these components are implemented in {@link com.dmdirc.actions.CoreActionComponent#CHANNEL_NAME}
- * and {@link com.dmdirc.actions.CoreActionComponent#STRING_LENGTH}).
- *
- * <p>
- * A component based action could be as simple as "the message's content", or as complicated as "the
- * channel's server's network name's length". These chains of components are handled by an
- * {@link ActionComponentChain}.
- *
- * <p>
- * String-based conditions simply start off with a plain string, which is subject to substitution as
- * described below.
- *
- * <p>
- * Action conditions also specify a comparison. These define various methods of comparing objects,
- * such as checking two strings are equal
- * ({@link com.dmdirc.actions.CoreActionComparison#STRING_EQUALS}) or that an integer is greater
- * than a pre-defined value ({@link com.dmdirc.actions.CoreActionComparison#INT_GREATER}). All
- * comparisons implement {@link com.dmdirc.interfaces.actions.ActionComparison}. The second argument
- * is always a string provided by the user.
- *
- * <p>
- * Finally, if more than one condition is present the user can decide how they are matched. The two
- * most common and straight-forward options are a conjunction (where all the conditions must be
- * true) and a disjunction (where one of the conditions must be true). Users can also specify their
- * own, more complicated, rules such as "condition 1 AND (condition 2 OR condition 3)". These are
- * all expressed as a {@link ConditionTree}.
- *
- * <h2>Commands and substitutions</h2>
- *
- * When an action is triggered and its conditions are satisfied, it will execute a set of user
- * specified commands. These are executed on the relevant
- * {@link com.dmdirc.commandparser.parsers.CommandParser}, so are interpreted as though the user
- * typed them in the window where the event occurred. For example if in response to a channel
- * message the user had entered the command {@code /part}, then the client would part the channel
- * where the message was received.
- *
- * <p>
- * Commands and condition arguments are subject to action substitutions. This allows users to
- * include various dynamic properties in their responses or conditions. Substitutions are prefixed
- * with a {@code $} character, and come in several varieties:
- *
- * <ul>
- * <li>Configuration keys. Any setting in the 'actions' domain with the key 'key' can be substituted
- * using {@code $key}.</li>
- * <li>Words. Events that include a message allow substitution of individual words in the form
- * {@code $n} or ranges in the form {@code $n-} or {@code $n-m}, for some indices n and m.</li>
- * <li>Argument components. Any argument that is part of the action may be substituted in using the
- * format {@code ${n.component}}, where 'n' is the index of the argument and 'component' is the name
- * of the component to apply to it. Multiple components may be chained together:
- * {@code ${n.component1.component2}}.</li>
- * <li>Connection components. For convenience, any event that is triggered within the context of a
- * connection allows a shorthand form for connection-based substitutions. This is the same as an
- * argument-based substitution, but without the argument number. The substituter locates an
- * appropriate argument it can obtain a {@link com.dmdirc.interfaces.Connection} from and applies
- * the component to the relevant connection directly.</li>
- * </ul>
- */
-package com.dmdirc.actions;

src/com/dmdirc/actions/validators/ActionNameValidator.java

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.validators;
-
-import com.dmdirc.actions.Action;
-import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.util.validators.ValidationResponse;
-import com.dmdirc.util.validators.Validator;
-
-import java.util.List;
-
-/**
- * Validates action names.
- *
- * @since 0.6.3
- */
-public class ActionNameValidator implements Validator<String> {
-
-    /** Failure reason for duplicates. */
-    private static final String FAILURE_EXISTS = "Name must not already exist.";
-    /** Associated action group. */
-    private final ActionGroup group;
-    /** Original name. */
-    private final String originalName;
-
-    /**
-     * Instantiates a new action name validator for an existing action.
-     *
-     * @param group        Associated action group
-     * @param originalName Existing action name
-     */
-    public ActionNameValidator(final ActionGroup group,
-            final String originalName) {
-        this.group = group;
-        this.originalName = originalName;
-    }
-
-    @Override
-    public ValidationResponse validate(final String object) {
-        final List<Action> actions = group.getActions();
-        for (Action action : actions) {
-            if (action.getName().equals(object) && !action.getName().equals(originalName)) {
-                return new ValidationResponse(FAILURE_EXISTS);
-            }
-        }
-        return new ValidationResponse();
-    }
-
-}

src/com/dmdirc/actions/validators/ConditionRuleValidator.java

@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.validators;
-
-import com.dmdirc.actions.ConditionTree;
-import com.dmdirc.util.validators.ValidationResponse;
-import com.dmdirc.util.validators.Validator;
-
-/**
- * Validates a condition tree.
- */
-public class ConditionRuleValidator implements Validator<String> {
-
-    /** The number of arguments to the tree. */
-    private int args;
-
-    /**
-     * Creates a new ConditionRuleValidator.
-     *
-     * @param args The number of arguments allowed in the ConditionTree (i.e., the number of
-     *             ActionConditions)
-     */
-    public ConditionRuleValidator(final int args) {
-        this.args = args;
-    }
-
-    /**
-     * Updates the number of arguments used to validate the condition tree.
-     *
-     * @param args New number of arguments
-     */
-    public void setArgs(final int args) {
-        this.args = args;
-    }
-
-    @Override
-    public ValidationResponse validate(final String object) {
-        final ConditionTree tree = ConditionTree.parseString(object);
-
-        if (tree == null) {
-            return new ValidationResponse("Invalid rule.");
-        } else if (tree.getMaximumArgument() >= args) {
-            return new ValidationResponse("Condition "
-                    + tree.getMaximumArgument() + " does not exist");
-        } else {
-            return new ValidationResponse();
-        }
-    }
-
-}

src/com/dmdirc/actions/wrappers/PerformType.java

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.wrappers;
-
-/**
- * Describes the type of perform.
- *
- * @since 0.6.4
- */
-public enum PerformType {
-
-    /** A perform targeting a server. */
-    SERVER("Server"),
-    /** A perform targeting a network. */
-    NETWORK("Network");
-    /** Friendly name. */
-    private final String friendlyName;
-
-    /**
-     * Instantiates a new perform type.
-     *
-     * @param name Friendly name for the perform type
-     */
-    PerformType(final String name) {
-        friendlyName = name;
-    }
-
-    @Override
-    public String toString() {
-        return friendlyName;
-    }
-
-}

src/com/dmdirc/actions/wrappers/PerformWrapper.java

@@ -1,342 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.wrappers;
-
-import com.dmdirc.actions.Action;
-import com.dmdirc.actions.ActionComponentChain;
-import com.dmdirc.actions.ActionCondition;
-import com.dmdirc.actions.ActionFactory;
-import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.ConditionTree;
-import com.dmdirc.actions.CoreActionComparison;
-import com.dmdirc.actions.CoreActionComponent;
-import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.commandparser.auto.AutoCommand;
-import com.dmdirc.commandparser.auto.AutoCommandManager;
-import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.actions.ActionComponent;
-import com.dmdirc.interfaces.actions.ActionType;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-/**
- * An action wrapper for performs.
- *
- * @deprecated Use {@link AutoCommandManager}
- */
-@Singleton
-@Deprecated
-public class PerformWrapper extends ActionGroup {
-
-    /** The component name for per-profile perform conditions. */
-    private static final String PP_COMP_NAME = "SERVER_PROFILE.IDENTITY_NAME";
-    /** Factory to use for actions. */
-    private final ActionFactory actionFactory;
-    /** Action manager. */
-    private final ActionManager actionManager;
-
-    /**
-     * Creates a new instance of PerformWrapper.
-     *
-     * @param actionFactory Factory to use to create actions.
-     */
-    @Inject
-    public PerformWrapper(final ActionManager actionManager, final ActionFactory actionFactory) {
-        super(actionManager, "performs");
-        this.actionManager = actionManager;
-        this.actionFactory = actionFactory;
-    }
-
-    /**
-     * Sets the perform for the specified target of the specified type. If the specified perform is
-     * empty - that is, any non-null elements are empty Strings - then the perform is removed. If a
-     * profile is specified, the perform will only be executed for that profile.
-     *
-     * @param perform The perform to be set
-     * @param content The new content of that perform
-     *
-     * @since 0.6.4
-     */
-    public void setPerform(final PerformDescription perform, final String... content) {
-        synchronized (this) {
-            Action action = getAction(perform.getType() == PerformType.NETWORK
-                    ? CoreActionComponent.SERVER_NETWORK : CoreActionComponent.SERVER_NAME,
-                    perform.getTarget(), perform.getProfile());
-
-            final boolean empty = isEmpty(content);
-
-            if (action == null && !empty) {
-                // They want to set a perform but we don't have an action
-                action = createAction(
-                        perform.getType() == PerformType.SERVER ? perform.getTarget() : "",
-                        perform.getType() == PerformType.NETWORK ? perform.getTarget() : "",
-                        perform.getProfile());
-                action.setResponse(content);
-                action.save();
-            }
-
-            if (action != null) {
-                if (empty) {
-                    // They want to clear the perform but we have an action
-                    deleteAction(action);
-                } else {
-                    // They want to set a perform and we have an action
-                    action.setResponse(content);
-                    action.save();
-                }
-            }
-        }
-    }
-
-    /**
-     * Retrieves the perform for the relevant target. If no such perform exists, a zero-length array
-     * is returned.
-     *
-     * @param perform The perform to be retrieved
-     *
-     * @return The corresponding perform, or a zero-length array if none set
-     *
-     * @since 0.6.4
-     */
-    public String[] getPerform(final PerformDescription perform) {
-        final Action action = getAction(perform.getType() == PerformType.NETWORK
-                ? CoreActionComponent.SERVER_NETWORK : CoreActionComponent.SERVER_NAME,
-                perform.getTarget(), perform.getProfile());
-
-        if (action == null || action.getResponse() == null) {
-            return new String[0];
-        } else {
-            return action.getResponse();
-        }
-    }
-
-    /**
-     * Determines if the specified perform is "empty". An empty perform is one that does not contain
-     * any non-empty Strings.
-     *
-     * @param perform The perform to test
-     *
-     * @return True if the perform is empty, false otherwise
-     *
-     * @since 0.6.4
-     */
-    private static boolean isEmpty(final String... perform) {
-        for (String part : perform) {
-            if (part != null && !part.isEmpty()) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Creates a new, empty, perform wrapper for the specified server or network. Note that both
-     * server and network must be specified, and exactly one of them must be empty.
-     *
-     * @param server  The server to create the action for
-     * @param network The network to create the action for
-     * @param profile The profile the action is for (or null if "global")
-     *
-     * @since 0.6.3
-     * @return The new perform wrapper action
-     */
-    private Action createAction(final String server, final String network,
-            final String profile) {
-        final List<ActionCondition> conditions = new ArrayList<>();
-        final CoreActionComponent component = server.isEmpty() ? CoreActionComponent.SERVER_NETWORK
-                : CoreActionComponent.SERVER_NAME;
-
-        conditions.add(new ActionCondition(0, component,
-                CoreActionComparison.STRING_EQUALS, server + network));
-
-        if (profile != null) {
-            conditions.add(new ActionCondition(0,
-                    new ActionComponentChain(Connection.class, PP_COMP_NAME, actionManager),
-                    CoreActionComparison.STRING_EQUALS, profile));
-        }
-
-        return actionFactory.getAction(getName(), server + network
-                + (profile == null ? "" : " - " + profile),
-                new ActionType[]{CoreActionType.SERVER_CONNECTED},
-                new String[0], conditions,
-                ConditionTree.createConjunction(conditions.size()), null);
-    }
-
-    /**
-     * Retrieve an action with a condition that checks the specified component, and matches it
-     * against the specified target.
-     *
-     * @param component The action component to look for
-     * @param target    The string the component is matched against
-     * @param profile   The name of the profile that the action must target, or null for a
-     *                  non-profile specific action
-     *
-     * @since 0.6.3
-     * @return The matching action if one exists, or null
-     */
-    private Action getAction(final ActionComponent component, final String target,
-            final String profile) {
-        for (Action action : this) {
-            int matches = profile == null ? 1 : 2;
-
-            for (ActionCondition condition : action.getConditions()) {
-                if (condition.getComponent() == component
-                        && condition.getTarget().equalsIgnoreCase(target)) {
-                    matches--;
-                } else if (profile != null
-                        && PP_COMP_NAME.equals(condition.getComponent().toString())
-                        && condition.getTarget().equalsIgnoreCase(profile)) {
-                    matches--;
-                }
-            }
-
-            if (matches == 0) {
-                return action;
-            }
-        }
-
-        return null;
-    }
-
-    @Override
-    public boolean isDelible() {
-        return false;
-    }
-
-    @Override
-    public String getDescription() {
-        return "Performs allow you to automatically execute commands when"
-                + " you connect to a specific server or network. You can edit"
-                + " the perform for the current server or network in the "
-                + "\"Server Settings\" dialog, which can be accessed through "
-                + "the Settings menu.";
-    }
-
-    /**
-     * Describes one specific perform.
-     *
-     * @since 0.6.4
-     * @deprecated See {@link AutoCommand}
-     */
-    @Deprecated
-    public static class PerformDescription {
-
-        /** The type of the perform being described. */
-        private final PerformType type;
-        /** The target of the perform. */
-        private final String target;
-        /** The profile (if any) of the perform. */
-        private final String profile;
-
-        /**
-         * Creates a new perform description with the specified arguments.
-         *
-         * @param type    The type of the perform in question
-         * @param target  The target of the perform
-         * @param profile The profile of the perform (or null)
-         */
-        public PerformDescription(final PerformType type, final String target,
-                final String profile) {
-            this.type = type;
-            this.target = target;
-            this.profile = profile;
-
-            if (target == null) {
-                throw new NullPointerException("Target may not be null");
-            }
-        }
-
-        /**
-         * Creates a new perform description with the specified arguments.
-         *
-         * @param type   The type of the perform in question
-         * @param target The target of the perform
-         */
-        public PerformDescription(final PerformType type, final String target) {
-            this.type = type;
-            this.target = target;
-            this.profile = null;
-
-            if (target == null) {
-                throw new NullPointerException("Target may not be null");
-            }
-        }
-
-        /**
-         * Retrieves the profile of this perform.
-         *
-         * @return This perform's profile
-         */
-        public String getProfile() {
-            return profile;
-        }
-
-        /**
-         * Retrieves the target of this perform.
-         *
-         * @return This perform's target
-         */
-        public String getTarget() {
-            return target;
-        }
-
-        /**
-         * Retrieves the type of this perform.
-         *
-         * @return This perform's type
-         */
-        public PerformType getType() {
-            return type;
-        }
-
-        @Override
-        public boolean equals(final Object obj) {
-            if (obj == null || getClass() != obj.getClass()) {
-                return false;
-            }
-
-            final PerformDescription other = (PerformDescription) obj;
-
-            return !(type != other.type || !target.equals(other.target)) &&
-                    (profile == null ? other.profile == null : profile.equals(other.profile));
-
-        }
-
-        @Override
-        public int hashCode() {
-            int hash = 7;
-            hash = 89 * hash + (type != null ? type.hashCode() : 0);
-            hash = 89 * hash + target.hashCode();
-            hash = 89 * hash + (profile != null ? profile.hashCode() : 0);
-            return hash;
-        }
-
-    }
-
-}

src/com/dmdirc/actions/wrappers/package-info.java

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.
- */
-
-/**
- * Action wrappers.
- */
-package com.dmdirc.actions.wrappers;

src/com/dmdirc/commandparser/commands/CommandModule.java

@@ -43,7 +43,6 @@ import com.dmdirc.commandparser.commands.global.Ifplugin;
 import com.dmdirc.commandparser.commands.global.LoadPlugin;
 import com.dmdirc.commandparser.commands.global.NewServer;
 import com.dmdirc.commandparser.commands.global.OpenWindow;
-import com.dmdirc.commandparser.commands.global.ReloadActions;
 import com.dmdirc.commandparser.commands.global.ReloadIdentities;
 import com.dmdirc.commandparser.commands.global.ReloadPlugin;
 import com.dmdirc.commandparser.commands.global.SaveConfig;
@@ -529,18 +528,6 @@ public class CommandModule {
         return new SimpleCommandDetails(command, OpenWindow.INFO);
     }
 
-    /**
-     * Provides the /reloadactions command.
-     *
-     * @param command The instantiated command.
-     *
-     * @return The command's details.
-     */
-    @Provides(type = Provides.Type.SET)
-    public CommandDetails getCommand(final ReloadActions command) {
-        return new SimpleCommandDetails(command, ReloadActions.INFO);
-    }
-
     /**
      * Provides the /reloadidentities command.
      *

src/com/dmdirc/commandparser/commands/global/ReloadActions.java

@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.commandparser.commands.global;
-
-import com.dmdirc.FrameContainer;
-import com.dmdirc.commandparser.BaseCommandInfo;
-import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.commands.Command;
-import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.ui.input.AdditionalTabTargets;
-
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-
-/**
- * Allows the user to reload actions.
- */
-public final class ReloadActions extends Command implements IntelligentCommand {
-
-    /** A command info object for this command. */
-    public static final CommandInfo INFO = new BaseCommandInfo("reloadactions",
-            "reloadactions - reloads actions from disk",
-            CommandType.TYPE_GLOBAL);
-    /** The action controller to use to reload actions. */
-    private final ActionController actionController;
-
-    /**
-     * Creates a new instance of this command.
-     *
-     * @param controller The controller to use for command information.
-     * @param actionController The action controller to use to reload actions.
-     */
-    @Inject
-    public ReloadActions(
-            final CommandController controller,
-            final ActionController actionController) {
-        super(controller);
-        this.actionController = actionController;
-    }
-
-    @Override
-    public void execute(@Nonnull final FrameContainer origin,
-            final CommandArguments args, final CommandContext context) {
-        actionController.loadUserActions();
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Actions reloaded.");
-    }
-
-    @Override
-    public AdditionalTabTargets getSuggestions(final int arg,
-            final IntelligentCommandContext context) {
-        return new AdditionalTabTargets().excludeAll();
-    }
-
-}

src/com/dmdirc/events/ActionCreatedEvent.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.events;
-
-import com.dmdirc.actions.Action;
-
-/**
- * Fired on the creation of an action.
- */
-public class ActionCreatedEvent extends ActionEvent {
-
-    public ActionCreatedEvent(final Action action) {
-        super(action);
-    }
-
-}

src/com/dmdirc/events/ActionDeletedEvent.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.events;
-
-import com.dmdirc.actions.Action;
-import com.dmdirc.actions.ActionGroup;
-
-/**
- * Fired when an action is deleted.
- */
-public class ActionDeletedEvent extends ActionEvent {
-
-    private final ActionGroup group;
-
-    public ActionDeletedEvent(final ActionGroup group, final Action action) {
-        super(action);
-        this.group = group;
-    }
-
-    public ActionGroup getGroup() {
-        return group;
-    }
-
-    public String getName() {
-        return getAction().getName();
-    }
-}

src/com/dmdirc/events/ActionEvent.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.events;
-
-import com.dmdirc.actions.Action;
-
-/**
- * Base class for all action events.
- */
-public abstract class ActionEvent extends DMDircEvent {
-
-    private final Action action;
-
-    public ActionEvent(final Action action) {
-        this.action = action;
-    }
-
-    public Action getAction() {
-        return action;
-    }
-
-}

src/com/dmdirc/events/ActionUpdatedEvent.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.events;
-
-import com.dmdirc.actions.Action;
-
-/**
- * Fired when an action is updated.
- */
-public class ActionUpdatedEvent extends ActionEvent {
-
-    public ActionUpdatedEvent(final Action action) {
-        super(action);
-    }
-
-}

src/com/dmdirc/interfaces/ActionController.java

@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.interfaces;
-
-import com.dmdirc.Precondition;
-import com.dmdirc.actions.Action;
-import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.interfaces.actions.ActionComparison;
-import com.dmdirc.interfaces.actions.ActionComponent;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.util.collections.MapList;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Manages all known actions, action types, comparisons, components, etc, and facilitates loading
- * and triggering of actions.
- */
-public interface ActionController {
-
-    /**
-     * Registers an action with the manager.
-     *
-     * @param action The action to be registered
-     */
-    @Precondition("The specified action is not null")
-    void addAction(final Action action);
-
-    /**
-     * Registers the specified group of actions with the manager.
-     *
-     * @param group The group of actions to be registered
-     */
-    void addGroup(final ActionGroup group);
-
-    /**
-     * Renames the specified group.
-     *
-     * @param oldName The old name of the group
-     * @param newName The new name of the group
-     */
-    @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"})
-    void changeGroupName(final String oldName, final String newName);
-
-    /**
-     * Creates a new group with the specified name.
-     *
-     * @param group The group to be created
-     *
-     * @return The newly created group
-     */
-    @Precondition({"The specified group is non-null and not empty",
-            "The specified group is not an existing group"})
-    ActionGroup createGroup(final String group);
-
-    /**
-     * Removes the group with the specified name.
-     *
-     * @param group The group to be removed
-     */
-    @Precondition({"The specified group is non-null and not empty",
-            "The specified group is an existing group"})
-    void deleteGroup(final String group);
-
-    /**
-     * 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
-     */
-    @Precondition("The specified target is not null")
-    List<ActionComparison> findCompatibleComparisons(final Class<?> target);
-
-    /**
-     * 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
-     */
-    @Precondition("The specified target is not null")
-    List<ActionComponent> findCompatibleComponents(final Class<?> target);
-
-    /**
-     * 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
-     */
-    @Precondition("The specified type is not null")
-    List<ActionType> findCompatibleTypes(final ActionType type);
-
-    /**
-     * 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
-     */
-    @Precondition("The specified type is non-null and not empty")
-    ActionComparison getComparison(final String type);
-
-    /**
-     * 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
-     */
-    @Precondition("The specified type is non-null and not empty")
-    ActionComponent getComponent(final String type);
-
-    /**
-     * Returns a map of type groups to types.
-     *
-     * @return A map of type groups to types
-     */
-    MapList<String, ActionType> getGroupedTypes();
-
-    /**
-     * Returns a map of groups to action lists.
-     *
-     * @return a map of groups to action lists
-     */
-    Map<String, ActionGroup> getGroupsMap();
-
-    /**
-     * 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
-     */
-    ActionGroup getOrCreateGroup(final String name);
-
-    /**
-     * 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
-     */
-    ActionType getType(final String type);
-
-    /**
-     * Loads actions from the user's directory.
-     */
-    void loadUserActions();
-
-    /**
-     * Registers a set of action comparisons with the manager.
-     *
-     * @param comps An array of ActionComparisons to be registered
-     */
-    @Precondition("None of the specified ActionComparisons are null")
-    void registerComparisons(final ActionComparison[] comps);
-
-    /**
-     * Registers a set of action components with the manager.
-     *
-     * @param comps An array of ActionComponents to be registered
-     */
-    @Precondition("None of the specified ActionComponents are null")
-    void registerComponents(final ActionComponent[] comps);
-
-    /**
-     * 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
-     */
-    void registerSetting(final String name, final String value);
-
-    /**
-     * Registers a set of action types with the manager.
-     *
-     * @param newTypes An array of ActionTypes to be registered
-     */
-    @Precondition("None of the specified ActionTypes are null")
-    void registerTypes(final ActionType[] newTypes);
-
-    /**
-     * Unregisters an action with the manager.
-     *
-     * @param action The action to be unregistered
-     */
-    @Precondition("The specified action is not null")
-    void removeAction(final Action action);
-
-    /**
-     * Reregisters the specified action. Should be used when the action's triggers change.
-     *
-     * @param action The action to be reregistered
-     */
-    void reregisterAction(final Action action);
-
-    /**
-     * Saves all actions.
-     */
-    void saveAllActions();
-
-    /**
-     * 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.
-     */
-    @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"})
-    boolean triggerEvent(final ActionType type, final StringBuffer format, final Object... arguments);
-
-}

src/com/dmdirc/interfaces/actions/ActionComparison.java

@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.interfaces.actions;
-
-/**
- * Describes the methods that must be implemented by an action comparison. Action comparisons allow
- * the user to compare an action component to a string they entered.
- */
-public interface ActionComparison {
-
-    /**
-     * Tests the specified arguments against each other.
-     *
-     * @param arg1 The first argument
-     * @param arg2 The second argument
-     *
-     * @return True iff the comparison between the args succeeds, false otherwise
-     */
-    boolean test(final Object arg1, final Object arg2);
-
-    /**
-     * Returns the class that this comparison deals with.
-     *
-     * @return The Class that this comparison can compare
-     */
-    Class<?> appliesTo();
-
-    /**
-     * Returns a friendly name for this comparison.
-     *
-     * @return This comparison's friendly name
-     */
-    String getName();
-
-    /**
-     * Returns the internal name of this comparison.
-     *
-     * @since 0.6.4
-     * @return This comparison's internal name
-     */
-    String name();
-
-}

src/com/dmdirc/interfaces/actions/ActionComponent.java

@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.interfaces.actions;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The ActionComponent interface describes the methods that action components are required to
- * implement. Components are objects that allow the user to pull a specific piece of information
- * from a certain type of argument.
- */
-public interface ActionComponent {
-
-    /**
-     * An annotation which allows action components to specify options relating to their use. The
-     * annotation should be applied to the {@link #get(java.lang.Object)} method of implementing
-     * classes.
-     *
-     * @since 0.6.4
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    @interface ComponentOptions {
-
-        /**
-         * Whether or not the component requires a connected server.
-         *
-         * @return true if component requires a connected server
-         */
-        boolean requireConnected() default false;
-
-    }
-
-    /**
-     * Retrieves the component of the specified argument that this component represents.
-     *
-     * @param arg The object to retrieve the component from
-     *
-     * @return The relevant component of the object
-     */
-    Object get(Object arg);
-
-    /**
-     * Retrieves the type of class that this component applies to.
-     *
-     * @return The Class that this component can be applied to
-     */
-    Class<?> appliesTo();
-
-    /**
-     * Retrieves the type of this component.
-     *
-     * @return The Class of this component.
-     */
-    Class<?> getType();
-
-    /**
-     * Retrieves a friendly name for this component.
-     *
-     * @return This component's friendly name
-     */
-    String getName();
-
-    /**
-     * Retrieves the internal name of this action component.
-     *
-     * @since 0.6.4
-     * @return The internal name of this component
-     */
-    String name();
-
-}

src/com/dmdirc/interfaces/actions/ActionMetaType.java

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.interfaces.actions;
-
-/**
- * Encapsulates the methods that all action types are required to implement.
- */
-public interface ActionMetaType {
-
-    /**
-     * Retrieves the arity of this type.
-     *
-     * @return The arity of this action type
-     */
-    int getArity();
-
-    /**
-     * Retrieves the type of arguments that actions of this type should expect.
-     *
-     * @return The type of arguments expected
-     */
-    Class<?>[] getArgTypes();
-
-    /**
-     * Retrieves the names of the arguments that actions of this type should expect.
-     *
-     * @return The names of the expected arguments
-     */
-    String[] getArgNames();
-
-    /**
-     * Retrieves the name of a logical group for this meta-type to be put into.
-     *
-     * @return The meta-type's group name
-     */
-    String getGroup();
-
-}

src/com/dmdirc/interfaces/actions/ActionType.java

@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.interfaces.actions;
-
-/**
- * Encapsulates the methods that all actions are required to implement.
- */
-public interface ActionType {
-
-    /**
-     * Retrieves the type of this action.
-     *
-     * @return This action's type
-     */
-    ActionMetaType getType();
-
-    /**
-     * Retrieves this type's friendly name.
-     *
-     * @return The friendly name of this type
-     */
-    String getName();
-
-    /**
-     * Retrieves this type's internal name.
-     *
-     * @since 0.6.4
-     * @return The internal name of this type
-     */
-    String name();
-
-}

src/com/dmdirc/interfaces/ui/FirstRunWizard.java

@@ -28,9 +28,6 @@ public interface FirstRunWizard {
     /** Extracts the core plugins. */
     void extractPlugins();
 
-    /** Extracts the core actions. */
-    void extractActions();
-
     /** Displays the First run wizard. */
     void display();
 

src/com/dmdirc/plugins/PluginInjectorInitialiser.java

@@ -24,9 +24,6 @@ package com.dmdirc.plugins;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.actions.ActionFactory;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.ActionSubstitutorFactory;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.ConnectionManager;
@@ -49,8 +46,6 @@ import javax.inject.Inject;
  */
 public class PluginInjectorInitialiser {
 
-    private final ActionManager actionManager;
-    private final ActionFactory actionFactory;
     private final PluginManager pluginManager;
     private final IdentityController identityController;
     private final ConnectionManager connectionManager;
@@ -63,13 +58,11 @@ public class PluginInjectorInitialiser {
     private final CorePluginExtractor corePluginExtractor;
     private final URLBuilder urlBuilder;
     private final ColourManager colourManager;
-    private final ActionSubstitutorFactory actionSubstitutorFactory;
     private final DMDircMBassador eventBus;
     private final IconManager iconManager;
 
     @Inject
-    public PluginInjectorInitialiser(final ActionManager actionManager,
-            final ActionFactory actionFactory,
+    public PluginInjectorInitialiser(
             final PluginManager pluginManager,
             final IdentityController identityController,
             final ConnectionManager connectionManager,
@@ -82,11 +75,8 @@ public class PluginInjectorInitialiser {
             final CorePluginExtractor corePluginExtractor,
             final URLBuilder urlBuilder,
             @GlobalConfig final ColourManager colourManager,
-            final ActionSubstitutorFactory actionSubstitutorFactory,
             final DMDircMBassador eventBus,
             @GlobalConfig final IconManager iconManager) {
-        this.actionManager = actionManager;
-        this.actionFactory = actionFactory;
         this.pluginManager = pluginManager;
         this.identityController = identityController;
         this.connectionManager = connectionManager;
@@ -99,7 +89,6 @@ public class PluginInjectorInitialiser {
         this.corePluginExtractor = corePluginExtractor;
         this.urlBuilder = urlBuilder;
         this.colourManager = colourManager;
-        this.actionSubstitutorFactory = actionSubstitutorFactory;
         this.eventBus = eventBus;
         this.iconManager = iconManager;
     }
@@ -110,7 +99,6 @@ public class PluginInjectorInitialiser {
      * @param injector The injector to be initialised
      */
     public void initialise(final SimpleInjector injector) {
-        injector.addParameter(actionManager);
         injector.addParameter(PluginManager.class, pluginManager);
         injector.addParameter(identityController);
         injector.addParameter(ConnectionManager.class, connectionManager);
@@ -120,11 +108,9 @@ public class PluginInjectorInitialiser {
         injector.addParameter(PreferencesManager.class, preferencesManager);
         injector.addParameter(LifecycleController.class, lifecycleController);
         injector.addParameter(corePluginExtractor);
-        injector.addParameter(actionFactory);
         injector.addParameter(themeManager);
         injector.addParameter(urlBuilder);
         injector.addParameter(colourManager);
-        injector.addParameter(actionSubstitutorFactory);
         injector.addParameter(eventBus);
         injector.addParameter(iconManager);
     }

src/com/dmdirc/updater/components/ActionGroupComponent.java

@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.updater.components;
-
-import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.updater.UpdateComponent;
-import com.dmdirc.updater.Version;
-
-import java.io.IOException;
-import java.nio.file.Path;
-
-/**
- * Update component for action groups.
- */
-public class ActionGroupComponent implements UpdateComponent {
-
-    private final ActionManager actionManager;
-
-    public ActionGroupComponent(final ActionManager actionManager,
-            final ActionGroup group) {
-        this.actionManager = actionManager;
-        this.group = group;
-    }
-    /** The group that this component represents. */
-    private final ActionGroup group;
-
-    @Override
-    public String getName() {
-        return "addon-" + group.getComponent();
-    }
-
-    @Override
-    public String getFriendlyName() {
-        return "Action pack: " + group.getName();
-    }
-
-    @Override
-    public Version getVersion() {
-        return group.getVersion();
-    }
-
-    @Override
-    public String getFriendlyVersion() {
-        return String.valueOf(getVersion());
-    }
-
-    @Override
-    public boolean requiresRestart() {
-        return false;
-    }
-
-    @Override
-    public boolean requiresManualInstall() {
-        return false;
-    }
-
-    @Override
-    public String getManualInstructions(final Path path) {
-        return "";
-    }
-
-    @Override
-    public boolean doInstall(final Path path) throws IOException {
-        actionManager.installActionPack(path);
-        return false;
-    }
-
-}

test-res/com/dmdirc/actions/action1

@@ -1,30 +0,0 @@
-# This is a DMDirc configuration file.
-# Written on: Mon Jan 14 06:19:51 GMT 2008
-
-# This section indicates which sections below take key/value
-# pairs, rather than a simple list. It should be placed above
-# any sections that take key/values.
-keysections:
-  condition 0
-  condition 1
-
-triggers:
-  SERVER_AWAY
-
-response:
-  /away
-
-conditiontree:
-  (0&1)
-
-condition 0:
-  argument=1
-  component=STRING_LENGTH
-  target=0
-  comparison=INT_EQUALS
-
-condition 1:
-  argument=-1
-  starget=foo
-  target=bar
-  comparison=STRING_CONTAINS

test-res/com/dmdirc/actions/action_multisettings

@@ -1,29 +0,0 @@
-# This is a DMDirc configuration file.
-# Written on: Mon Jan 14 06:19:51 GMT 2008
-
-# This section indicates which sections below take key/value
-# pairs, rather than a simple list. It should be placed above
-# any sections that take key/values.
-keysections:
-  setting 0
-  setting 1
-
-triggers:
-  SERVER_AWAY
-
-response:
-  /away
-
-setting 0:
-  type=TEXT
-  setting=highlightregex
-  title=Highlight Regex
-  tooltip=Regex to use to detect a highlight
-  default=(?i).*(shane|dataforce|Q${SERVER_MYNICKNAME}E|(?<![#A-Z])DF).*
-
-setting 1:
-  type=TEXT
-  setting=highlightregex
-  title=Highlight Regex
-  tooltip=Regex to use to detect a highlight
-  default=(?i).*(shane|dataforce|Q${SERVER_MYNICKNAME}E|(?<![#A-Z])DF).*

test-res/com/dmdirc/actions/defaults/action1

@@ -1,30 +0,0 @@
-# This is a DMDirc configuration file.
-# Written on: Mon Jan 14 06:19:51 GMT 2008
-
-# This section indicates which sections below take key/value
-# pairs, rather than a simple list. It should be placed above
-# any sections that take key/values.
-keysections:
-  condition 0
-  condition 1
-
-triggers:
-  SERVER_AWAY
-
-response:
-  /away
-
-conditiontree:
-  (0&1)
-
-condition 0:
-  argument=1
-  component=STRING_LENGTH
-  target=0
-  comparison=INT_EQUALS
-
-condition 1:
-  argument=-1
-  starget=foo
-  target=bar
-  comparison=STRING_CONTAINS

test-res/com/dmdirc/actions/defaults/action2

@@ -1,24 +0,0 @@
-# This is a DMDirc configuration file.
-# Written on: Mon Jan 14 06:19:51 GMT 2008
-
-# This section indicates which sections below take key/value
-# pairs, rather than a simple list. It should be placed above
-# any sections that take key/values.
-keysections:
-  condition 0
-  condition 1
-
-triggers:
-  SERVER_AWAY
-
-response:
-  /away
-
-conditiontree:
-  (0)
-
-condition 0:
-  argument=1
-  component=STRING_LENGTH
-  target=0
-  comparison=INT_EQUALS

test/com/dmdirc/actions/ActionComparisonNamesTest.java

@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.interfaces.actions.ActionComparison;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.*;
-
-@RunWith(Parameterized.class)
-public class ActionComparisonNamesTest {
-
-    private final ActionComparison comparison;
-
-    public ActionComparisonNamesTest(final ActionComparison comparison) {
-        this.comparison = comparison;
-    }
-
-    @Test
-    public void testName() {
-        assertNotNull(comparison.getName());
-        assertFalse(comparison.getName().isEmpty());
-        assertTrue(comparison.getName().matches(".*?s(n't)?( .*?)?"));
-    }
-
-    @Parameterized.Parameters
-    public static List<Object[]> data() {
-        final List<Object[]> res = new LinkedList<>();
-
-        for (ActionComparison comp : CoreActionComparison.values()) {
-            res.add(new Object[]{comp});
-        }
-
-        return res;
-    }
-
-}

test/com/dmdirc/actions/ActionComponentChainTest.java

@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.Server;
-import com.dmdirc.interfaces.actions.ActionComponent;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ActionComponentChainTest {
-
-    @Mock private ActionManager actionManager;
-
-    @Before
-    public void setUp() throws Exception {
-        when(actionManager.getComponent("SERVER_NAME"))
-                .thenReturn(CoreActionComponent.SERVER_NAME);
-        when(actionManager.getComponent("SERVER_NETWORK"))
-                .thenReturn(CoreActionComponent.SERVER_NETWORK);
-        when(actionManager.getComponent("STRING_LENGTH"))
-                .thenReturn(CoreActionComponent.STRING_LENGTH);
-        when(actionManager.getComponent("STRING_STRING"))
-                .thenReturn(CoreActionComponent.STRING_STRING);
-        when(actionManager.getComponent("USER_MODES"))
-                .thenReturn(CoreActionComponent.USER_MODES);
-
-        // TODO: Testing for this behaviour here is odd - ActionComponentChain
-        //       should probably do its own validation and throw a more
-        //       appropriate exception.
-        when(actionManager.getComponent(""))
-                .thenThrow(new AssertionError());
-    }
-
-    @Test
-    public void testSingle() {
-        final ActionComponentChain chain = new ActionComponentChain(String.class, "STRING_STRING", actionManager);
-        assertEquals("foo bar baz", chain.get("foo bar baz"));
-        assertEquals("STRING_STRING", chain.toString());
-    }
-
-    @Test
-    public void testDouble() {
-        final ActionComponentChain chain = new ActionComponentChain(String.class,
-                "STRING_STRING.STRING_STRING", actionManager);
-        assertEquals("foo bar baz", chain.get("foo bar baz"));
-        assertEquals("STRING_STRING.STRING_STRING", chain.toString());
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void testInvalidName() {
-        new ActionComponentChain(String.class, "STRONG_STRING", actionManager);
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void testInvalidType() {
-        new ActionComponentChain(String.class, "USER_MODES.STRING_STRING", actionManager);
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void testInvalidLink() {
-        new ActionComponentChain(String.class, "STRING_STRING.USER_MODES", actionManager);
-    }
-
-    @Test
-    public void testAppliesTo() {
-        final ActionComponent chain = new ActionComponentChain(String.class,
-                "STRING_STRING.STRING_STRING.STRING_LENGTH", actionManager);
-        assertSame(String.class, chain.appliesTo());
-    }
-
-    @Test
-    public void testGetType() {
-        final ActionComponent chain = new ActionComponentChain(String.class,
-                "STRING_STRING.STRING_STRING.STRING_LENGTH", actionManager);
-        assertSame(Integer.class, chain.getType());
-    }
-
-    @Test
-    public void testGetName() {
-        final ActionComponent chain = new ActionComponentChain(String.class,
-                "STRING_STRING.STRING_STRING.STRING_LENGTH", actionManager);
-
-        assertTrue(chain.getName().contains(CoreActionComponent.STRING_STRING.getName()));
-        assertTrue(chain.getName().contains(CoreActionComponent.STRING_LENGTH.getName()));
-    }
-
-    @Test(expected=AssertionError.class)
-    public void testEmptyAppliesTo() {
-        final ActionComponent chain = new ActionComponentChain(String.class, "", actionManager);
-        chain.appliesTo();
-    }
-
-    @Test(expected=AssertionError.class)
-    public void testEmptyGetType() {
-        final ActionComponent chain = new ActionComponentChain(String.class, "", actionManager);
-        chain.getType();
-    }
-
-    @Test(expected=AssertionError.class)
-    public void testEmptyGetName() {
-        final ActionComponent chain = new ActionComponentChain(String.class, "", actionManager);
-        chain.getName();
-    }
-
-    @SuppressWarnings("ResultOfMethodCallIgnored")
-    @Test(expected=AssertionError.class)
-    public void testEmptyToString() {
-        final ActionComponentChain chain = new ActionComponentChain(String.class, "", actionManager);
-        chain.toString();
-    }
-
-    @Test
-    public void testRequiresConnection1() {
-        final ActionComponentChain chain = new ActionComponentChain(Server.class,
-                "SERVER_NETWORK", actionManager);
-        assertTrue(chain.requiresConnection());
-    }
-
-    @Test
-    public void testRequiresConnection2() {
-        final ActionComponentChain chain = new ActionComponentChain(Server.class,
-                "SERVER_NETWORK.STRING_LENGTH", actionManager);
-        assertTrue(chain.requiresConnection());
-    }
-
-    @Test
-    public void testRequiresConnection3() {
-        final ActionComponentChain chain = new ActionComponentChain(Server.class,
-                "SERVER_NAME.STRING_LENGTH", actionManager);
-        assertFalse(chain.requiresConnection());
-    }
-
-}

test/com/dmdirc/actions/ActionConditionTest.java

@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static org.junit.Assert.*;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ActionConditionTest {
-
-    @Mock private ActionController actionController;
-    @Mock private CommandController commandController;
-    @Mock private AggregateConfigProvider configProvider;
-
-    @Test
-    public void testConstructor1() {
-        final ActionCondition ac = new ActionCondition(1, CoreActionComponent.STRING_STRING,
-            CoreActionComparison.STRING_STARTSWITH, "foo");
-        assertEquals(1, ac.getArg());
-        assertEquals(CoreActionComponent.STRING_STRING, ac.getComponent());
-        assertEquals(CoreActionComparison.STRING_STARTSWITH, ac.getComparison());
-        assertEquals("foo", ac.getTarget());
-    }
-
-    @Test
-    public void testConstructor2() {
-        final ActionCondition ac = new ActionCondition("foobarbaz",
-            CoreActionComparison.STRING_STARTSWITH, "foo");
-        assertEquals("foobarbaz", ac.getStarget());
-        assertEquals(CoreActionComparison.STRING_STARTSWITH, ac.getComparison());
-        assertEquals("foo", ac.getTarget());
-    }
-
-    @Test
-    public void testTest1() {
-        final ActionCondition ac = new ActionCondition(1, CoreActionComponent.STRING_STRING,
-            CoreActionComparison.STRING_STARTSWITH, "foo");
-        assertTrue(ac.test(new ActionSubstitutor(actionController, commandController,
-                configProvider, CoreActionType.CLIENT_USER_INPUT), null, "foo bar"));
-    }
-
-    @Test
-    public void testTest2() {
-        final ActionCondition ac = new ActionCondition("foobarbaz",
-            CoreActionComparison.STRING_STARTSWITH, "foo");
-        assertTrue(ac.test(new ActionSubstitutor(actionController, commandController,
-                configProvider, CoreActionType.CLIENT_CLOSED)));
-    }
-
-    @Test
-    public void testSetters() {
-        final ActionCondition ac = new ActionCondition("foobarbaz",
-            CoreActionComparison.STRING_STARTSWITH, "foo");
-        assertEquals("foo", ac.getTarget());
-        ac.setTarget("bar");
-        assertEquals("bar", ac.getTarget());
-
-        assertEquals("foobarbaz", ac.getStarget());
-        ac.setStarget("bar");
-        assertEquals("bar", ac.getStarget());
-
-        assertEquals(CoreActionComparison.STRING_STARTSWITH, ac.getComparison());
-        ac.setComparison(CoreActionComparison.STRING_EQUALS);
-        assertEquals(CoreActionComparison.STRING_EQUALS, ac.getComparison());
-
-        ac.setComponent(CoreActionComponent.STRING_STRING);
-        assertEquals(CoreActionComponent.STRING_STRING, ac.getComponent());
-
-        ac.setArg(0);
-        assertEquals(0, ac.getArg());
-    }
-
-    @Test
-    public void testToString() {
-        final ActionCondition ac1 = new ActionCondition("foobarbaz",
-            CoreActionComparison.STRING_STARTSWITH, "foo");
-        assertTrue(ac1.toString().contains("foo"));
-        assertTrue(ac1.toString().contains("foobarbaz"));
-        assertTrue(ac1.toString().contains(CoreActionComparison.STRING_STARTSWITH.toString()));
-    }
-
-    @Test
-    public void testEquals() {
-        final ActionCondition ac1 = new ActionCondition("foobarbaz",
-            CoreActionComparison.STRING_STARTSWITH, "foo");
-        final ActionCondition ac2 = new ActionCondition("foobarbaz",
-            CoreActionComparison.STRING_STARTSWITH, "foo");
-
-        assertTrue(ac1.equals(ac2));
-        assertTrue(ac2.equals(ac1));
-        assertFalse(ac1.equals(null)); // NOPMD
-        assertFalse(ac1.equals("foo"));
-        assertEquals(ac1.hashCode(), ac2.hashCode());
-
-        ac2.setStarget("bar");
-        assertFalse(ac2.equals(ac1));
-        assertFalse(ac1.equals(ac2));
-
-        ac2.setStarget("foobarbaz");
-        ac2.setComponent(CoreActionComponent.STRING_STRING);
-        ac2.setArg(1);
-        assertFalse(ac2.equals(ac1));
-        assertFalse(ac1.equals(ac2));
-
-        ac1.setComponent(CoreActionComponent.STRING_STRING);
-        ac1.setArg(1);
-        assertTrue(ac1.equals(ac2));
-        assertTrue(ac2.equals(ac1));
-        assertEquals(ac1.hashCode(), ac2.hashCode());
-
-        ac1.setComponent(CoreActionComponent.STRING_LENGTH);
-        assertFalse(ac2.equals(ac1));
-        assertFalse(ac1.equals(ac2));
-
-        ac1.setComponent(CoreActionComponent.STRING_STRING);
-        ac1.setComparison(CoreActionComparison.STRING_NCONTAINS);
-        assertFalse(ac2.equals(ac1));
-        assertFalse(ac1.equals(ac2));
-
-        ac1.setComparison(CoreActionComparison.STRING_STARTSWITH);
-        ac1.setTarget("flub");
-        assertFalse(ac2.equals(ac1));
-        assertFalse(ac1.equals(ac2));
-    }
-
-}

test/com/dmdirc/actions/ActionGroupTest.java

@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.updater.Version;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ActionGroupTest {
-
-    @Mock private ActionManager actionManager;
-
-    @Test
-    public void testGetAuthor() {
-        final ActionGroup instance = new ActionGroup(actionManager, "moo");
-        instance.setAuthor("foo");
-
-        final String expResult = "foo";
-        final String result = instance.getAuthor();
-        assertEquals(expResult, result);
-    }
-
-    @Test
-    public void testGetDescription() {
-        final ActionGroup instance = new ActionGroup(actionManager, "bar");
-        instance.setDescription("Tra-la-la-la-la");
-
-        final String expResult = "Tra-la-la-la-la";
-        final String result = instance.getDescription();
-        assertEquals(expResult, result);
-    }
-
-    @Test
-    public void testGetName() {
-        final ActionGroup instance = new ActionGroup(actionManager, "foobar");
-
-        final String expResult = "foobar";
-        final String result = instance.getName();
-        assertEquals(expResult, result);
-    }
-
-    @Test
-    public void testGetSettings() {
-        final ActionGroup instance = new ActionGroup(actionManager, "foo");
-
-        assertTrue(instance.getSettings().isEmpty());
-
-        instance.getSettings().put("", mock(PreferencesSetting.class));
-        assertEquals(1, instance.getSettings().size());
-    }
-
-    @Test
-    public void testGetVersion() {
-        final ActionGroup instance = new ActionGroup(actionManager, "vtest");
-        instance.setVersion(new Version(73));
-
-        final Version expResult = new Version(73);
-        final Version result = instance.getVersion();
-        assertEquals(expResult, result);
-    }
-
-    @Test
-    public void testGetComponent() {
-        final ActionGroup instance = new ActionGroup(actionManager, "zzz");
-        instance.setComponent(69);
-
-        final int expResult = 69;
-        final int result = instance.getComponent();
-        assertEquals(expResult, result);
-    }
-
-    @Test
-    public void testClear() {
-        final ActionGroup instance = new ActionGroup(actionManager, "zzz");
-        instance.add(null);
-        assertTrue(instance.iterator().hasNext());
-        instance.clear();
-        assertFalse(instance.iterator().hasNext());
-    }
-
-    @Test
-    public void testRemove() {
-        final ActionGroup instance = new ActionGroup(actionManager, "zzz");
-        instance.add(null);
-        assertTrue(instance.iterator().hasNext());
-        instance.remove(null);
-        assertFalse(instance.iterator().hasNext());
-    }
-
-    @Test
-    public void testIsDelible() {
-        assertTrue(new ActionGroup(actionManager, "foo").isDelible());
-    }
-
-}

test/com/dmdirc/actions/ActionModelTest.java

@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.GlobalWindow;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.inject.Provider;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ActionModelTest {
-
-    @Mock private Provider<GlobalWindow> gwProvider;
-    @Mock private ActionSubstitutorFactory substitutorFactory;
-    @Mock private ActionController actionController;
-    @Mock private CommandController commandController;
-    @Mock private AggregateConfigProvider configProvider;
-
-    @Test
-    public void testConditions() {
-        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
-                "group", "name");
-
-        assertTrue("ActionModel must start with no conditions",
-                model.getConditions().isEmpty());
-
-        final List<ActionCondition> conds = new ArrayList<>();
-
-        model.setConditions(conds);
-
-        assertEquals("setConditions must set conditions",
-                conds, model.getConditions());
-    }
-
-    @Test
-    public void testTriggers() {
-        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
-                "group", "name");
-
-        assertNull("ActionModel must start with null triggers",
-                model.getTriggers());
-
-        final ActionType[] triggers = {CoreActionType.CHANNEL_ACTION};
-
-        model.setTriggers(triggers);
-
-        assertEquals("setTriggers must set triggers",
-                Arrays.asList(triggers), Arrays.asList(model.getTriggers()));
-    }
-
-    @Test
-    public void testNewFormat() {
-        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
-                "group", "name");
-
-        assertNull("ActionModel must start with null format",
-                model.getNewFormat());
-
-        model.setNewFormat("");
-
-        assertEquals("setNewFormat must set format (empty string)",
-                "", model.getNewFormat());
-
-        model.setNewFormat("newformat");
-
-        assertEquals("setNewFormat must set format (non-empty string)",
-                "newformat", model.getNewFormat());
-    }
-
-    @Test
-    public void testResponse() {
-        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
-                "group", "name");
-
-        assertNull("ActionModel must start with null response",
-                model.getResponse());
-
-        final String[] newResponse = {"a", "b", "c"};
-
-        model.setResponse(newResponse);
-
-        assertEquals("setResponse must set response",
-                Arrays.asList(newResponse), Arrays.asList(model.getResponse()));
-    }
-
-    @Test
-    public void testGroup() {
-        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
-                "group", "name");
-
-        assertEquals("ActionModel constructor must set group",
-                "group", model.getGroup());
-
-        model.setGroup("group2");
-
-        assertEquals("setGroup must set group",
-                "group2", model.getGroup());
-    }
-
-    @Test
-    public void testName() {
-        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
-                "group", "name");
-
-        assertEquals("ActionModel constructor must set name",
-                "name", model.getName());
-
-        model.setName("name2");
-
-        assertEquals("setName must set name",
-                "name2", model.getName());
-    }
-
-    @Test
-    public void testTest() {
-        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
-                "group", "name",
-                new ActionType[]{CoreActionType.CHANNEL_ACTION},
-                new String[0], Arrays.asList(new ActionCondition(2, CoreActionComponent.STRING_STRING,
-                        CoreActionComparison.STRING_REGEX, ".*e{5}.*"),
-                new ActionCondition(2, CoreActionComponent.STRING_STRING,
-                        CoreActionComparison.STRING_STARTSWITH, "abc")), ConditionTree.parseString("0|1"), null);
-        final ActionSubstitutor sub = new ActionSubstitutor(actionController,
-                commandController, configProvider, CoreActionType.CHANNEL_ACTION);
-
-        assertTrue("test must pass if one condition in disjunction passes (cond 1)",
-                model.test(sub, null, null, "abcdef"));
-        assertTrue("test must pass if one condition in disjunction passes (cond 2)",
-                model.test(sub, null, null, "bcdeeeeeeeeef"));
-        assertFalse("test must fail if all conditions fail",
-                model.test(sub, null, null, "abeeef"));
-    }
-
-    @Test
-    public void testTestNoCondTree() {
-        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
-                "group", "name",
-                new ActionType[]{CoreActionType.CHANNEL_ACTION},
-                new String[0], Arrays.asList(new ActionCondition(2, CoreActionComponent.STRING_STRING,
-                        CoreActionComparison.STRING_REGEX, ".*e{5}.*"),
-                new ActionCondition(2, CoreActionComponent.STRING_STRING,
-                        CoreActionComparison.STRING_STARTSWITH, "abc")), null, null);
-        final ActionSubstitutor sub = new ActionSubstitutor(actionController, commandController,
-                configProvider, CoreActionType.CHANNEL_ACTION);
-
-        assertFalse("test must fail if one condition in conjunction fails (cond 1)",
-                model.test(sub, null, null, "abcdef"));
-        assertFalse("test must fail if one condition in conjunction fails (cond 2)",
-                model.test(sub, null, null, "abdeeeeeeeeef"));
-        assertTrue("test must pass if both conditions in conjunction pass",
-                model.test(sub, null, null, "abcdeeeeeeeeef"));
-    }
-}

test/com/dmdirc/actions/ActionSubstitutorTest.java

@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.Channel;
-import com.dmdirc.Server;
-import com.dmdirc.ServerState;
-import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-@RunWith(Parameterized.class)
-public class ActionSubstitutorTest {
-
-    private static final Map<String, String> SETTINGS = new HashMap<>();
-
-    private final String input, expected;
-    private final Channel channel;
-    private final ActionSubstitutor substitutor;
-    private final Object[] args;
-
-    @BeforeClass
-    public static void setup() throws InvalidIdentityFileException {
-        SETTINGS.put("alpha", "A");
-        SETTINGS.put("bravo", "$alpha");
-        SETTINGS.put("charlie", "${bravo}");
-        SETTINGS.put("delta", "${${bravo}${bravo}}");
-        SETTINGS.put("AA", "win!");
-    }
-
-    public ActionSubstitutorTest(final String input, final String expected) {
-        this.input = input;
-        this.expected = expected;
-
-        this.channel = mock(Channel.class);
-
-        final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
-        final Server server = mock(Server.class);
-
-        final ChannelClientInfo clientInfo = mock(ChannelClientInfo.class);
-
-        when(channel.getConnection()).thenReturn(Optional.of(server));
-        when(channel.getConfigManager()).thenReturn(manager);
-        when(server.getState()).thenReturn(ServerState.DISCONNECTED);
-        when(server.getAwayMessage()).thenReturn("foo");
-        when(server.getProtocol()).thenReturn("$alpha");
-
-        when(manager.getOptions(eq("actions"))).thenReturn(SETTINGS);
-        for (Map.Entry<String, String> entry : SETTINGS.entrySet()) {
-            when(manager.hasOptionString("actions", entry.getKey())).thenReturn(true);
-            when(manager.getOption("actions", entry.getKey())).thenReturn(entry.getValue());
-        }
-
-        final ActionController controller = mock(ActionController.class);
-        when(controller.getComponent("STRING_STRING")).thenReturn(CoreActionComponent.STRING_STRING);
-        when(controller.getComponent("STRING_LENGTH")).thenReturn(CoreActionComponent.STRING_LENGTH);
-        when(controller.getComponent("SERVER_NETWORK")).thenReturn(CoreActionComponent.SERVER_NETWORK);
-        when(controller.getComponent("SERVER_PROTOCOL")).thenReturn(CoreActionComponent.SERVER_PROTOCOL);
-        when(controller.getComponent("SERVER_MYAWAYREASON")).thenReturn(CoreActionComponent.SERVER_MYAWAYREASON);
-
-        substitutor = new ActionSubstitutor(controller, mock(CommandController.class),
-                mock(AggregateConfigProvider.class), CoreActionType.CHANNEL_MESSAGE);
-
-        args = new Object[]{
-            channel,
-            clientInfo,
-            "1 2 3 fourth_word_here 5 6 7"
-        };
-    }
-
-    @Test
-    public void testSubstitution() {
-        assertEquals(expected, substitutor.doSubstitution(input, args));
-    }
-
-    @Parameterized.Parameters
-    public static List<String[]> data() {
-        final String[][] tests = {
-            // -- Existing behaviour -------------------------------------------
-            // ---- No subs at all ---------------------------------------------
-            {"no subs here!", "no subs here!"},
-            // ---- Config subs ------------------------------------------------
-            {"$alpha", "A"},
-            {"--$alpha--", "--A--"},
-            // ---- Word subs --------------------------------------------------
-            {"$1", "1"},
-            {"$4", "fourth_word_here"},
-            {"$5-", "5 6 7"},
-            // ---- Component subs ---------------------------------------------
-            {"${2.STRING_LENGTH}", "28"},
-            {"${2.STRING_STRING}", "1 2 3 fourth_word_here 5 6 7"},
-            // ---- Server subs ------------------------------------------------
-            {"${SERVER_MYAWAYREASON}", "foo"},
-            // ---- Combinations -----------------------------------------------
-            {"${1}${2.STRING_LENGTH}$alpha", "128A"},
-            {"$alpha$4${SERVER_MYAWAYREASON}", "Afourth_word_herefoo"},
-
-            // -- New behaviour ------------------------------------------------
-            // ---- Config subs ------------------------------------------------
-            {"${alpha}", "A"},
-            {"\\$alpha", "$alpha"},
-            {"$bravo", "A"},
-            {"$charlie", "A"},
-            {"$delta", "win!"},
-            {"$sigma", "not_defined"},
-            // ---- Word subs --------------------------------------------------
-            {"$5-6", "5 6"},
-            {"${5-6}", "5 6"},
-            {"${5-$6}", "5 6"},
-            {"${5-${${6}}}", "5 6"},
-            // ---- Component subs ---------------------------------------------
-            {"${2.STRING_STRING.STRING_LENGTH}", "28"},
-            {"${2.STRING_FLUB.STRING_LENGTH}", "illegal_component"},
-            {"${SERVER_NETWORKFOO}", "illegal_component"},
-            {"${SERVER_NETWORK}", "not_connected"},
-            {"${SERVER_PROTOCOL}", "$alpha"},
-            // ---- Escaping ---------------------------------------------------
-            {"\\$1", "$1"},
-            {"\\$alpha $alpha", "$alpha A"},
-            {"\\$$1", "$1"},
-            {"\\\\$4", "\\fourth_word_here"},
-            {"\\\\${4}", "\\fourth_word_here"},
-            {"\\\\\\$4", "\\$4"},
-        };
-
-        return Arrays.asList(tests);
-    }
-
-}

test/com/dmdirc/actions/ActionTest.java

@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.GlobalWindow;
-import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.util.io.ConfigFile;
-import com.dmdirc.util.io.InvalidConfigFileException;
-
-import com.google.common.jimfs.Configuration;
-import com.google.common.jimfs.Jimfs;
-
-import java.io.IOException;
-import java.nio.file.FileSystem;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Provider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ActionTest {
-
-    @Mock private DMDircMBassador eventBus;
-    @Mock private Provider<GlobalWindow> gwProvider;
-    @Mock private ActionSubstitutorFactory substitutorFactory;
-    @Mock private ActionController actionController;
-    @Mock private ActionGroup actionGroup;
-    @Mock private IdentityController identityController;
-    @Mock private ConfigProvider configProvider;
-    @Mock private AggregateConfigProvider aggregateConfigProvider;
-    private Map<String, PreferencesSetting> prefs;
-    private FileSystem filesystem;
-
-    @Before
-    public void setupActionController() {
-        prefs = new HashMap<>();
-        when(actionController.getOrCreateGroup(anyString())).thenReturn(actionGroup);
-        when(actionGroup.getSettings()).thenReturn(prefs);
-        when(actionController.getType("SERVER_AWAY")).thenReturn(CoreActionType.SERVER_AWAY);
-        when(actionController.getComponent("STRING_LENGTH")).thenReturn(
-                CoreActionComponent.STRING_LENGTH);
-        when(actionController.getComparison("STRING_CONTAINS")).thenReturn(
-                CoreActionComparison.STRING_CONTAINS);
-        when(actionController.getComparison("INT_EQUALS")).thenReturn(
-                CoreActionComparison.INT_EQUALS);
-    }
-
-    @Before
-    public void setupIdentityController() {
-        when(identityController.getGlobalConfiguration()).thenReturn(aggregateConfigProvider);
-        when(identityController.getUserSettings()).thenReturn(configProvider);
-    }
-
-    @Before
-    public void setupFileSystem() {
-        filesystem = Jimfs.newFileSystem(Configuration.unix());
-    }
-
-    @Test
-    public void testSave() throws IOException {
-        new Action(eventBus, gwProvider, substitutorFactory,
-                actionController, identityController, getTempDirectory(), "unit-test", "test1",
-                new ActionType[0], new String[0], new ArrayList<>(),
-                ConditionTree.createConjunction(0), null);
-        assertTrue("Action constructor must create new file",
-                Files.exists(getTempDirectory().resolve("unit-test").resolve("test1")));
-
-    }
-
-    @Test
-    public void testSetGroup() throws IOException {
-        final Action action = new Action(eventBus, gwProvider,
-                substitutorFactory, actionController, identityController, getTempDirectory(),
-                "unit-test", "test1", new ActionType[0],
-                new String[0], new ArrayList<>(),
-                ConditionTree.createConjunction(0), null);
-        action.setGroup("unit-test-two");
-
-        assertFalse("setGroup must remove old file",
-                Files.exists(getTempDirectory().resolve("unit-test").resolve("test1")));
-        assertTrue("setGroup must create new file",
-                Files.exists(getTempDirectory().resolve("unit-test-two").resolve("test1")));
-    }
-
-    @Test
-    public void testSetName() throws IOException {
-        final Action action = new Action(eventBus, gwProvider,
-                substitutorFactory, actionController, identityController, getTempDirectory(),
-                "unit-test", "test1", new ActionType[0], new String[0],
-                new ArrayList<>(), ConditionTree.createConjunction(0), null);
-        action.setName("test2");
-
-        assertFalse("setName must remove old file",
-                Files.exists(getTempDirectory().resolve("unit-test").resolve("test1")));
-        assertTrue("setName must create new file",
-                Files.exists(getTempDirectory().resolve("unit-test").resolve("test2")));
-    }
-
-    @Test
-    public void testDelete() throws IOException {
-        final Action action = new Action(eventBus, gwProvider,
-                substitutorFactory, actionController, identityController, getTempDirectory(),
-                "unit-test", "test1", new ActionType[0],
-                new String[0], new ArrayList<>(),
-                ConditionTree.createConjunction(0), null);
-        action.delete();
-
-        assertFalse("delete must remove file",
-                Files.exists(getTempDirectory().resolve("unit-test").resolve("test1")));
-    }
-
-    @Test
-    public void testRead() throws IOException, InvalidConfigFileException {
-        final Action action = new Action(eventBus, gwProvider,
-                substitutorFactory, actionController, identityController, getTempDirectory(),
-                "unit-test", "doesn't_exist");
-        action.config = new ConfigFile(getClass().getResourceAsStream("action1"));
-        action.config.read();
-        action.loadActionFromConfig();
-
-        assertTrue(Arrays.equals(action.getTriggers(),
-                new ActionType[]{CoreActionType.SERVER_AWAY}));
-        assertEquals("(0&1)", action.getConditionTree().toString());
-        assertTrue(Arrays.equals(action.getResponse(), new String[]{"/away"}));
-        assertEquals(new ActionCondition(1, CoreActionComponent.STRING_LENGTH,
-                CoreActionComparison.INT_EQUALS, "0"), action.getConditions().get(0));
-        assertEquals(new ActionCondition("foo", CoreActionComparison.STRING_CONTAINS,
-                "bar"), action.getConditions().get(1));
-    }
-
-    @Test
-    public void testMultipleGroups() throws IOException, InvalidConfigFileException {
-        final Action action = new Action(eventBus, gwProvider,
-                substitutorFactory, actionController, identityController, getTempDirectory(),
-                "unit-test", "doesn't_exist");
-        action.config = new ConfigFile(getClass().getResourceAsStream("action_multisettings"));
-        action.config.read();
-        action.loadActionFromConfig();
-
-        assertEquals(1, prefs.size());
-
-        final PreferencesSetting setting = prefs.values().iterator().next();
-        assertEquals(PreferencesType.TEXT, setting.getType());
-        assertEquals("Highlight Regex", setting.getTitle());
-        assertEquals("Regex to use to detect a highlight", setting.getHelptext());
-
-        verify(actionController, atLeast(1)).registerSetting("highlightregex",
-                "(?i).*(shane|dataforce|Q${SERVER_MYNICKNAME}E|(?<![#A-Z])DF).*");
-    }
-
-    private Path getTempDirectory() throws IOException {
-        Files.createDirectories(filesystem.getPath("/temp"));
-        return filesystem.getPath("/temp/");
-    }
-
-}

test/com/dmdirc/actions/ActionTypeComparatorTest.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class ActionTypeComparatorTest {
-
-    @Test
-    public void testCompare() {
-        final ActionTypeComparator atc = new ActionTypeComparator();
-
-        assertTrue(atc.compare(CoreActionType.CHANNEL_ACTION, CoreActionType.QUERY_ACTION) < 0);
-        assertTrue(atc.compare(CoreActionType.CHANNEL_ACTION, CoreActionType.CHANNEL_ACTION) == 0);
-        assertTrue(atc.compare(CoreActionType.QUERY_ACTION, CoreActionType.CHANNEL_ACTION) > 0);
-    }
-
-}

test/com/dmdirc/actions/ConditionTreeEvaluatorTest.java

@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.*;
-
-@RunWith(Parameterized.class)
-public class ConditionTreeEvaluatorTest {
-
-    private final Boolean[] data;
-
-    public ConditionTreeEvaluatorTest(final Boolean[] data) {
-        this.data = data;
-    }
-
-    @Test
-    public void testEvaluate() {
-        final String target = "((0&1&2)|3)&(!4)";
-        final ConditionTree tree = ConditionTree.parseString(target);
-        assertNotNull(tree);
-
-        final boolean expected =
-                    ((data[0] && data[1] && data[2]) || data[3])
-                    && !data[4];
-        final boolean actual = tree.evaluate(new boolean[]{data[0], data[1],
-                data[2], data[3], data[4]});
-
-        assertEquals(expected, actual);
-    }
-
-    @Parameterized.Parameters
-    public static List<Boolean[][]> getData() {
-        return Arrays.asList(new Boolean[][][]{
-            {{true, true, true, true, true}},
-            {{true, true, true, true, false}},
-            {{true, true, true, false, true}},
-            {{true, true, true, false, false}},
-            {{true, true, false, true, true}},
-            {{true, true, false, true, false}},
-            {{true, true, false, false, true}},
-            {{true, true, false, false, false}},
-            {{true, false, true, true, true}},
-            {{true, false, true, true, false}},
-            {{true, false, true, false, true}},
-            {{true, false, true, false, false}},
-            {{true, false, false, true, true}},
-            {{true, false, false, true, false}},
-            {{true, false, false, false, true}},
-            {{true, false, false, false, false}},
-            {{false, true, true, true, true}},
-            {{false, true, true, true, false}},
-            {{false, true, true, false, true}},
-            {{false, true, true, false, false}},
-            {{false, true, false, true, true}},
-            {{false, true, false, true, false}},
-            {{false, true, false, false, true}},
-            {{false, true, false, false, false}},
-            {{false, false, true, true, true}},
-            {{false, false, true, true, false}},
-            {{false, false, true, false, true}},
-            {{false, false, true, false, false}},
-            {{false, false, false, true, true}},
-            {{false, false, false, true, false}},
-            {{false, false, false, false, true}},
-            {{false, false, false, false, false}},
-        });
-    }
-}

test/com/dmdirc/actions/ConditionTreeParserTest.java

@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.*;
-
-@RunWith(Parameterized.class)
-public class ConditionTreeParserTest {
-
-    private final String input, expected;
-
-    public ConditionTreeParserTest(final String input, final String expected) {
-        this.input = input;
-        this.expected = expected;
-    }
-
-    @Test
-    public void testParseString() {
-        final ConditionTree res = ConditionTree.parseString(input);
-        assertNotNull(res);
-
-        assertEquals(expected, res.toString());
-    }
-
-    @Parameterized.Parameters
-    public static List<String[]> getData() {
-        return Arrays.asList(new String[][]{
-            {"1", "1"},
-            {"50", "50"},
-            {"!50", "!50"},
-            {"1&1", "(1&1)"},
-            {"1&!1", "(1&!1)"},
-            {"!1&1", "(!1&1)"},
-            {"(1)", "1"},
-            {"((((1))))", "1"},
-            {"(1&1)&1", "((1&1)&1)"},
-            {"1&2&3", "((1&2)&3)"},
-            {"(1&2&3)|4", "(((1&2)&3)|4)"},
-            {"!(1|!1)", "!(1|!1)"},
-            {"!!1", "!!1"},
-            {"1 & !(2 | (3 & !4))", "(1&!(2|(3&!4)))"},
-            {"", ""},
-            {"((1|((2&!3)&(!4))|6)&7)|!8", "((((1|((2&!3)&!4))|6)&7)|!8)"},
-        });
-    }
-}

test/com/dmdirc/actions/ConditionTreeTest.java

@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class ConditionTreeTest {
-
-    @Test
-    public void testGetNumArgs() {
-        final String target = "((0&1&2)|3)&(!4)";
-        final ConditionTree tree = ConditionTree.parseString(target);
-        assertNotNull(tree);
-
-        assertEquals(4, tree.getMaximumArgument());
-
-        final String target2 = "";
-        assertEquals(0, ConditionTree.parseString(target2).getMaximumArgument());
-    }
-
-    @Test
-    public void testCreateConjunction() {
-        final String expected = "(((0&1)&2)&3)";
-        final ConditionTree tree = ConditionTree.createConjunction(4);
-
-        assertNotNull(tree);
-        assertEquals(expected, tree.toString());
-    }
-
-    @Test
-    public void testCreateDisjunction() {
-        final String expected = "(((0|1)|2)|3)";
-        final ConditionTree tree = ConditionTree.createDisjunction(4);
-
-        assertNotNull(tree);
-        assertEquals(expected, tree.toString());
-    }
-
-    @Test
-    public void testMismatchedBrackets() {
-        final ConditionTree tree = ConditionTree.parseString("(0");
-
-        assertNull(tree);
-    }
-
-    @Test
-    public void testMismatchedBrackets2() {
-        final ConditionTree tree = ConditionTree.parseString("0)");
-
-        assertNull(tree);
-    }
-
-    @Test
-    public void testMissingUnaryArg() {
-        final ConditionTree tree = ConditionTree.parseString("!");
-
-        assertNull(tree);
-    }
-
-    @Test
-    public void testGarbageUnaryArg() {
-        final ConditionTree tree = ConditionTree.parseString("!xy");
-
-        assertNull(tree);
-    }
-
-    @Test
-    public void testMissingBinaryArg() {
-        final ConditionTree tree = ConditionTree.parseString("0|");
-
-        assertNull(tree);
-    }
-
-    @Test
-    public void testMissingBinaryArg2() {
-        final ConditionTree tree = ConditionTree.parseString("0|!");
-
-        assertNull(tree);
-    }
-
-    @Test
-    public void testNonExistantOp() {
-        final ConditionTree tree = ConditionTree.parseString("0/1");
-
-        assertNull(tree);
-    }
-
-    @Test
-    public void testHugeNumber() {
-        final ConditionTree tree = ConditionTree.parseString("9999999999999999");
-
-        assertNull(tree);
-    }
-
-    @Test
-    public void testNoopEvaluation() {
-        final ConditionTree tree = ConditionTree.parseString("");
-
-        assertTrue(tree.evaluate(new boolean[]{true, false, true}));
-    }
-
-    @Test
-    public void testBracketedUnary() {
-        final ConditionTree tree = ConditionTree.parseString("(+)");
-
-        assertNull(tree);
-    }
-
-    @Test
-    public void testEquals() {
-        final ConditionTree tree1 = ConditionTree.parseString("(1&3)");
-        final ConditionTree tree2 = ConditionTree.parseString("((1&(3)))");
-
-        assertTrue(tree1.equals(tree2));
-        assertTrue(tree2.equals(tree1));
-        assertEquals(tree1.hashCode(), tree2.hashCode());
-    }
-
-    @Test
-    public void testNotEquals() {
-        final ConditionTree tree1 = ConditionTree.parseString("(1&3)");
-        final ConditionTree tree2 = ConditionTree.parseString("((1&(2)))");
-
-        assertFalse(tree1.equals(tree2));
-        assertFalse(tree2.equals(tree1));
-    }
-
-}

test/com/dmdirc/actions/CoreActionComparisonTest.java

@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class CoreActionComparisonTest {
-
-    @Test
-    public void testStringRegex() {
-        assertEquals(String.class, CoreActionComparison.STRING_REGEX.appliesTo());
-        assertTrue(CoreActionComparison.STRING_REGEX.getName().toLowerCase().contains("reg"));
-        assertTrue(CoreActionComparison.STRING_REGEX.test("hello", "h.*?o"));
-        assertFalse(CoreActionComparison.STRING_REGEX.test("hello", "h.{8}o"));
-        assertFalse(CoreActionComparison.STRING_REGEX.test("hello", "?!!?!{}"));
-    }
-
-    @Test
-    public void testStringEquals() {
-        assertEquals(String.class, CoreActionComparison.STRING_EQUALS.appliesTo());
-        assertTrue(CoreActionComparison.STRING_EQUALS.getName().toLowerCase().contains("equal"));
-        assertTrue(CoreActionComparison.STRING_EQUALS.test("hello", "hello"));
-        assertTrue(CoreActionComparison.STRING_EQUALS.test("hello", "HELLO"));
-        assertFalse(CoreActionComparison.STRING_EQUALS.test("hello", "h.{8}o"));
-        assertFalse(CoreActionComparison.STRING_EQUALS.test("hello", "?!!?!{}"));
-    }
-
-    @Test
-    public void testStringNEquals() {
-        assertEquals(String.class, CoreActionComparison.STRING_NEQUALS.appliesTo());
-        assertTrue(CoreActionComparison.STRING_NEQUALS.getName().toLowerCase().contains("equal"));
-        assertTrue(CoreActionComparison.STRING_NEQUALS.getName().toLowerCase().contains("not")
-                || CoreActionComparison.STRING_NEQUALS.getName().toLowerCase().contains("n't"));
-        assertFalse(CoreActionComparison.STRING_NEQUALS.test("hello", "hello"));
-        assertFalse(CoreActionComparison.STRING_NEQUALS.test("hello", "HELLO"));
-        assertTrue(CoreActionComparison.STRING_NEQUALS.test("hello", "h.{8}o"));
-        assertTrue(CoreActionComparison.STRING_NEQUALS.test("hello", "?!!?!{}"));
-    }
-
-    @Test
-    public void testStringStartsWith() {
-        assertEquals(String.class, CoreActionComparison.STRING_STARTSWITH.appliesTo());
-        assertTrue(CoreActionComparison.STRING_STARTSWITH.getName().toLowerCase().contains("start"));
-        assertTrue(CoreActionComparison.STRING_STARTSWITH.test("hello", "hello"));
-        assertTrue(CoreActionComparison.STRING_STARTSWITH.test("hello", "he"));
-        assertFalse(CoreActionComparison.STRING_STARTSWITH.test("hello", "h.{8}o"));
-        assertFalse(CoreActionComparison.STRING_STARTSWITH.test("hello", "?!!?!{}"));
-    }
-
-    @Test
-    public void testStringContains() {
-        assertEquals(String.class, CoreActionComparison.STRING_CONTAINS.appliesTo());
-        assertTrue(CoreActionComparison.STRING_CONTAINS.getName().toLowerCase().contains("contain"));
-        assertTrue(CoreActionComparison.STRING_CONTAINS.test("hello", "hello"));
-        assertTrue(CoreActionComparison.STRING_CONTAINS.test("hello", "lo"));
-        assertFalse(CoreActionComparison.STRING_CONTAINS.test("hello", "h.{8}o"));
-        assertFalse(CoreActionComparison.STRING_CONTAINS.test("hello", "?!!?!{}"));
-    }
-
-    @Test
-    public void testStringNContains() {
-        assertEquals(String.class, CoreActionComparison.STRING_NCONTAINS.appliesTo());
-        assertTrue(
-                CoreActionComparison.STRING_NCONTAINS.getName().toLowerCase().contains("contain"));
-        assertTrue(CoreActionComparison.STRING_NCONTAINS.getName().toLowerCase().contains("not")
-                || CoreActionComparison.STRING_NCONTAINS.getName().toLowerCase().contains("n't"));
-        assertFalse(CoreActionComparison.STRING_NCONTAINS.test("hello", "hello"));
-        assertFalse(CoreActionComparison.STRING_NCONTAINS.test("hello", "lo"));
-        assertTrue(CoreActionComparison.STRING_NCONTAINS.test("hello", "h.{8}o"));
-        assertTrue(CoreActionComparison.STRING_NCONTAINS.test("hello", "?!!?!{}"));
-    }
-
-    @Test
-    public void testBoolIs() {
-        assertEquals(Boolean.class, CoreActionComparison.BOOL_IS.appliesTo());
-        assertTrue(CoreActionComparison.BOOL_IS.getName().toLowerCase().contains("is"));
-        assertTrue(CoreActionComparison.BOOL_IS.test(Boolean.TRUE, "true"));
-        assertTrue(CoreActionComparison.BOOL_IS.test(Boolean.FALSE, "false"));
-        assertFalse(CoreActionComparison.BOOL_IS.test(Boolean.FALSE, "true"));
-        assertFalse(CoreActionComparison.BOOL_IS.test(Boolean.TRUE, "false"));
-    }
-
-}

test/com/dmdirc/actions/CoreActionExtractorTest.java

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.interfaces.ActionController;
-
-import com.google.common.jimfs.Configuration;
-import com.google.common.jimfs.Jimfs;
-
-import java.nio.file.FileSystem;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertTrue;
-import static org.mockito.Mockito.verify;
-
-@RunWith(MockitoJUnitRunner.class)
-public class CoreActionExtractorTest {
-
-    @Mock private ActionController actionController;
-    @Mock private DMDircMBassador eventBus;
-
-    private FileSystem fileSystem;
-    private Path actionsDir;
-    private CoreActionExtractor instance;
-
-    @Before
-    public void setUp() throws Exception {
-        fileSystem = Jimfs.newFileSystem(Configuration.unix());
-        actionsDir = fileSystem.getPath("/").resolve("actions");
-        Files.createDirectory(actionsDir);
-        instance = new CoreActionExtractor(actionController, actionsDir, eventBus);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        fileSystem.close();
-    }
-
-    @Test
-    public void testExtractCoreActions() throws Exception {
-        assertFalse(Files.list(actionsDir).findAny().isPresent());
-        instance.extractCoreActions();
-        assertTrue(Files.exists(actionsDir.resolve("action1")));
-        assertTrue(Files.exists(actionsDir.resolve("action2")));
-        verify(actionController).loadUserActions();
-    }
-}

test/com/dmdirc/actions/CoreActionTypeTest.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import com.dmdirc.actions.metatypes.PluginEvents;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class CoreActionTypeTest {
-
-    @Test
-    public void testGetName() {
-        assertEquals("Plugin loaded", CoreActionType.PLUGIN_LOADED.getName());
-    }
-
-    @Test
-    public void testMetaType() {
-        assertEquals(PluginEvents.PLUGIN_EVENT, CoreActionType.PLUGIN_LOADED.getType());
-    }
-
-}

test/com/dmdirc/actions/StringComponentsTest.java

@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.junit.Assert.*;
-
-@RunWith(Parameterized.class)
-public class StringComponentsTest {
-
-    private final String string1;
-    private final String string2;
-
-    public StringComponentsTest(final String string1, final String string2) {
-        this.string1 = string1;
-        this.string2 = string2;
-    }
-
-    @Test
-    public void testEquals() {
-        assertEquals(string1.equalsIgnoreCase(string2),
-                CoreActionComparison.STRING_EQUALS.test(string1, string2));
-    }
-
-    @Test
-    public void testNotEquals() {
-        assertEquals(!string1.equalsIgnoreCase(string2),
-                CoreActionComparison.STRING_NEQUALS.test(string1, string2));
-    }
-
-    @Test
-    public void testStartsWith() {
-        assertEquals(string1.startsWith(string2),
-                CoreActionComparison.STRING_STARTSWITH.test(string1, string2));
-    }
-
-    @Test
-    public void testContains() {
-        assertEquals(string1.contains(string2),
-                CoreActionComparison.STRING_CONTAINS.test(string1, string2));
-    }
-
-    @Test
-    public void testNotContains() {
-        assertEquals(!string1.contains(string2),
-                CoreActionComparison.STRING_NCONTAINS.test(string1, string2));
-    }
-
-    @Parameterized.Parameters
-    public static List<Object[]> data() {
-        return Arrays.asList(new Object[][]{
-            {"foo", "foo"},
-            {"FOO", "foo"},
-            {"", "foo"},
-            {"foo", ""},
-            {"abc foo def", "foo"}
-        });
-    }
-
-}

test/com/dmdirc/actions/metatypes/ActionEventsTest.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.metatypes;
-
-import com.dmdirc.interfaces.actions.ActionMetaType;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class ActionEventsTest {
-
-    @Test
-    public void testArity() {
-        for (ActionMetaType event : ActionEvents.values()) {
-            assertEquals("Arity and number of arg names must be equal",
-                    event.getArity(), event.getArgNames().length);
-            assertEquals("Arity and number of arg types must be equal",
-                    event.getArity(), event.getArgTypes().length);
-        }
-    }
-
-}

test/com/dmdirc/actions/metatypes/ChannelEventsTest.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.metatypes;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class ChannelEventsTest {
-
-    @Test
-    public void testArity() {
-        for (ChannelEvents event : ChannelEvents.values()) {
-            assertEquals(event.getArity(), event.getArgNames().length);
-            assertEquals(event.getArity(), event.getArgTypes().length);
-        }
-    }
-
-}

test/com/dmdirc/actions/metatypes/ClientEventsTest.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.metatypes;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class ClientEventsTest {
-
-    @Test
-    public void testArity() {
-        for (ClientEvents event : ClientEvents.values()) {
-            assertEquals(event.getArity(), event.getArgNames().length);
-            assertEquals(event.getArity(), event.getArgTypes().length);
-        }
-    }
-
-}

test/com/dmdirc/actions/metatypes/LinkEventsTest.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.metatypes;
-
-import com.dmdirc.interfaces.actions.ActionMetaType;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class LinkEventsTest {
-
-    @Test
-    public void testArity() {
-        for (ActionMetaType event : LinkEvents.values()) {
-            assertEquals("Arity and number of arg names must be equal",
-                    event.getArity(), event.getArgNames().length);
-            assertEquals("Arity and number of arg types must be equal",
-                    event.getArity(), event.getArgTypes().length);
-        }
-    }
-
-}

test/com/dmdirc/actions/metatypes/PluginEventsTest.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.metatypes;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class PluginEventsTest {
-
-    @Test
-    public void testArity() {
-        for (PluginEvents event : PluginEvents.values()) {
-            assertEquals(event.getArity(), event.getArgNames().length);
-            assertEquals(event.getArity(), event.getArgTypes().length);
-        }
-    }
-
-}

test/com/dmdirc/actions/metatypes/QueryEventsTest.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.metatypes;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class QueryEventsTest {
-
-    @Test
-    public void testArity() {
-        for (QueryEvents event : QueryEvents.values()) {
-            assertEquals(event.getArity(), event.getArgNames().length);
-            assertEquals(event.getArity(), event.getArgTypes().length);
-        }
-    }
-
-}

test/com/dmdirc/actions/metatypes/ServerEventsTest.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.metatypes;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class ServerEventsTest {
-
-    @Test
-    public void testArity() {
-        for (ServerEvents event : ServerEvents.values()) {
-            assertEquals(event.getArity(), event.getArgNames().length);
-            assertEquals(event.getArity(), event.getArgTypes().length);
-        }
-    }
-
-}

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

@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.validators;
-
-import com.dmdirc.actions.Action;
-import com.dmdirc.actions.ActionGroup;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-public class ActionNameValidatorTest {
-
-    private ActionGroup getGroup() {
-        final List<Action> actions = new ArrayList<>();
-        final Action action1 = mock(Action.class);
-        final Action action2 = mock(Action.class);
-        final ActionGroup group = mock(ActionGroup.class);
-        actions.add(action1);
-        actions.add(action2);
-
-        when(group.getActions()).thenReturn(actions);
-        when(action1.getName()).thenReturn("test1");
-        when(action2.getName()).thenReturn("test2");
-
-        return group;
-    }
-
-    @Test
-    public void testConflicting() {
-        final ActionNameValidator instance = new ActionNameValidator(getGroup(), "blah");
-
-        assertTrue(instance.validate("test1").isFailure());
-    }
-
-    @Test
-    public void testRename() {
-        final ActionNameValidator instance = new ActionNameValidator(getGroup(), "test1");
-
-        assertFalse(instance.validate("test").isFailure());
-    }
-
-    @Test
-    public void testNoChange() {
-        final ActionNameValidator instance = new ActionNameValidator(getGroup(), "test");
-
-        assertFalse(instance.validate("test").isFailure());
-    }
-}

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

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.validators;
-
-import com.dmdirc.util.validators.ValidationResponse;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class ConditionRuleValidatorTest {
-
-    @Test
-    public void testIllegal() {
-        final ValidationResponse res = new ConditionRuleValidator(10).validate("|||");
-        assertTrue(res.isFailure());
-    }
-
-    @Test
-    public void testTooMany() {
-        final ValidationResponse res = new ConditionRuleValidator(1).validate("0|1|2");
-        assertTrue(res.isFailure());
-    }
-
-    @Test
-    public void testGood() {
-        final ValidationResponse res = new ConditionRuleValidator(3).validate("0|1|2");
-        assertFalse(res.isFailure());
-    }
-
-    @Test
-    public void testChangeArgs() {
-        final ConditionRuleValidator validator = new ConditionRuleValidator(1);
-        assertTrue(validator.validate("1|0").isFailure());
-        validator.setArgs(2);
-        assertFalse(validator.validate("1|0").isFailure());
-    }
-
-}