Make some plugins dependency inject the action manager

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

src/com/dmdirc/addons/identd/IdentdPlugin.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.identd;
 
 import com.dmdirc.Server;
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.config.IdentityManager;
@@ -32,6 +31,7 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
@@ -51,15 +51,21 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
     private IdentdServer myServer;
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
+    /** The action controller to use. */
+    private final ActionController actionController;
 
     /**
      * Creates a new instance of this plugin.
      *
      * @param pluginInfo This plugin's plugin info
+     * @param actionController The action controller to register listeners with
      */
-    public IdentdPlugin(final PluginInfo pluginInfo) {
+    public IdentdPlugin(final PluginInfo pluginInfo,
+            final ActionController actionController) {
         super();
+
         this.pluginInfo = pluginInfo;
+        this.actionController = actionController;
     }
 
     /**
@@ -68,7 +74,7 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
     @Override
     public void onLoad() {
         // Add action hooks
-        ActionManager.getActionManager().registerListener(this,
+        actionController.registerListener(this,
                 CoreActionType.SERVER_CONNECTED,
                 CoreActionType.SERVER_CONNECTING,
                 CoreActionType.SERVER_CONNECTERROR);
@@ -87,7 +93,7 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
     public void onUnload() {
         myServer.stopServer();
         servers.clear();
-        ActionManager.getActionManager().unregisterListener(this);
+        actionController.unregisterListener(this);
     }
 
     /**

src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -27,7 +27,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.config.IdentityManager;
@@ -36,6 +35,7 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
@@ -85,26 +85,8 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
     private int historyLines, backbufferLines;
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
-
-    /** Open File. */
-    protected static class OpenFile {
-
-        /** Last used time. */
-        public long lastUsedTime = System.currentTimeMillis();
-
-        /** Open file's writer. */
-        public BufferedWriter writer = null;
-
-        /**
-         * Creates a new open file.
-         *
-         * @param writer Writer that has file open
-         */
-        protected OpenFile(final BufferedWriter writer) {
-            this.writer = writer;
-        }
-
-    }
+    /** The action controller to use. */
+    private final ActionController actionController;
 
     /** Timer used to close idle files. */
     protected Timer idleFileTimer;
@@ -120,10 +102,15 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
      * Creates a new instance of this plugin.
      *
      * @param pluginInfo This plugin's plugin info
+     * @param actionController The action controller to register listeners with
      */
-    public LoggingPlugin(final PluginInfo pluginInfo) {
+    public LoggingPlugin(final PluginInfo pluginInfo,
+            final ActionController actionController) {
         super();
+
         this.pluginInfo = pluginInfo;
+        this.actionController = actionController;
+
         registerCommand(new LoggingCommand(), LoggingCommand.INFO);
     }
 
@@ -154,7 +141,7 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
 
         IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
 
-        ActionManager.getActionManager().registerListener(this,
+        actionController.registerListener(this,
                 CoreActionType.CHANNEL_OPENED,
                 CoreActionType.CHANNEL_CLOSED,
                 CoreActionType.CHANNEL_MESSAGE,
@@ -220,7 +207,7 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
             idleFileTimer.purge();
         }
 
-        ActionManager.getActionManager().unregisterListener(this);
+        actionController.unregisterListener(this);
 
         synchronized (openFiles) {
             for (OpenFile file : openFiles.values()) {
@@ -228,6 +215,7 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
             }
             openFiles.clear();
         }
+
         super.onUnload();
     }
 
@@ -849,4 +837,24 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
         logDirectory = IdentityManager.getGlobalConfig().getOption(getDomain(), "general.directory");
     }
 
+    /** Open File. */
+    protected static class OpenFile {
+
+        /** Last used time. */
+        public long lastUsedTime = System.currentTimeMillis();
+
+        /** Open file's writer. */
+        public BufferedWriter writer = null;
+
+        /**
+         * Creates a new open file.
+         *
+         * @param writer Writer that has file open
+         */
+        protected OpenFile(final BufferedWriter writer) {
+            this.writer = writer;
+        }
+
+    }
+
 }

src/com/dmdirc/addons/nowplaying/NowPlayingPlugin.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.nowplaying;
 
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -30,6 +29,7 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.Plugin;
@@ -55,15 +55,22 @@ public class NowPlayingPlugin extends BasePlugin implements ActionListener  {
     private List<String> order;
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
+    /** The action controller to use. */
+    private final ActionController actionController;
 
     /**
      * Creates a new instance of this plugin.
      *
      * @param pluginInfo This plugin's plugin info
+     * @param actionController The action controller to register listeners with
      */
-    public NowPlayingPlugin(final PluginInfo pluginInfo) {
+    public NowPlayingPlugin(final PluginInfo pluginInfo,
+            final ActionController actionController) {
         super();
+
         this.pluginInfo = pluginInfo;
+        this.actionController = actionController;
+
         registerCommand(new NowPlayingCommand(this), NowPlayingCommand.INFO);
     }
 
@@ -75,8 +82,8 @@ public class NowPlayingPlugin extends BasePlugin implements ActionListener  {
 
         loadSettings();
 
-        ActionManager.getActionManager().registerListener(this,
-                CoreActionType.PLUGIN_LOADED, CoreActionType.PLUGIN_UNLOADED);
+        actionController.registerListener(this, CoreActionType.PLUGIN_LOADED,
+                CoreActionType.PLUGIN_UNLOADED);
 
         for (PluginInfo target : PluginManager.getPluginManager().getPluginInfos()) {
             if (target.isLoaded()) {
@@ -91,7 +98,8 @@ public class NowPlayingPlugin extends BasePlugin implements ActionListener  {
     public void onUnload() {
         sources.clear();
         managers.clear();
-        ActionManager.getActionManager().unregisterListener(this);
+        actionController.unregisterListener(this);
+
         super.onUnload();
     }
 

src/com/dmdirc/addons/parserdebug/DebugPlugin.java

@@ -23,9 +23,9 @@
 package com.dmdirc.addons.parserdebug;
 
 import com.dmdirc.Server;
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
@@ -44,24 +44,34 @@ public final class DebugPlugin extends BasePlugin implements DebugInfoListener,
     /** Map of parsers registered. */
     protected final Map<Parser, DebugWindow> registeredParsers
             = new HashMap<Parser, DebugWindow>();
+    /** The action controller to use. */
+    private final ActionController actionController;
 
-    /** Creates a new instance of this plugin. */
-    public DebugPlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param actionController The action controller to register listeners with
+     */
+    public DebugPlugin(final ActionController actionController) {
         super();
+
+        this.actionController = actionController;
+
         registerCommand(new ParserDebugCommand(this), ParserDebugCommand.INFO);
     }
 
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        ActionManager.getActionManager().unregisterListener(this,
-                CoreActionType.SERVER_DISCONNECTED);
+        actionController.registerListener(this, CoreActionType.SERVER_DISCONNECTED);
         super.onLoad();
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
+        actionController.unregisterListener(this);
+
         final ArrayList<DebugWindow> windowList = new ArrayList<DebugWindow>();
         for (Parser parser : registeredParsers.keySet()) {
             try {

src/com/dmdirc/addons/scriptplugin/ScriptPlugin.java

@@ -23,9 +23,9 @@
 package com.dmdirc.addons.scriptplugin;
 
 import com.dmdirc.Main;
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -58,13 +58,19 @@ public final class ScriptPlugin extends BasePlugin implements ActionListener {
     private Map<String, ScriptEngineWrapper> scripts = new HashMap<String, ScriptEngineWrapper>();
     /** Used to store permanent variables */
     protected TypedProperties globalVariables = new TypedProperties();
+    /** The action controller to use. */
+    private final ActionController actionController;
 
     /**
      * Creates a new instance of the Script Plugin.
+     *
+     * @param actionController The action controller to register listeners with
      */
-    public ScriptPlugin() {
+    public ScriptPlugin(final ActionController actionController) {
         super();
 
+        this.actionController = actionController;
+
         // Add the JS Helper to the scriptFactory
         getScriptFactory().put("globalHelper", getJavaScriptHelper());
         getScriptFactory().put("globalVariables", getGlobalVariables());
@@ -76,8 +82,7 @@ public final class ScriptPlugin extends BasePlugin implements ActionListener {
     public void onLoad() {
         // Register the plugin_loaded action initially, this will be called
         // after this method finishes for us to register the rest.
-        ActionManager.getActionManager().registerListener(this,
-                CoreActionType.PLUGIN_LOADED);
+        actionController.registerListener(this, CoreActionType.PLUGIN_LOADED);
 
         // Make sure our scripts dir exists
         final File newDir = new File(scriptDir);
@@ -101,7 +106,7 @@ public final class ScriptPlugin extends BasePlugin implements ActionListener {
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
-        ActionManager.getActionManager().unregisterListener(this);
+        actionController.unregisterListener(this);
 
         final File savedVariables = new File(scriptDir+"storedVariables");
         FileOutputStream fos = null;
@@ -121,11 +126,11 @@ public final class ScriptPlugin extends BasePlugin implements ActionListener {
      * This will unregister all the actions first.
      */
     private void registerAll() {
-        ActionManager.getActionManager().registerListener(this);
-        for (Map.Entry<String, List<ActionType>> entry : ActionManager
-                .getActionManager().getGroupedTypes().entrySet()) {
+        actionController.registerListener(this);
+        for (Map.Entry<String, List<ActionType>> entry
+                : actionController.getGroupedTypes().entrySet()) {
             final List<ActionType> types = entry.getValue();
-            ActionManager.getActionManager().registerListener(this,
+            actionController.registerListener(this,
                     types.toArray(new ActionType[types.size()]));
         }
     }

src/com/dmdirc/addons/systray/SystrayPlugin.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.systray;
 
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.addons.ui_swing.MainFrame;
@@ -33,6 +32,7 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
@@ -64,15 +64,22 @@ public final class SystrayPlugin extends BasePlugin implements ActionListener,
     private MainFrame mainFrame;
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
+    /** The action controller to use. */
+    private final ActionController actionController;
 
     /**
      * Creates a new system tray plugin.
      *
      * @param pluginInfo This plugin's plugin info
+     * @param actionController The action controller to use
      */
-    public SystrayPlugin(final PluginInfo pluginInfo) {
+    public SystrayPlugin(final PluginInfo pluginInfo,
+            final ActionController actionController) {
         super();
+
         this.pluginInfo = pluginInfo;
+        this.actionController = actionController;
+
         final MenuItem show = new MenuItem("Show/hide");
         final MenuItem quit = new MenuItem("Quit");
 
@@ -155,8 +162,7 @@ public final class SystrayPlugin extends BasePlugin implements ActionListener,
             mainFrame = ((SwingController) PluginManager.getPluginManager()
                     .getPluginInfoByName("ui_swing").getPlugin())
                     .getMainFrame();
-            ActionManager.getActionManager().registerListener(this,
-                CoreActionType.CLIENT_MINIMISED);
+            actionController.registerListener(this, CoreActionType.CLIENT_MINIMISED);
         } catch (AWTException ex) {
             continueLoading = false;
         }
@@ -170,7 +176,7 @@ public final class SystrayPlugin extends BasePlugin implements ActionListener,
     @Override
     public void onUnload() {
         SystemTray.getSystemTray().remove(icon);
-        ActionManager.getActionManager().unregisterListener(this);
+        actionController.unregisterListener(this);
         super.onUnload();
     }
 

src/com/dmdirc/addons/time/TimePlugin.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.time;
 
-import com.dmdirc.actions.ActionManager;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.plugins.BasePlugin;
 
 import java.util.Calendar;
@@ -32,7 +32,7 @@ import java.util.TimerTask;
 /**
  * Provides various time-related features.
  */
-public final class TimePlugin  extends BasePlugin {
+public final class TimePlugin extends BasePlugin {
 
     /** Have we registered our types already? */
     private static boolean registered;
@@ -40,10 +40,19 @@ public final class TimePlugin  extends BasePlugin {
     private Timer timer;
     /** The Manager to use for managing timers. */
     private TimerManager manager;
+    /** The action controller to use. */
+    private final ActionController actionController;
 
-    /** Creates a new instance of this plugin. */
-    public TimePlugin() {
+    /**
+     * Creates a new instance of this plugin.
+     *
+     * @param actionController The action controller to register listeners with
+     */
+    public TimePlugin(final ActionController actionController) {
         super();
+
+        this.actionController = actionController;
+
         registerCommand(new TimerCommand(manager), TimerCommand.INFO);
     }
 
@@ -51,8 +60,7 @@ public final class TimePlugin  extends BasePlugin {
     @Override
     public void onLoad() {
         if (!registered) {
-            ActionManager.getActionManager().registerTypes(
-                    TimeActionType.values());
+            actionController.registerTypes(TimeActionType.values());
             registered = true;
         }
 
@@ -76,16 +84,13 @@ public final class TimePlugin  extends BasePlugin {
     public void runTimer() {
         final Calendar cal = Calendar.getInstance();
 
-        ActionManager.getActionManager().triggerEvent(
-                TimeActionType.TIME_MINUTE, null, cal);
+        actionController.triggerEvent(TimeActionType.TIME_MINUTE, null, cal);
 
         if (cal.get(Calendar.MINUTE) == 0) {
-            ActionManager.getActionManager().triggerEvent(
-                    TimeActionType.TIME_HOUR, null, cal);
+            actionController.triggerEvent(TimeActionType.TIME_HOUR, null, cal);
 
             if (cal.get(Calendar.HOUR_OF_DAY) == 0) {
-                ActionManager.getActionManager().triggerEvent(
-                        TimeActionType.TIME_DAY, null, cal);
+                actionController.triggerEvent(TimeActionType.TIME_DAY, null, cal);
             }
         }
     }
@@ -98,6 +103,7 @@ public final class TimePlugin  extends BasePlugin {
             timer = null;
         }
         manager = null;
+
         super.onUnload();
     }
 

test/com/dmdirc/addons/logging/TestLoggingPlugin.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.logging;
 
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.MapList;
 import static org.mockito.Mockito.*;
@@ -31,7 +32,7 @@ public class TestLoggingPlugin extends LoggingPlugin {
     public final MapList<Object, String> lines = new MapList<Object, String>();
 
     public TestLoggingPlugin() {
-        super(mock(PluginInfo.class));
+        super(mock(PluginInfo.class), mock(ActionController.class));
     }
 
     @Override