DI the script plugin.

Change-Id: I6880a8ea1570e582929a8e277a727dfd20d3c8f7
Reviewed-on: http://gerrit.dmdirc.com/3188
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

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

@@ -22,7 +22,9 @@
 
 package com.dmdirc.addons.scriptplugin;
 
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -31,20 +33,17 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
@@ -56,36 +55,40 @@ public class ScriptCommand extends Command implements IntelligentCommand {
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("script",
             "script - Allows controlling the script plugin", CommandType.TYPE_GLOBAL);
-    /** My Plugin. */
-    private final ScriptPlugin myPlugin;
-    /** The controller to read/write settings with. */
-    private final IdentityController identityController;
+    /** Global config to read settings from. */
+    private final AggregateConfigProvider globalConfig;
     /** Plugin settings domain. */
     private final String domain;
     /** Manager used to retrieve script engines. */
     private final ScriptEngineManager ScriptEngineManager;
     /** Script directory. */
     private final String scriptDirectory;
+    /** Script manager to handle scripts. */
+    private final ScriptManager scriptManager;
 
     /**
      * Creates a new instance of this command.
      *
-     * @param myPlugin           The plugin that owns the command.
-     * @param identityController The controller to read and write settings from.
-     * @param commandController  The controller to use for command information.
-     * @param pluginInfo         This plugin's info object
-     * @param scriptManager      Manager used to get script engines
-     * @param scriptDirectory    Directory to store scripts
+     * @param scriptManager       Used to manage scripts
+     * @param globalConfig        Global config
+     * @param commandController   The controller to use for command information.
+     * @param domain              This plugin's settings domain
+     * @param scriptEngineManager Manager used to get script engines
+     * @param scriptDirectory     Directory to store scripts
      */
-    public ScriptCommand(final ScriptPlugin myPlugin, final IdentityController identityController,
-            final CommandController commandController, final PluginInfo pluginInfo,
-            final ScriptEngineManager scriptManager, final String scriptDirectory) {
+    @Inject
+    public ScriptCommand(final ScriptManager scriptManager,
+            @Directory(ScriptModule.SCRIPTS) final String scriptDirectory,
+            @GlobalConfig final AggregateConfigProvider globalConfig,
+            final CommandController commandController,
+            @PluginDomain(ScriptPlugin.class) final String domain,
+            final ScriptEngineManager scriptEngineManager) {
         super(commandController);
-        this.myPlugin = myPlugin;
-        this.identityController = identityController;
-        this.domain = pluginInfo.getDomain();
-        this.ScriptEngineManager = scriptManager;
+        this.globalConfig = globalConfig;
+        this.domain = domain;
+        this.ScriptEngineManager = scriptEngineManager;
         this.scriptDirectory = scriptDirectory;
+        this.scriptManager = scriptManager;
     }
 
     /** {@inheritDoc} */
@@ -97,12 +100,12 @@ public class ScriptCommand extends Command implements IntelligentCommand {
         if (sargs.length > 0 && (sargs[0].equalsIgnoreCase("rehash") || sargs[0].equalsIgnoreCase(
                 "reload"))) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Reloading scripts");
-            myPlugin.rehash();
+            scriptManager.rehash();
         } else if (sargs.length > 0 && sargs[0].equalsIgnoreCase("load")) {
             if (sargs.length > 1) {
                 final String filename = args.getArgumentsAsString(1);
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Loading: " + filename + " ["
-                        + myPlugin.loadScript(scriptDirectory + filename) + "]");
+                        + scriptManager.loadScript(scriptDirectory + filename) + "]");
             } else {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR, "You must specify a script to load");
             }
@@ -110,7 +113,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
             if (sargs.length > 1) {
                 final String filename = args.getArgumentsAsString(1);
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Unloading: " + filename + " ["
-                        + myPlugin.loadScript(scriptDirectory + filename) + "]");
+                        + scriptManager.loadScript(scriptDirectory + filename) + "]");
             } else {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "You must specify a script to unload");
@@ -121,10 +124,9 @@ public class ScriptCommand extends Command implements IntelligentCommand {
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Evaluating: " + script);
                 try {
                     ScriptEngineWrapper wrapper;
-                    if (identityController.getGlobalConfiguration().hasOptionString(domain,
-                            "eval.baseFile")) {
-                        final String baseFile = scriptDirectory + '/' + identityController.
-                                getGlobalConfiguration().getOption(domain, "eval.baseFile");
+                    if (globalConfig.hasOptionString(domain, "eval.baseFile")) {
+                        final String baseFile = scriptDirectory + '/'
+                                + globalConfig.getOption(domain, "eval.baseFile");
                         if (new File(baseFile).exists()) {
                             wrapper = new ScriptEngineWrapper(ScriptEngineManager, baseFile);
                         } else {
@@ -142,26 +144,10 @@ public class ScriptCommand extends Command implements IntelligentCommand {
                     sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Exception: " + e + " -> " + e.
                             getMessage());
 
-                    if (identityController.getGlobalConfiguration().getOptionBool(domain,
-                            "eval.showStackTrace")) {
-                        try {
-                            final Class<?> logger = Class.forName("com.dmdirc.logger.Logger");
-                            if (logger != null) {
-                                final Method exceptionToStringArray = logger.getDeclaredMethod(
-                                        "exceptionToStringArray", new Class<?>[]{Throwable.class});
-                                exceptionToStringArray.setAccessible(true);
-
-                                final String[] stacktrace = (String[]) exceptionToStringArray.
-                                        invoke(null, e);
-                                for (String line : stacktrace) {
-                                    sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Stack trace: "
-                                            + line);
-                                }
-                            }
-                        } catch (ReflectiveOperationException ex) {
-                            sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
-                                    "Stack trace: Exception showing stack trace: " + ex + " -> "
-                                    + ex.getMessage());
+                    if (globalConfig.getOptionBool(domain, "eval.showStackTrace")) {
+                        final String[] stacktrace = getTrace(e);
+                        for (String line : stacktrace) {
+                            sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Stack trace: " + line);
                         }
                     }
 
@@ -177,11 +163,10 @@ public class ScriptCommand extends Command implements IntelligentCommand {
                 final String script = args.getArgumentsAsString(2);
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Saving as '" + functionName
                         + "': " + script);
-                if (identityController.getGlobalConfiguration().
-                        hasOptionString(domain, "eval.baseFile")) {
+                if (globalConfig.hasOptionString(domain, "eval.baseFile")) {
                     try {
-                        final String baseFile = scriptDirectory + '/' + identityController.
-                                getGlobalConfiguration().getOption(domain, "eval.baseFile");
+                        final String baseFile = scriptDirectory + '/'
+                                + globalConfig.getOption(domain, "eval.baseFile");
                         try (FileWriter writer = new FileWriter(baseFile, true)) {
                             writer.write("function ");
                             writer.write(functionName);
@@ -252,9 +237,9 @@ public class ScriptCommand extends Command implements IntelligentCommand {
             res.add("eval");
             res.add("savetobasefile");
         } else if (arg == 1) {
-            final Map<String, ScriptEngineWrapper> scripts = myPlugin.getScripts();
+            final Map<String, ScriptEngineWrapper> scripts = scriptManager.getScripts();
             if (context.getPreviousArgs().get(0).equalsIgnoreCase("load")) {
-                for (String filename : getPossibleScripts()) {
+                for (String filename : scriptManager.getPossibleScripts()) {
                     res.add(filename);
                 }
             } else if (context.getPreviousArgs().get(0).equalsIgnoreCase("unload")) {
@@ -268,27 +253,40 @@ public class ScriptCommand extends Command implements IntelligentCommand {
     }
 
     /**
-     * Retrieves a list of all installed scripts. Any file under the main plugin directory
-     * (~/.DMDirc/scripts or similar) that matches *.js is deemed to be a valid script.
+     * Converts an exception into a string array.
+     *
+     * @param throwable Exception to convert
      *
-     * @return A list of all installed scripts
+     * @return Exception string array
      */
-    private List<String> getPossibleScripts() {
-        final List<String> res = new LinkedList<>();
+    private static String[] getTrace(final Throwable throwable) {
+        String[] trace;
 
-        final LinkedList<File> dirs = new LinkedList<>();
-        dirs.add(new File(scriptDirectory));
+        if (throwable == null) {
+            trace = new String[0];
+        } else {
+            final StackTraceElement[] traceElements = throwable.getStackTrace();
+            trace = new String[traceElements.length + 1];
+
+            trace[0] = throwable.toString();
 
-        while (!dirs.isEmpty()) {
-            final File dir = dirs.pop();
-            if (dir.isDirectory()) {
-                dirs.addAll(Arrays.asList(dir.listFiles()));
-            } else if (dir.isFile() && dir.getName().endsWith(".js")) {
-                final String target = dir.getPath();
-                res.add(target.substring(scriptDirectory.length(), target.length()));
+            for (int i = 0; i < traceElements.length; i++) {
+                trace[i + 1] = traceElements[i].toString();
+            }
+
+            if (throwable.getCause() != null) {
+                final String[] causeTrace = getTrace(throwable.getCause());
+                final String[] newTrace = new String[trace.length + causeTrace.length];
+                trace[0] = "\nWhich caused: " + trace[0];
+
+                System.arraycopy(causeTrace, 0, newTrace, 0, causeTrace.length);
+                System.arraycopy(trace, 0, newTrace, causeTrace.length, trace.length);
+
+                trace = newTrace;
             }
         }
-        return res;
+
+        return trace;
     }
 
 }

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

@@ -24,11 +24,13 @@ package com.dmdirc.addons.scriptplugin;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.util.io.StreamUtils;
+
+import com.google.common.base.Preconditions;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
+import java.io.IOException;
 
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
@@ -37,8 +39,6 @@ import javax.script.ScriptException;
 
 /**
  * Class to create script engines!
- *
- * @author Shane 'Dataforce' McCormack
  */
 public class ScriptEngineWrapper {
 
@@ -62,8 +62,9 @@ public class ScriptEngineWrapper {
      */
     protected ScriptEngineWrapper(final ScriptEngineManager scriptEngineManager,
             final String filename) throws FileNotFoundException, ScriptException {
+        Preconditions.checkNotNull(filename, "File cannot be null");
         this.scriptEngineManager = scriptEngineManager;
-        file = (filename != null) ? new File(filename) : null;
+        file = new File(filename);
 
         engine = createEngine();
 
@@ -107,14 +108,10 @@ public class ScriptEngineWrapper {
      */
     protected ScriptEngine createEngine() throws FileNotFoundException, ScriptException {
         final ScriptEngine result = scriptEngineManager.getEngineByName("JavaScript");
-        if (file != null) {
-            FileReader fr = null;
-            try {
-                fr = new FileReader(file);
-                result.eval(fr);
-            } finally {
-                StreamUtils.close(fr);
-            }
+        try (FileReader fr = new FileReader(file)) {
+            result.eval(fr);
+        } catch (IOException ex) {
+            throw new ScriptException(ex);
         }
 
         result.put("localHelper", localHelper);

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

@@ -0,0 +1,150 @@
+/*
+ * 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.addons.scriptplugin;
+
+import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+public class ScriptManager {
+
+    /** Script engine manager. */
+    private final ScriptEngineManager scriptEngineManager;
+    /** Script directory. */
+    private final String scriptDirectory;
+    /** Store Script State Name,Engine */
+    private final Map<String, ScriptEngineWrapper> scripts = new HashMap<>();
+
+    @Inject
+    public ScriptManager(final ScriptEngineManager scriptEngineManager,
+            @Directory(ScriptModule.SCRIPTS) final String scriptDirectory) {
+        this.scriptEngineManager = scriptEngineManager;
+        this.scriptDirectory = scriptDirectory;
+    }
+
+    /**
+     * Get a clone of the scripts map.
+     *
+     * @return a clone of the scripts map
+     */
+    protected Map<String, ScriptEngineWrapper> getScripts() {
+        return new HashMap<>(scripts);
+    }
+
+    /** Reload all scripts */
+    public void rehash() {
+        for (final ScriptEngineWrapper engine : scripts.values()) {
+            engine.reload();
+        }
+        // Advise the Garbage collector that now would be a good time to run
+        System.gc();
+    }
+
+    /**
+     * Call a function in all scripts.
+     *
+     * @param functionName Name of function
+     * @param args         Arguments for function
+     */
+    public void callFunctionAll(final String functionName, final Object... args) {
+        for (final ScriptEngineWrapper engine : scripts.values()) {
+            engine.callFunction(functionName, args);
+        }
+    }
+
+    /**
+     * Load a script file into a new jsEngine
+     *
+     * @param scriptFilename Path to script
+     *
+     * @return true for Success (or already loaded), false for fail. (Fail occurs if script already
+     *         exists, or if it has errors)
+     */
+    public boolean loadScript(final String scriptFilename) {
+        if (!scripts.containsKey(scriptFilename)) {
+            try {
+                final ScriptEngineWrapper wrapper = new ScriptEngineWrapper(scriptEngineManager,
+                        scriptFilename);
+                scripts.put(scriptFilename, wrapper);
+            } catch (FileNotFoundException | ScriptException e) {
+                Logger.userError(ErrorLevel.LOW, "Error loading '" + scriptFilename + "': " + e.
+                        getMessage(), e);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Unload a script file.
+     *
+     * @param scriptFilename Path to script
+     */
+    public void unloadScript(final String scriptFilename) {
+        if (scripts.containsKey(scriptFilename)) {
+            // Tell it that its about to be unloaded.
+            (scripts.get(scriptFilename)).callFunction("onUnload");
+            // Remove the script
+            scripts.remove(scriptFilename);
+            // Advise the Garbage collector that now would be a good time to run
+            System.gc();
+        }
+    }
+
+    /**
+     * Retrieves a list of all installed scripts. Any file under the main plugin directory
+     * (~/.DMDirc/scripts or similar) that matches *.js is deemed to be a valid script.
+     *
+     * @return A list of all installed scripts
+     */
+    public List<String> getPossibleScripts() {
+        final List<String> res = new LinkedList<>();
+
+        final LinkedList<File> dirs = new LinkedList<>();
+        dirs.add(new File(scriptDirectory));
+
+        while (!dirs.isEmpty()) {
+            final File dir = dirs.pop();
+            if (dir.isDirectory()) {
+                dirs.addAll(Arrays.asList(dir.listFiles()));
+            } else if (dir.isFile() && dir.getName().endsWith(".js")) {
+                final String target = dir.getPath();
+                res.add(target.substring(scriptDirectory.length(), target.length()));
+            }
+        }
+        return res;
+    }
+
+}

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

@@ -0,0 +1,71 @@
+/*
+ * 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.addons.scriptplugin;
+
+import com.dmdirc.ClientModule;
+import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
+import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
+import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
+
+import javax.inject.Singleton;
+import javax.script.ScriptEngineManager;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(injects = {ScriptCommand.class, ScriptManager.class, ScriptPluginManager.class},
+        addsTo = ClientModule.class)
+public class ScriptModule {
+
+    public static final String SCRIPTS = "scripts";
+    private final PluginInfo pluginInfo;
+
+    public ScriptModule(final PluginInfo pluginInfo) {
+        this.pluginInfo = pluginInfo;
+    }
+
+    @Provides
+    @PluginDomain(ScriptPlugin.class)
+    public String getScriptSettingsDomain() {
+        return pluginInfo.getDomain();
+    }
+
+    @Provides
+    @Directory(SCRIPTS)
+    public String getScriptsDirectory(@Directory(DirectoryType.BASE) final String baseDirectory) {
+        return baseDirectory + "scripts/";
+    }
+
+    @Provides
+    @Singleton
+    public ScriptEngineManager getScriptEngineManager() {
+        final JavaScriptHelper jsHelper = new JavaScriptHelper();
+        final TypedProperties globalVariables = new TypedProperties();
+        final ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
+        scriptEngineManager.put("globalHelper", jsHelper);
+        scriptEngineManager.put("globalVariables", globalVariables);
+        return scriptEngineManager;
+    }
+
+}

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

@@ -22,223 +22,49 @@
 
 package com.dmdirc.addons.scriptplugin;
 
-import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.ActionListener;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.util.validators.ValidationResponse;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
+
+import dagger.ObjectGraph;
 
 /**
  * This allows javascript scripts to be used in DMDirc.
  */
-public class ScriptPlugin extends BaseCommandPlugin implements ActionListener {
+public class ScriptPlugin extends BaseCommandPlugin {
 
-    /** Script Directory */
-    private final String scriptDir;
-    /** Script Engine Manager */
-    private final ScriptEngineManager ScriptEngineManager = new ScriptEngineManager();
-    /** Instance of the javaScriptHelper class */
-    private final JavaScriptHelper jsHelper = new JavaScriptHelper();
-    /** Store Script State Name,Engine */
-    private final Map<String, ScriptEngineWrapper> scripts = new HashMap<>();
-    /** Used to store permanent variables */
-    private final TypedProperties globalVariables = new TypedProperties();
-    /** The action controller to use. */
-    private final ActionController actionController;
+    private ScriptEngineManager scriptEngineManager;
+    private ScriptPluginManager scriptPluginManager;
 
-    /**
-     * Creates a new instance of the Script Plugin.
-     *
-     * @param actionController   The action controller to register listeners with
-     * @param identityController The Identity Manager that controls the current config
-     * @param commandController  Command controller to register commands
-     * @param pluginInfo         Plugin info object
-     */
-    public ScriptPlugin(final ActionController actionController,
-            final IdentityController identityController,
-            final CommandController commandController,
-            final PluginInfo pluginInfo) {
-        super(commandController);
-        scriptDir = identityController.getConfigurationDirectory() + "scripts/";
-        this.actionController = actionController;
+    @Override
+    public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
+        super.load(pluginInfo, graph);
 
-        // Add the JS Helper to the scriptFactory
-        ScriptEngineManager.put("globalHelper", jsHelper);
-        ScriptEngineManager.put("globalVariables", globalVariables);
-        registerCommand(new ScriptCommand(this, identityController, commandController, pluginInfo,
-                ScriptEngineManager, scriptDir), ScriptCommand.INFO);
+        setObjectGraph(graph.plus(new ScriptModule(pluginInfo)));
+        registerCommand(ScriptCommand.class, ScriptCommand.INFO);
+
+        scriptEngineManager = getObjectGraph().get(ScriptEngineManager.class);
+        scriptPluginManager = getObjectGraph().get(ScriptPluginManager.class);
     }
 
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        // Register the plugin_loaded action initially, this will be called
-        // after this method finishes for us to register the rest.
-        actionController.registerListener(this, CoreActionType.PLUGIN_LOADED);
-
-        // Make sure our scripts dir exists
-        final File newDir = new File(scriptDir);
-        if (!newDir.exists()) {
-            newDir.mkdirs();
-        }
-
-        final File savedVariables = new File(scriptDir + "storedVariables");
-        if (savedVariables.exists()) {
-            try (FileInputStream fis = new FileInputStream(savedVariables)) {
-                globalVariables.load(fis);
-            } catch (IOException e) {
-                Logger.userError(ErrorLevel.LOW, "Error reading savedVariables from '"
-                        + savedVariables.getPath() + "': " + e.getMessage(), e);
-            }
-        }
+        scriptPluginManager.onLoad();
         super.onLoad();
     }
 
     @Override
     public void onUnload() {
-        actionController.unregisterListener(this);
-
-        final File savedVariables = new File(scriptDir + "storedVariables");
-        try (FileOutputStream fos = new FileOutputStream(savedVariables)) {
-            globalVariables.store(fos, "# DMDirc Script Plugin savedVariables");
-        } catch (IOException e) {
-            Logger.userError(ErrorLevel.LOW, "Error reading savedVariables to '" + savedVariables.
-                    getPath() + "': " + e.getMessage(), e);
-        }
+        scriptPluginManager.onUnLoad();
         super.onUnload();
     }
 
-    /**
-     * Register all the action types. This will unregister all the actions first.
-     */
-    private void registerAll() {
-        actionController.unregisterListener(this);
-        for (Map.Entry<String, List<ActionType>> entry
-                : actionController.getGroupedTypes().entrySet()) {
-            final List<ActionType> types = entry.getValue();
-            actionController.registerListener(this, types.toArray(new ActionType[types.size()]));
-        }
-    }
-
-    @Override
-    public void processEvent(final ActionType type, final StringBuffer format,
-            final Object... arguments) {
-        // Plugins may to register/unregister action types, so lets reregister all
-        // the action types. This
-        if (type.equals(CoreActionType.PLUGIN_LOADED) || type.equals(CoreActionType.PLUGIN_UNLOADED)) {
-            registerAll();
-        }
-        callFunctionAll("action_" + type.toString().toLowerCase(), arguments);
-    }
-
-    /**
-     * Get a clone of the scripts map.
-     *
-     * @return a clone of the scripts map
-     */
-    protected Map<String, ScriptEngineWrapper> getScripts() {
-        return new HashMap<>(scripts);
-    }
-
-    /**
-     * Get a reference to the JavaScriptHelper
-     *
-     * @return a reference to the JavaScriptHelper
-     */
-    protected JavaScriptHelper getJavaScriptHelper() {
-        return jsHelper;
-    }
-
-    /**
-     * Get a reference to the GlobalVariables Properties
-     *
-     * @return a reference to the GlobalVariables Properties
-     */
-    protected TypedProperties getGlobalVariables() {
-        return globalVariables;
-    }
-
-    /** Reload all scripts */
-    public void rehash() {
-        for (final ScriptEngineWrapper engine : scripts.values()) {
-            engine.reload();
-        }
-        // Advise the Garbage collector that now would be a good time to run
-        System.gc();
-    }
-
-    /**
-     * Call a function in all scripts.
-     *
-     * @param functionName Name of function
-     * @param args         Arguments for function
-     */
-    private void callFunctionAll(final String functionName, final Object... args) {
-        for (final ScriptEngineWrapper engine : scripts.values()) {
-            engine.callFunction(functionName, args);
-        }
-    }
-
-    /**
-     * Unload a script file.
-     *
-     * @param scriptFilename Path to script
-     */
-    public void unloadScript(final String scriptFilename) {
-        if (scripts.containsKey(scriptFilename)) {
-            // Tell it that its about to be unloaded.
-            (scripts.get(scriptFilename)).callFunction("onUnload");
-            // Remove the script
-            scripts.remove(scriptFilename);
-            // Advise the Garbage collector that now would be a good time to run
-            System.gc();
-        }
-    }
-
-    /**
-     * Load a script file into a new jsEngine
-     *
-     * @param scriptFilename Path to script
-     *
-     * @return true for Success (or already loaded), false for fail. (Fail occurs if script already
-     *         exists, or if it has errors)
-     */
-    public boolean loadScript(final String scriptFilename) {
-        if (!scripts.containsKey(scriptFilename)) {
-            try {
-                final ScriptEngineWrapper wrapper = new ScriptEngineWrapper(ScriptEngineManager,
-                        scriptFilename);
-                scripts.put(scriptFilename, wrapper);
-            } catch (FileNotFoundException | ScriptException e) {
-                Logger.userError(ErrorLevel.LOW, "Error loading '" + scriptFilename + "': " + e.
-                        getMessage(), e);
-                return false;
-            }
-        }
-        return true;
-    }
-
     @Override
     public ValidationResponse checkPrerequisites() {
-        if (ScriptEngineManager.getEngineByName("JavaScript") == null) {
+        if (scriptEngineManager.getEngineByName("JavaScript") == null) {
             return new ValidationResponse("JavaScript Scripting Engine not found.");
         } else {
             return new ValidationResponse();
@@ -251,7 +77,7 @@ public class ScriptPlugin extends BaseCommandPlugin implements ActionListener {
      * @return Human-Readable reason for checkPrerequisites failing.
      */
     public String checkPrerequisitesReason() {
-        if (ScriptEngineManager.getEngineByName("JavaScript") == null) {
+        if (scriptEngineManager.getEngineByName("JavaScript") == null) {
             return "JavaScript Scripting Engine not found.";
         } else {
             return "";

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

@@ -0,0 +1,118 @@
+/*
+ * 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.addons.scriptplugin;
+
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
+import com.dmdirc.interfaces.ActionController;
+import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.script.ScriptEngineManager;
+
+public class ScriptPluginManager implements ActionListener {
+
+    private final ActionController actionController;
+    private final String scriptDir;
+    private final ScriptManager scriptManager;
+    private final TypedProperties globalVariables;
+
+    @Inject
+    public ScriptPluginManager(final ActionController actionController,
+            @Directory(ScriptModule.SCRIPTS) final String scriptDir,
+            final ScriptManager scriptManager,
+            final ScriptEngineManager scriptEngineManager) {
+        this.actionController = actionController;
+        this.scriptDir = scriptDir;
+        this.scriptManager = scriptManager;
+        globalVariables = (TypedProperties) scriptEngineManager.get("globalVariables");
+    }
+
+    public void onLoad() {
+        // Register the plugin_loaded action initially, this will be called
+        // after this method finishes for us to register the rest.
+        actionController.registerListener(this, CoreActionType.PLUGIN_LOADED);
+
+        // Make sure our scripts dir exists
+        final File newDir = new File(scriptDir);
+        if (!newDir.exists()) {
+            newDir.mkdirs();
+        }
+
+        final File savedVariables = new File(scriptDir + "storedVariables");
+        if (savedVariables.exists()) {
+            try (FileInputStream fis = new FileInputStream(savedVariables)) {
+                globalVariables.load(fis);
+            } catch (IOException e) {
+                Logger.userError(ErrorLevel.LOW, "Error reading savedVariables from '"
+                        + savedVariables.getPath() + "': " + e.getMessage(), e);
+            }
+        }
+    }
+
+    public void onUnLoad() {
+        actionController.unregisterListener(this);
+
+        final File savedVariables = new File(scriptDir + "storedVariables");
+        try (FileOutputStream fos = new FileOutputStream(savedVariables)) {
+            globalVariables.store(fos, "# DMDirc Script Plugin savedVariables");
+        } catch (IOException e) {
+            Logger.userError(ErrorLevel.LOW, "Error reading savedVariables to '" + savedVariables.
+                    getPath() + "': " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Register all the action types. This will unregister all the actions first.
+     */
+    private void registerAll() {
+        actionController.unregisterListener(this);
+        for (Map.Entry<String, List<ActionType>> entry
+                : actionController.getGroupedTypes().entrySet()) {
+            final List<ActionType> types = entry.getValue();
+            actionController.registerListener(this, types.toArray(new ActionType[types.size()]));
+        }
+    }
+
+    @Override
+    public void processEvent(final ActionType type, final StringBuffer format,
+            final Object... arguments) {
+        // Plugins may to register/unregister action types, so lets reregister all
+        // the action types, except Plugin loaded and plugin unloaded.
+        if (type.equals(CoreActionType.PLUGIN_LOADED) || type.equals(CoreActionType.PLUGIN_UNLOADED)) {
+            registerAll();
+        }
+        scriptManager.callFunctionAll("action_" + type.toString().toLowerCase(), arguments);
+    }
+
+}

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

@@ -24,23 +24,16 @@ package com.dmdirc.addons.scriptplugin;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Reader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
 /**
- * Properties file that allows for getting/setting of typed properties
- *
- * @author Shane 'Dataforce' McCormack
+ * Properties file that allows for getting/setting of typed properties.
  */
 public class TypedProperties extends Properties {
 
-    /**
-     * A version number for this class. It should be changed whenever the class structure is changed
-     * (or anything else that would prevent serialized objects being unserialized with the new
-     * class).
-     */
+    /** A version number for this class. */
     private static final long serialVersionUID = 200711071;
     /** Is this properties file Case Sensitive */
     private boolean caseSensitive = true;
@@ -73,8 +66,7 @@ public class TypedProperties extends Properties {
                 if (property instanceof String) {
                     final String propertyName = (String) property;
                     if (!propertyName.equals(propertyName.toLowerCase())) {
-                        super.setProperty(propertyName.toLowerCase(),
-                                getProperty(propertyName));
+                        super.setProperty(propertyName.toLowerCase(), getProperty(propertyName));
                         super.remove(propertyName);
                     }
                 }
@@ -85,7 +77,7 @@ public class TypedProperties extends Properties {
 
     /**
      * Load properties from an InputStream. After loading, setCaseSensitivity(caseSensitive) is
-     * called. If this properties file is ment to be case Insensitive, all non-lowercase property
+     * called. If this properties file is meant to be case Insensitive, all non-lowercase property
      * names will be lowercased.
      *
      * @param inStream InputStream to load from.
@@ -98,36 +90,6 @@ public class TypedProperties extends Properties {
         setCaseSensitivity(caseSensitive);
     }
 
-    /**
-     * Load properties from a Reader. After loading, setCaseSensitivity(caseSensitive) is called. If
-     * this properties file is ment to be case Insensitive, all non-lowercase property names will be
-     * lowercased.
-     *
-     * @param reader Reader to load from.
-     *
-     * @throws IOException If there is an error reading from the reader
-     */
-    @Override
-    public synchronized void load(final Reader reader) throws IOException {
-        super.load(reader);
-        setCaseSensitivity(caseSensitive);
-    }
-
-    /**
-     * Load properties from an XML InputStream. After loading, setCaseSensitivity(caseSensitive) is
-     * called. If this properties file is ment to be case Insensitive, all non-lowercase property
-     * names will be lowercased.
-     *
-     * @param in InputStream to load from.
-     *
-     * @throws java.io.IOException if an error occurs loading the XML
-     */
-    @Override
-    public synchronized void loadFromXML(final InputStream in) throws IOException {
-        super.loadFromXML(in);
-        setCaseSensitivity(caseSensitive);
-    }
-
     /**
      * Get a property from the config
      *
@@ -251,8 +213,7 @@ public class TypedProperties extends Properties {
      */
     public int getIntProperty(final String key, final int fallback) {
         try {
-            return Integer
-                    .parseInt(getProperty(key, Integer.toString(fallback)));
+            return Integer.parseInt(getProperty(key, Integer.toString(fallback)));
         } catch (final NumberFormatException nfe) {
             return fallback;
         }
@@ -330,8 +291,7 @@ public class TypedProperties extends Properties {
      */
     public double getDoubleProperty(final String key, final double fallback) {
         try {
-            return Double.parseDouble(getProperty(key, Double
-                    .toString(fallback)));
+            return Double.parseDouble(getProperty(key, Double.toString(fallback)));
         } catch (final NumberFormatException nfe) {
             return fallback;
         }
@@ -356,8 +316,7 @@ public class TypedProperties extends Properties {
      * @return the requested property, or the fallback value if not defined
      */
     public boolean getBoolProperty(final String key, final boolean fallback) {
-        return Boolean
-                .parseBoolean(getProperty(key, Boolean.toString(fallback)));
+        return Boolean.parseBoolean(getProperty(key, Boolean.toString(fallback)));
     }
 
     /**
@@ -405,8 +364,7 @@ public class TypedProperties extends Properties {
      *
      * @return the requested property, or the fallback value if not defined
      */
-    public List<String> getListProperty(final String key,
-            final List<String> fallback) {
+    public List<String> getListProperty(final String key, final List<String> fallback) {
         final String res = getProperty(key, "");
         if (res == null || res.isEmpty()) {
             return fallback;