EventBus logging for Script Plugin.

Also manually add a factory and a little reformatting.

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

src/com/dmdirc/addons/lagdisplay/ServerInfoDialog.java

@@ -28,8 +28,6 @@ import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPanel;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupWindow;
-import com.dmdirc.util.annotations.factory.Factory;
-import com.dmdirc.util.annotations.factory.Unbound;
 
 import java.util.List;
 
@@ -40,7 +38,6 @@ import javax.swing.JSeparator;
 /**
  * Shows information about all connected servers.
  */
-@Factory(inject = true, singleton = true)
 public class ServerInfoDialog extends StatusbarPopupWindow {
 
     /** A version number for this class. */
@@ -62,7 +59,7 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
      */
     public ServerInfoDialog(
             final LagDisplayManager manager,
-            @Unbound final StatusbarPanel<JLabel> parent,
+            final StatusbarPanel<JLabel> parent,
             final MainFrame mainFrame,
             final ServerManager serverManager) {
         super(parent, mainFrame);

src/com/dmdirc/addons/lagdisplay/ServerInfoDialogFactory.java

@@ -0,0 +1,56 @@
+/*
+ * 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.lagdisplay;
+
+import com.dmdirc.ServerManager;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPanel;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.swing.JLabel;
+
+/**
+ * Factory for {@link ServerInfoDialog}s.
+ */
+@Singleton
+public class ServerInfoDialogFactory {
+
+    private final LagDisplayManager manager;
+    private final MainFrame mainFrame;
+    private final ServerManager serverManager;
+
+    @Inject
+    public ServerInfoDialogFactory(final LagDisplayManager manager, final MainFrame mainFrame,
+            final ServerManager serverManager) {
+        this.manager = manager;
+        this.mainFrame = mainFrame;
+        this.serverManager = serverManager;
+    }
+
+    public ServerInfoDialog getServerInfoDialog(
+            final StatusbarPanel<JLabel> parent) {
+        return new ServerInfoDialog(manager, parent, mainFrame, serverManager);
+    }
+
+}

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

@@ -37,12 +37,15 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import com.google.common.eventbus.EventBus;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
@@ -65,11 +68,14 @@ public class ScriptCommand extends Command implements IntelligentCommand {
     private final String scriptDirectory;
     /** Script manager to handle scripts. */
     private final ScriptManager scriptManager;
+    /** The event bus to post errors to. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of this command.
      *
      * @param scriptManager       Used to manage scripts
+     * @param eventBus            The event bus to post errors to
      * @param globalConfig        Global config
      * @param commandController   The controller to use for command information.
      * @param domain              This plugin's settings domain
@@ -78,6 +84,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
      */
     @Inject
     public ScriptCommand(final ScriptManager scriptManager,
+            final EventBus eventBus,
             @Directory(ScriptModule.SCRIPTS) final String scriptDirectory,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final CommandController commandController,
@@ -89,10 +96,11 @@ public class ScriptCommand extends Command implements IntelligentCommand {
         this.scriptEngineManager = scriptEngineManager;
         this.scriptDirectory = scriptDirectory;
         this.scriptManager = scriptManager;
+        this.eventBus = eventBus;
     }
 
     @Override
-    public void execute(final FrameContainer origin, final CommandArguments args,
+    public void execute(@Nonnull final FrameContainer origin, final CommandArguments args,
             final CommandContext context) {
         final String[] sargs = args.getArguments();
 
@@ -127,12 +135,13 @@ public class ScriptCommand extends Command implements IntelligentCommand {
                         final String baseFile = scriptDirectory + '/'
                                 + globalConfig.getOption(domain, "eval.baseFile");
                         if (new File(baseFile).exists()) {
-                            wrapper = new ScriptEngineWrapper(scriptEngineManager, baseFile);
+                            wrapper = new ScriptEngineWrapper(scriptEngineManager, eventBus,
+                                    baseFile);
                         } else {
-                            wrapper = new ScriptEngineWrapper(scriptEngineManager, null);
+                            wrapper = new ScriptEngineWrapper(scriptEngineManager, eventBus, null);
                         }
                     } else {
-                        wrapper = new ScriptEngineWrapper(scriptEngineManager, null);
+                        wrapper = new ScriptEngineWrapper(scriptEngineManager, eventBus, null);
                     }
                     wrapper.getScriptEngine().put("cmd_origin", origin);
                     wrapper.getScriptEngine().put("cmd_isSilent", args.isSilent());

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

@@ -22,10 +22,11 @@
 
 package com.dmdirc.addons.scriptplugin;
 
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 
 import com.google.common.base.Preconditions;
+import com.google.common.eventbus.EventBus;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -42,6 +43,8 @@ import javax.script.ScriptException;
  */
 public class ScriptEngineWrapper {
 
+    /** The event bus to post errors to. */
+    private final EventBus eventBus;
     /** The Script Engine this wrapper wraps */
     private ScriptEngine engine;
     /** The File this script is from */
@@ -55,14 +58,17 @@ public class ScriptEngineWrapper {
      * Create a new ScriptEngineWrapper
      *
      * @param scriptEngineManager Manager to get script engines
+     * @param eventBus            The event bus to post errors to
      * @param filename            Filename of script
      *
      * @throws java.io.FileNotFoundException If file is not found
      * @throws javax.script.ScriptException  If there was an error during creation
      */
     protected ScriptEngineWrapper(final ScriptEngineManager scriptEngineManager,
-            final String filename) throws FileNotFoundException, ScriptException {
+            final EventBus eventBus, final String filename)
+            throws FileNotFoundException, ScriptException {
         Preconditions.checkNotNull(filename, "File cannot be null");
+        this.eventBus = eventBus;
         this.scriptEngineManager = scriptEngineManager;
         file = new File(filename);
 
@@ -136,8 +142,9 @@ public class ScriptEngineWrapper {
             // and do nothing rather that add an error every time a method is called
             // that doesn't exist (such as the action_* methods)
         } catch (ScriptException e) {
-            Logger.userError(ErrorLevel.LOW, "Error calling '" + functionName + "' in '" + file.
-                    getPath() + "': " + e.getMessage(), e);
+            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, e,
+                    "Error calling '" + functionName + "' in '" + file.getPath() + "': " +
+                            e.getMessage(), ""));
         }
     }
 
@@ -156,8 +163,8 @@ public class ScriptEngineWrapper {
             // Tell it that it has been rehashed
             callFunction("onRehashSucess");
         } catch (ScriptException e) {
-            Logger.userError(ErrorLevel.LOW, "Reloading '" + file.getPath() + "' failed: " + e.
-                    getMessage(), e);
+            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, e,
+                    "Reloading '" + file.getPath() + "' failed: " + e.getMessage(), ""));
             // Tell it that its rehash failed
             callFunction("onRehashFailed", e);
             return false;

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

@@ -23,8 +23,10 @@
 package com.dmdirc.addons.scriptplugin;
 
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
+
+import com.google.common.eventbus.EventBus;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -46,12 +48,16 @@ public class ScriptManager {
     private final String scriptDirectory;
     /** Store Script State Name,Engine */
     private final Map<String, ScriptEngineWrapper> scripts = new HashMap<>();
+    /** The event bus to post events to. */
+    private final EventBus eventBus;
 
     @Inject
     public ScriptManager(final ScriptEngineManager scriptEngineManager,
-            @Directory(ScriptModule.SCRIPTS) final String scriptDirectory) {
+            @Directory(ScriptModule.SCRIPTS) final String scriptDirectory,
+            final EventBus eventBus) {
         this.scriptEngineManager = scriptEngineManager;
         this.scriptDirectory = scriptDirectory;
+        this.eventBus = eventBus;
     }
 
     /**
@@ -96,11 +102,11 @@ public class ScriptManager {
         if (!scripts.containsKey(scriptFilename)) {
             try {
                 final ScriptEngineWrapper wrapper = new ScriptEngineWrapper(scriptEngineManager,
-                        scriptFilename);
+                        eventBus, scriptFilename);
                 scripts.put(scriptFilename, wrapper);
             } catch (FileNotFoundException | ScriptException e) {
-                Logger.userError(ErrorLevel.LOW, "Error loading '" + scriptFilename + "': " + e.
-                        getMessage(), e);
+                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, e,
+                        "Error loading '" + scriptFilename + "': " + e.getMessage(), ""));
                 return false;
             }
         }

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

@@ -26,9 +26,8 @@ import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.events.DMDircEvent;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
-import com.dmdirc.interfaces.ActionController;
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
@@ -47,18 +46,15 @@ import javax.script.ScriptEngineManager;
 public class ScriptPluginManager {
 
     private final EventBus eventBus;
-    private final ActionController actionController;
     private final String scriptDir;
     private final ScriptManager scriptManager;
     private final TypedProperties globalVariables;
 
     @Inject
     public ScriptPluginManager(final EventBus eventBus,
-            final ActionController actionController,
             @Directory(ScriptModule.SCRIPTS) final String scriptDir,
             final ScriptManager scriptManager,
             final ScriptEngineManager scriptEngineManager) {
-        this.actionController = actionController;
         this.scriptDir = scriptDir;
         this.scriptManager = scriptManager;
         this.eventBus = eventBus;
@@ -81,8 +77,9 @@ public class ScriptPluginManager {
             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);
+                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, e,
+                        "Error reading savedVariables from '" + savedVariables.getPath() + "': "
+                                + e.getMessage(), ""));
             }
         }
     }
@@ -94,8 +91,8 @@ public class ScriptPluginManager {
         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);
+            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, e,"Error reading savedVariables to '"
+                    + savedVariables.getPath() + "': " + e.getMessage(), ""));
         }
     }