Actions tidying.

Change-Id: I77c22319367b42840431e18ee998011a730ac6af
Reviewed-on: http://gerrit.dmdirc.com/3695
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

.idea/misc.xml

 <project version="4">
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="dagger.Provides" />
+    <list size="2">
+      <item index="0" class="java.lang.String" itemvalue="com.google.common.eventbus.Subscribe" />
+      <item index="1" class="java.lang.String" itemvalue="dagger.Provides" />
     </list>
   </component>
   <component name="NullableNotNullManager">

src/com/dmdirc/actions/Action.java

 package com.dmdirc.actions;
 
 import com.dmdirc.GlobalWindow;
-import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.events.ActionCreatedEvent;
      *
      * @param filesystem                  The file system to read/write actions to
      * @param eventBus                    Event bus to post events to
-     * @param globalCommandParserProvider Provider of global command parsers for triggering actions.
      * @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 group                       The group the action belongs to
      * @param name                        The name of the action
      */
-    public Action(
-            final FileSystem filesystem,
-            final EventBus eventBus,
-            final Provider<GlobalCommandParser> globalCommandParserProvider,
+    public Action(final FileSystem filesystem, final EventBus eventBus,
             final Provider<GlobalWindow> globalWindowProvider,
             final ActionSubstitutorFactory substitutorFactory,
-            final ActionController actionController,
-            final IdentityController identityController,
-            final String actionsDirectory,
-            final String group,
-            final String name) {
-        super(globalCommandParserProvider, globalWindowProvider, substitutorFactory, group, name);
+            final ActionController actionController, final IdentityController identityController,
+            final String actionsDirectory, final String group, final String name) {
+        super(globalWindowProvider, substitutorFactory, group, name);
 
         this.filesystem = filesystem;
         this.eventBus = eventBus;
      *
      * @param filesystem                  The file system to read/write actions to
      * @param eventBus                    Event bus to post events to
-     * @param globalCommandParserProvider Provider of global command parsers for triggering actions.
      * @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 conditionTree               The condition tree to use
      * @param newFormat                   The new formatter to use
      */
-    public Action(
-            final FileSystem filesystem,
-            final EventBus eventBus,
-            final Provider<GlobalCommandParser> globalCommandParserProvider,
+    public Action(final FileSystem filesystem, final EventBus eventBus,
             final Provider<GlobalWindow> globalWindowProvider,
             final ActionSubstitutorFactory substitutorFactory,
-            final ActionController actionController,
-            final IdentityController identityController,
-            final String actionsDirectory,
-            final String group,
-            final String name,
-            final ActionType[] triggers,
-            final String[] response,
-            final List<ActionCondition> conditions,
-            final ConditionTree conditionTree,
+            final ActionController actionController, final IdentityController identityController,
+            final String actionsDirectory, final String group, final String name,
+            final ActionType[] triggers, final String[] response,
+            final List<ActionCondition> conditions, final ConditionTree conditionTree,
             final String newFormat) {
-        super(globalCommandParserProvider, globalWindowProvider, substitutorFactory, group, name,
+        super(globalWindowProvider, substitutorFactory, group, name,
                 triggers, response, conditions, conditionTree, newFormat);
 
         this.filesystem = filesystem;

src/com/dmdirc/actions/ActionErrorType.java

     /** A problem with the action's condition tree. */
     CONDITION_TREE,
     /** A problem with the action's conditions. */
-    CONDITIONS;
+    CONDITIONS
 
 }

src/com/dmdirc/actions/ActionFactory.java

 import com.dmdirc.GlobalWindow;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
-import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.IdentityController;
 @Singleton
 public class ActionFactory {
 
-    /** Provider of global command parsers. */
-    private final Provider<GlobalCommandParser> globalCommandParserProvider;
     /** The controller that will own actions. */
     private final Provider<ActionController> actionController;
     /** The controller to use to retrieve and update settings. */
      * @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 globalCommandParserProvider The global command parser to use for actions without
-     *                                    windows.
      * @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 EventBus eventBus,
-            final Provider<ActionController> actionController,
+    public ActionFactory(final EventBus eventBus, final Provider<ActionController> actionController,
             final Provider<IdentityController> identityController,
-            final Provider<GlobalCommandParser> globalCommandParserProvider,
             final Provider<GlobalWindow> globalWindowProvider,
             final ActionSubstitutorFactory substitutorFactory,
             @Directory(DirectoryType.ACTIONS) final String actionsDirectory) {
         this.eventBus = eventBus;
         this.actionController = actionController;
         this.identityController = identityController;
-        this.globalCommandParserProvider = globalCommandParserProvider;
         this.globalWindowProvider = globalWindowProvider;
         this.substitutorFactory = substitutorFactory;
         this.actionsDirectory = actionsDirectory;
     public Action getAction(final String group, final String name) {
         return new Action(
                 filesystem,
-                eventBus,
-                globalCommandParserProvider,
-                globalWindowProvider,
+                eventBus, globalWindowProvider,
                 substitutorFactory,
                 actionController.get(),
                 identityController.get(),
             final ConditionTree conditionTree, final String newFormat) {
         return new Action(
                 filesystem,
-                eventBus,
-                globalCommandParserProvider,
-                globalWindowProvider,
+                eventBus, globalWindowProvider,
                 substitutorFactory,
                 actionController.get(),
                 identityController.get(),

src/com/dmdirc/actions/ActionManager.java

     public void addAction(final Action action) {
         checkNotNull(action);
 
-        LOG.debug("Registering action: {}/{} (status: {})",
-                new Object[]{action.getGroup(), action.getName(), action.getStatus()});
+        LOG.debug("Registering action: {}/{} (status: {})", action.getGroup(), action.getName(),
+                action.getStatus());
 
         if (action.getStatus() != ActionStatus.FAILED) {
             for (ActionType trigger : action.getTriggers()) {

src/com/dmdirc/actions/ActionModel.java

 import com.dmdirc.GlobalWindow;
 import com.dmdirc.Precondition;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.actions.ActionType;
 
 import java.util.ArrayList;
 
     // TODO: Sort out the mess of protected fields here.
 
-    /** Provider of global command parsers, for use when triggering window-less actions. */
-    private final Provider<GlobalCommandParser> globalCommandParserProvider;
     /** Provider of global windows for global actions. */
     private final Provider<GlobalWindow> globalWindowProvider;
     /** Factory to use to creator substitutors. */
     /**
      * Creates a new instance of ActionModel with the specified properties.
      *
-     * @param globalCommandParserProvider Provider of global command parsers for global actions.
      * @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<GlobalCommandParser> globalCommandParserProvider,
             final Provider<GlobalWindow> globalWindowProvider,
             final ActionSubstitutorFactory substitutorFactory,
             final String group,
             final String name) {
-        this.globalCommandParserProvider = globalCommandParserProvider;
         this.globalWindowProvider = globalWindowProvider;
         this.substitutorFactory = substitutorFactory;
         this.group = group;
 
     /**
      * Creates a new instance of ActionModel with the specified properties.
-     *
-     * @param globalCommandParserProvider Provider of global command parsers for triggering actions.
-     * @param globalWindowProvider        Provider of global windows for global actions.
+     *  @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 newFormat                   The new formatter to use
      */
     public ActionModel(
-            final Provider<GlobalCommandParser> globalCommandParserProvider,
             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(globalCommandParserProvider, globalWindowProvider, substitutorFactory, group, name);
+        this(globalWindowProvider, substitutorFactory, group, name);
         this.triggers = triggers.clone();
         this.response = response.clone();
         this.conditions = conditions;

src/com/dmdirc/actions/ActionStatus.java

     /** The action is disabled by the user. */
     DISABLED,
     /** The action has failed to load. */
-    FAILED;
+    FAILED
 
 }

src/com/dmdirc/actions/ActionSubstitutor.java

 
 package com.dmdirc.actions;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Precondition;
 import com.dmdirc.ServerState;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.Window;
-import com.dmdirc.util.annotations.factory.Factory;
-import com.dmdirc.util.annotations.factory.Unbound;
 
 import java.util.Arrays;
 import java.util.HashMap;
 /**
  * Handles the substitution of variables into action targets and responses.
  */
-@Factory(inject = true, providers = true, singleton = true)
 public class ActionSubstitutor {
 
     /** Substitution to use when a component requires a connected server. */
     public ActionSubstitutor(
             final ActionController actionController,
             final CommandController commandController,
-            @SuppressWarnings("qualifiers") @GlobalConfig
             final AggregateConfigProvider globalConfig,
-            @Unbound final ActionType type) {
+            final ActionType type) {
         this.actionController = actionController;
         this.globalConfig = globalConfig;
         this.commandController = commandController;

src/com/dmdirc/actions/ActionSubstitutorFactory.java

+/*
+ * Copyright (c) 2006-2014 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/ColourActionComparison.java

 
         @Override
         public boolean test(final Object arg1, final Object arg2) {
-            return ((Colour) arg1).equals(colourManager.get().getColourFromString((String) arg2,
-                    null));
+            return arg1.equals(colourManager.get().getColourFromString((String) arg2, null));
         }
 
         @Override

src/com/dmdirc/actions/ConditionTree.java

     @Override
     public boolean equals(final Object obj) {
         return obj instanceof ConditionTree
-                && toString().equals(((ConditionTree) obj).toString());
+                && toString().equals(obj.toString());
     }
 
     @Override

src/com/dmdirc/actions/CoreActionComparison.java

 
     /** 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. */
+        @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. */
+        @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";
-                }
-            },
+        @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 containts another string. */
+        @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).indexOf((String) arg2) != -1;
-                }
-
-                @Override
-                public Class<?> appliesTo() {
-                    return String.class;
-                }
-
-                @Override
-                public String getName() {
-                    return "contains";
-                }
-            },
-    /** Checks if the string doesn't containt another string. */
+        @Override
+        public boolean test(final Object arg1, final Object arg2) {
+            return ((String) arg1).contains((String) 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).indexOf((String) arg2) == -1;
-                }
-
-                @Override
-                public Class<?> appliesTo() {
-                    return String.class;
-                }
-
-                @Override
-                public String getName() {
-                    return "doesn't contain";
-                }
-            },
+        @Override
+        public boolean test(final Object arg1, final Object arg2) {
+            return !((String) arg1).contains((String) 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 ((Boolean) arg1).equals(Boolean.valueOf((String) arg2));
-                }
-
-                @Override
-                public Class<?> appliesTo() {
-                    return Boolean.class;
-                }
-
-                @Override
-                public String getName() {
-                    return "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";
-                }
-            },
+        @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";
-                }
-            },
+        @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";
-                }
-            };
+        @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/ui/input/AdditionalTabTargets.java

 import java.util.List;
 
 /**
- * The AdditionalTabTargets class is a basic wrapper around an arraylist that adds an additional
- * property to determine what types of results to include.
+ * The AdditionalTabTargets class is a basic wrapper around an {@link ArrayList} that adds an
+ * additional property to determine what types of results to include.
  */
 public final class AdditionalTabTargets extends ArrayList<String> {
 

test/com/dmdirc/actions/ActionModelTest.java

 
     @Test
     public void testConditions() {
-        final ActionModel model = new ActionModel(gcpProvider, gwProvider, substitutorFactory,
+        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
                 "group", "name");
 
         assertTrue("ActionModel must start with no conditions",
 
     @Test
     public void testTriggers() {
-        final ActionModel model = new ActionModel(gcpProvider, gwProvider, substitutorFactory,
+        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
                 "group", "name");
 
         assertNull("ActionModel must start with null triggers",
 
     @Test
     public void testNewFormat() {
-        final ActionModel model = new ActionModel(gcpProvider, gwProvider, substitutorFactory,
+        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
                 "group", "name");
 
         assertNull("ActionModel must start with null format",
 
     @Test
     public void testResponse() {
-        final ActionModel model = new ActionModel(gcpProvider, gwProvider, substitutorFactory,
+        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
                 "group", "name");
 
         assertNull("ActionModel must start with null response",
 
     @Test
     public void testGroup() {
-        final ActionModel model = new ActionModel(gcpProvider, gwProvider, substitutorFactory,
+        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
                 "group", "name");
 
         assertEquals("ActionModel constructor must set group",
 
     @Test
     public void testName() {
-        final ActionModel model = new ActionModel(gcpProvider, gwProvider, substitutorFactory,
+        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
                 "group", "name");
 
         assertEquals("ActionModel constructor must set name",
 
     @Test
     public void testTest() {
-        final ActionModel model = new ActionModel(gcpProvider, gwProvider, substitutorFactory,
+        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
                 "group", "name",
                 new ActionType[]{CoreActionType.CHANNEL_ACTION},
                 new String[0], Arrays.asList(new ActionCondition[]{
 
     @Test
     public void testTestNoCondTree() {
-        final ActionModel model = new ActionModel(gcpProvider, gwProvider, substitutorFactory,
+        final ActionModel model = new ActionModel(gwProvider, substitutorFactory,
                 "group", "name",
                 new ActionType[]{CoreActionType.CHANNEL_ACTION},
                 new String[0], Arrays.asList(new ActionCondition[]{

test/com/dmdirc/actions/ActionTest.java

 
     @Test
     public void testSave() {
-        new Action(filesystem, eventBus, gcpProvider, gwProvider, substitutorFactory,
+        new Action(filesystem, eventBus, gwProvider, substitutorFactory,
                 actionController, identityController, getTempDirectory(), "unit-test", "test1",
                 new ActionType[0], new String[0], new ArrayList<ActionCondition>(),
                 ConditionTree.createConjunction(0), null);
 
     @Test
     public void testSetGroup() {
-        Action action = new Action(filesystem, eventBus, gcpProvider, gwProvider,
+        Action action = new Action(filesystem, eventBus, gwProvider,
                 substitutorFactory, actionController, identityController, getTempDirectory(),
                 "unit-test", "test1", new ActionType[0],
                 new String[0], new ArrayList<ActionCondition>(),
 
     @Test
     public void testSetName() {
-        Action action = new Action(filesystem, eventBus, gcpProvider, gwProvider,
+        Action action = new Action(filesystem, eventBus, gwProvider,
                 substitutorFactory, actionController, identityController, getTempDirectory(),
                 "unit-test", "test1", new ActionType[0], new String[0],
                 new ArrayList<ActionCondition>(), ConditionTree.createConjunction(0), null);
 
     @Test
     public void testDelete() {
-        Action action = new Action(filesystem, eventBus, gcpProvider, gwProvider,
+        Action action = new Action(filesystem, eventBus, gwProvider,
                 substitutorFactory, actionController, identityController, getTempDirectory(),
                 "unit-test", "test1", new ActionType[0],
                 new String[0], new ArrayList<ActionCondition>(),
 
     @Test
     public void testRead() throws IOException, InvalidConfigFileException {
-        Action action = new Action(filesystem, eventBus, gcpProvider, gwProvider,
+        Action action = new Action(filesystem, eventBus, gwProvider,
                 substitutorFactory, actionController, identityController, getTempDirectory(),
                 "unit-test", "doesn't_exist");
         action.config = new ConfigFile(getClass().getResourceAsStream("action1"));
 
     @Test
     public void testMultipleGroups() throws IOException, InvalidConfigFileException {
-        Action action = new Action(filesystem, eventBus, gcpProvider, gwProvider,
+        Action action = new Action(filesystem, eventBus, gwProvider,
                 substitutorFactory, actionController, identityController, getTempDirectory(),
                 "unit-test", "doesn't_exist");
         action.config = new ConfigFile(getClass().getResourceAsStream("action_multisettings"));