Tidy up Logging plugin.

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

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

@@ -24,7 +24,6 @@ package com.dmdirc.addons.logging;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 
@@ -50,7 +49,7 @@ public class HistoryWindow extends FrameContainer {
 
         WindowManager.getWindowManager().addWindow(parent, this);
 
-        final int frameBufferSize = IdentityManager.getGlobalConfig().getOptionInt(
+        final int frameBufferSize = parent.getConfigManager().getOptionInt(
                 "ui", "frameBufferSize");
         addLine(reader.getLinesAsString(Math.min(frameBufferSize, numLines)), false);
     }

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

@@ -29,14 +29,14 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.plugins.Plugin;
-import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
+import lombok.AllArgsConstructor;
+
 /**
  * The dcop command retrieves information from a dcop application.
  */
+@AllArgsConstructor
 public final class LoggingCommand extends Command implements
         IntelligentCommand {
 
@@ -46,33 +46,15 @@ public final class LoggingCommand extends Command implements
     public static final BaseCommandInfo INFO = new BaseCommandInfo(LOGGING,
             "logging - <set|help> [parameters]",
             CommandType.TYPE_SERVER);
+    /** Logging plugin. */
+    private final LoggingPlugin plugin;
 
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final PluginInfo pluginInfo = PluginManager.getPluginManager().getPluginInfoByName("logging");
-        if (pluginInfo == null) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Logging Plugin is not loaded.");
-            return;
-        }
-        final Plugin gotPlugin = pluginInfo.getPlugin();
-
-        if (!(gotPlugin instanceof LoggingPlugin)) {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Logging Plugin is not loaded.");
-            return;
-        }
-
-        final LoggingPlugin plugin = (LoggingPlugin) gotPlugin;
-
         if (args.getArguments().length > 0) {
-            if (args.getArguments()[0].equalsIgnoreCase("reload")) {
-                if (PluginManager.getPluginManager().reloadPlugin(pluginInfo.getFilename())) {
-                    sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Plugin reloaded.");
-                } else {
-                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "Plugin failed to reload.");
-                }
-            } else if (args.getArguments()[0].equalsIgnoreCase("history")) {
+            if (args.getArguments()[0].equalsIgnoreCase("history")) {
                 if (!plugin.showHistory(origin)) {
                     sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to open history for this window.");
                 }

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

@@ -29,6 +29,8 @@ import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.config.ConfigManager;
+import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
@@ -87,6 +89,10 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
     private final PluginInfo pluginInfo;
     /** The action controller to use. */
     private final ActionController actionController;
+    /** Global config. */
+    private final ConfigManager config;
+    /** Addon identity. */
+    private final Identity identity;
 
     /** Timer used to close idle files. */
     protected Timer idleFileTimer;
@@ -105,20 +111,23 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
      * @param actionController The action controller to register listeners with
      */
     public LoggingPlugin(final PluginInfo pluginInfo,
-            final ActionController actionController) {
+            final ActionController actionController,
+            final IdentityManager identityManager) {
         super();
 
         this.pluginInfo = pluginInfo;
         this.actionController = actionController;
+        config = identityManager.getGlobalConfiguration();
+        identity = identityManager.getGlobalAddonIdentity();
 
-        registerCommand(new LoggingCommand(), LoggingCommand.INFO);
+        registerCommand(new LoggingCommand(this), LoggingCommand.INFO);
     }
 
     /** {@inheritDoc} */
     @Override
     public void domainUpdated() {
-        IdentityManager.getAddonIdentity().setOption(getDomain(),
-                "general.directory", Main.getConfigDir() + "logs" + System.getProperty("file.separator"));
+        identity.setOption(getDomain(), "general.directory",
+                Main.getConfigDir() + "logs" + System.getProperty("file.separator"));
     }
 
     /**
@@ -139,7 +148,7 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
             }
         }
 
-        IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
+        config.addChangeListener(getDomain(), this);
 
         actionController.registerListener(this,
                 CoreActionType.CHANNEL_OPENED,
@@ -350,9 +359,9 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
                 final String overrideNick = isME ? getDisplayName(parser.getLocalClient()) : "";
 
                 if (type == CoreActionType.QUERY_MESSAGE || type == CoreActionType.QUERY_SELF_MESSAGE) {
-                    appendLine(filename, "<%s> %s", getDisplayName(client, overrideNick), (String) arguments[2]);
+                    appendLine(filename, "<%s> %s", getDisplayName(client, overrideNick), arguments[2]);
                 } else {
-                    appendLine(filename, "* %s %s", getDisplayName(client, overrideNick), (String) arguments[2]);
+                    appendLine(filename, "* %s %s", getDisplayName(client, overrideNick), arguments[2]);
                 }
                 break;
         }
@@ -865,20 +874,20 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
 
     /** Updates cached settings. */
     public void setCachedSettings() {
-        networkfolders = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "general.networkfolders");
-        filenamehash = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.filenamehash");
-        addtime = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "general.addtime");
-        stripcodes = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "general.stripcodes");
-        channelmodeprefix = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "general.channelmodeprefix");
-        autobackbuffer = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "backbuffer.autobackbuffer");
-        backbufferTimestamp = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "backbuffer.timestamp");
-        usedate = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.usedate");
-        timestamp = IdentityManager.getGlobalConfig().getOption(getDomain(), "general.timestamp");
-        usedateformat = IdentityManager.getGlobalConfig().getOption(getDomain(), "advanced.usedateformat");
-        historyLines = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "history.lines");
-        colour = IdentityManager.getGlobalConfig().getOption(getDomain(), "backbuffer.colour");
-        backbufferLines = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "backbuffer.lines");
-        logDirectory = IdentityManager.getGlobalConfig().getOption(getDomain(), "general.directory");
+        networkfolders = config.getOptionBool(getDomain(), "general.networkfolders");
+        filenamehash = config.getOptionBool(getDomain(), "advanced.filenamehash");
+        addtime = config.getOptionBool(getDomain(), "general.addtime");
+        stripcodes = config.getOptionBool(getDomain(), "general.stripcodes");
+        channelmodeprefix = config.getOptionBool(getDomain(), "general.channelmodeprefix");
+        autobackbuffer = config.getOptionBool(getDomain(), "backbuffer.autobackbuffer");
+        backbufferTimestamp = config.getOptionBool(getDomain(), "backbuffer.timestamp");
+        usedate = config.getOptionBool(getDomain(), "advanced.usedate");
+        timestamp = config.getOption(getDomain(), "general.timestamp");
+        usedateformat = config.getOption(getDomain(), "advanced.usedateformat");
+        historyLines = config.getOptionInt(getDomain(), "history.lines");
+        colour = config.getOption(getDomain(), "backbuffer.colour");
+        backbufferLines = config.getOptionInt(getDomain(), "backbuffer.lines");
+        logDirectory = config.getOption(getDomain(), "general.directory");
     }
 
     /** Open File. */

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.logging;
 
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.collections.MapList;
@@ -32,7 +33,7 @@ public class TestLoggingPlugin extends LoggingPlugin {
     public final MapList<Object, String> lines = new MapList<Object, String>();
 
     public TestLoggingPlugin() {
-        super(mock(PluginInfo.class), mock(ActionController.class));
+        super(mock(PluginInfo.class), mock(ActionController.class), IdentityManager.getIdentityManager());
     }
 
     @Override