Merge pull request #40 from csmith/master

Remove some bits of PerformWrapper.

src/com/dmdirc/ClientModule.java

@@ -25,7 +25,6 @@ package com.dmdirc;
 import com.dmdirc.actions.ActionFactory;
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.commandline.CommandLineOptionsModule;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
@@ -125,12 +124,11 @@ public class ClientModule {
     public ActionManager getActionManager(
             final IdentityController identityController,
             final ActionFactory actionFactory,
-            final Provider<Set<ActionGroup>> actionWrappersProvider,
             final Provider<UpdateManager> updateManagerProvider,
             final DMDircMBassador eventBus,
             @Directory(DirectoryType.ACTIONS) final String directory) {
         final ActionManager actionManager = new ActionManager(identityController,
-                actionFactory, actionWrappersProvider, updateManagerProvider, eventBus, directory);
+                actionFactory, updateManagerProvider, eventBus, directory);
         ActionManager.setActionManager(actionManager);
         return actionManager;
     }
@@ -171,12 +169,6 @@ public class ClientModule {
         return manager;
     }
 
-    @Provides(type = Provides.Type.SET)
-    @Singleton
-    public ActionGroup getPerformWrapper(final PerformWrapper wrapper) {
-        return wrapper;
-    }
-
     @Provides
     @Singleton
     @GlobalConfig

src/com/dmdirc/actions/ActionManager.java

@@ -54,7 +54,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import javax.inject.Provider;
 
@@ -78,8 +77,6 @@ public class ActionManager implements ActionController {
     private final IdentityController identityManager;
     /** The factory to use to create actions. */
     private final ActionFactory factory;
-    /** Provider for action wrappers. */
-    private final Provider<Set<ActionGroup>> actionWrappersProvider;
     /** Provider of an update manager. */
     private final Provider<UpdateManager> updateManagerProvider;
     /** A list of registered action types. */
@@ -109,7 +106,6 @@ public class ActionManager implements ActionController {
      *
      * @param identityManager        The IdentityManager to load configuration from.
      * @param factory                The factory to use to create new actions.
-     * @param actionWrappersProvider Provider of action wrappers.
      * @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.
@@ -117,13 +113,11 @@ public class ActionManager implements ActionController {
     public ActionManager(
             final IdentityController identityManager,
             final ActionFactory factory,
-            final Provider<Set<ActionGroup>> actionWrappersProvider,
             final Provider<UpdateManager> updateManagerProvider,
             final DMDircMBassador eventBus,
             final String directory) {
         this.identityManager = identityManager;
         this.factory = factory;
-        this.actionWrappersProvider = actionWrappersProvider;
         this.updateManagerProvider = updateManagerProvider;
         this.eventBus = eventBus;
         this.directory = directory;
@@ -166,10 +160,6 @@ public class ActionManager implements ActionController {
         registerComparisons(colourComparisons.getComparisons());
         registerComponents(CoreActionComponent.values());
 
-        for (ActionGroup wrapper : actionWrappersProvider.get()) {
-            addGroup(wrapper);
-        }
-
         new WhoisNumericFormatter(identityManager.getAddonSettings(), eventBus).register();
 
         eventBus.subscribe(this);

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.actions.wrappers;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionComponentChain;
 import com.dmdirc.actions.ActionCondition;
@@ -33,11 +32,11 @@ import com.dmdirc.actions.ConditionTree;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.CoreActionComponent;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.events.UserErrorEvent;
+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 com.dmdirc.logger.ErrorLevel;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -47,61 +46,28 @@ 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;
-    /** The event bus to post events to. */
-    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of PerformWrapper.
      *
      * @param actionFactory Factory to use to create actions.
-     * @param eventBus      The event bus to post events to.
      */
     @Inject
-    public PerformWrapper(final ActionFactory actionFactory,
-            final DMDircMBassador eventBus) {
+    public PerformWrapper(final ActionFactory actionFactory) {
         super("performs");
 
         this.actionFactory = actionFactory;
-        this.eventBus = eventBus;
-    }
-
-    @Override
-    public void add(final Action action) {
-        if (action.getTriggers().length != 1) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
-                    "Invalid perform action: " + action.getName(),
-                    "Perform actions may only have one trigger"));
-        } else if (action.getTriggers()[0] != CoreActionType.SERVER_CONNECTED) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
-                    "Invalid perform action: " + action.getName(),
-                    "Perform actions must be triggered when a server connects"));
-        } else if (!checkConditions(action.getConditions())) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
-                    "Invalid perform action: " + action.getName(),
-                    "Perform actions must have exactly one or two conditions, "
-                    + "one may target the server's name or network, and one may "
-                    + "target the server's profile name. No other targets are "
-                    + "allowed."));
-        } else {
-            synchronized (this) {
-                super.add(action);
-            }
-        }
-    }
-
-    @Override
-    public void deleteAction(final Action action) {
-        synchronized (this) {
-            super.deleteAction(action);
-        }
     }
 
     /**
@@ -187,35 +153,6 @@ public class PerformWrapper extends ActionGroup {
         return true;
     }
 
-    /**
-     * Checks that the specified conditions are valid for a perform action.
-     *
-     * @param conditions The conditions to be checked
-     *
-     * @since 0.6.3m2
-     * @return True if the conditions are valid, false otherwise
-     */
-    protected boolean checkConditions(final Iterable<ActionCondition> conditions) {
-        boolean target = false;
-        boolean profile = false;
-
-        for (ActionCondition condition : conditions) {
-            if ((condition.getComponent() == CoreActionComponent.SERVER_NETWORK
-                    || condition.getComponent() == CoreActionComponent.SERVER_NAME)
-                    && !target) {
-                target = true;
-            } else if (condition.getComponent() instanceof ActionComponentChain
-                    && PP_COMP_NAME.equals(condition.getComponent().toString())
-                    && !profile) {
-                profile = true;
-            } else {
-                return false;
-            }
-        }
-
-        return target || profile;
-    }
-
     /**
      * 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.
@@ -304,7 +241,9 @@ public class PerformWrapper extends ActionGroup {
      * Describes one specific perform.
      *
      * @since 0.6.4
+     * @deprecated See {@link AutoCommand}
      */
+    @Deprecated
     public static class PerformDescription {
 
         /** The type of the perform being described. */

src/com/dmdirc/plugins/PluginInjectorInitialiser.java

@@ -27,7 +27,6 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.actions.ActionFactory;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.ActionSubstitutorFactory;
-import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.ConnectionManager;
@@ -62,7 +61,6 @@ public class PluginInjectorInitialiser {
     private final WindowManager windowManager;
     private final StatusBarManager statusBarManager;
     private final PreferencesManager preferencesManager;
-    private final PerformWrapper performWrapper;
     private final LifecycleController lifecycleController;
     private final CorePluginExtractor corePluginExtractor;
     private final URLBuilder urlBuilder;
@@ -83,7 +81,6 @@ public class PluginInjectorInitialiser {
             final WindowManager windowManager,
             final StatusBarManager statusBarManager,
             final PreferencesManager preferencesManager,
-            final PerformWrapper performWrapper,
             final LifecycleController lifecycleController,
             final CorePluginExtractor corePluginExtractor,
             final URLBuilder urlBuilder,
@@ -102,7 +99,6 @@ public class PluginInjectorInitialiser {
         this.windowManager = windowManager;
         this.statusBarManager = statusBarManager;
         this.preferencesManager = preferencesManager;
-        this.performWrapper = performWrapper;
         this.lifecycleController = lifecycleController;
         this.corePluginExtractor = corePluginExtractor;
         this.urlBuilder = urlBuilder;
@@ -127,7 +123,6 @@ public class PluginInjectorInitialiser {
         injector.addParameter(WindowManager.class, windowManager);
         injector.addParameter(statusBarManager);
         injector.addParameter(PreferencesManager.class, preferencesManager);
-        injector.addParameter(PerformWrapper.class, performWrapper);
         injector.addParameter(LifecycleController.class, lifecycleController);
         injector.addParameter(corePluginExtractor);
         injector.addParameter(actionFactory);