Tidy up some plugins

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

src/com/dmdirc/addons/urlcatcher/UrlCatcherPlugin.java

@@ -24,13 +24,13 @@ package com.dmdirc.addons.urlcatcher;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Raw;
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.ui.messages.Styliser;
 
@@ -45,7 +45,11 @@ public class UrlCatcherPlugin extends BaseCommandPlugin implements
         ActionListener, ConfigChangeListener {
 
     /* URLs and the number of times they were mentioned. */
-    private final Map<String, Integer> urls = new HashMap<String, Integer>();
+    private final Map<String, Integer> urls = new HashMap<>();
+    /** Controller to read settings from. */
+    private final IdentityController identityController;
+    /** Controller to listen to action events from. */
+    private final ActionController actionController;
     /** Whether to capture URLs from the raw window. */
     private boolean captureRaw = false;
 
@@ -53,18 +57,24 @@ public class UrlCatcherPlugin extends BaseCommandPlugin implements
      * Creates a new instance of this plugin.
      *
      * @param commandController Command controller to register commands
+     * @param identityController Controller to load settings from.
+     * @param actionController Controller to listen to action events from.
      */
-    public UrlCatcherPlugin(final CommandController commandController) {
+    public UrlCatcherPlugin(
+            final CommandController commandController,
+            final IdentityController identityController,
+            final ActionController actionController) {
         super(commandController);
+        this.identityController = identityController;
+        this.actionController = actionController;
         registerCommand(new UrlListCommand(this), UrlListCommand.INFO);
     }
 
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        ActionManager.getActionManager().registerListener(this,
-                CoreActionType.CLIENT_LINE_ADDED);
-        IdentityManager.getIdentityManager().getGlobalConfiguration().addChangeListener(getDomain(), this);
+        actionController.registerListener(this, CoreActionType.CLIENT_LINE_ADDED);
+        identityController.getGlobalConfiguration().addChangeListener(getDomain(), this);
         updateConfig();
         super.onLoad();
     }
@@ -72,8 +82,8 @@ public class UrlCatcherPlugin extends BaseCommandPlugin implements
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
-        ActionManager.getActionManager().unregisterListener(this);
-        IdentityManager.getIdentityManager().getGlobalConfiguration().removeListener(this);
+        actionController.unregisterListener(this);
+        identityController.getGlobalConfiguration().removeListener(this);
         super.onUnload();
     }
 
@@ -81,7 +91,7 @@ public class UrlCatcherPlugin extends BaseCommandPlugin implements
      * Re-reads the configuration of the URL catcher plugin.
      */
     private void updateConfig() {
-        captureRaw = IdentityManager.getIdentityManager().getGlobalConfiguration().getOptionBool(getDomain(), "captureraw");
+        captureRaw = identityController.getGlobalConfiguration().getOptionBool(getDomain(), "captureraw");
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/userlevel/UserLevelPlugin.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.userlevel;
 
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.plugins.implementations.BasePlugin;
@@ -36,38 +36,44 @@ import com.dmdirc.plugins.implementations.BasePlugin;
 import java.util.HashMap;
 import java.util.Map;
 
+import lombok.RequiredArgsConstructor;
+
 /**
  * Allows the client to assign user levels to users (based on hostname matches),
  * and for actions/plugins to check those levels.
  */
+@RequiredArgsConstructor
 public class UserLevelPlugin extends BasePlugin implements ActionListener,
         ConfigChangeListener {
 
     /** The domain used for userlevels. */
     private static final String DOMAIN = "userlevels";
     /** A map of hostmasks to associated level numbers. */
-    private static final Map<String, Integer> LEVELS = new HashMap<String, Integer>();
+    private static final Map<String, Integer> LEVELS = new HashMap<>();
+
+    /** The identity controller to use to read settings. */
+    private final IdentityController identityController;
+    /** The action controller to add components to. */
+    private final ActionController actionController;
 
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        ActionManager.getActionManager().registerListener(this,
-                CoreActionType.CHANNEL_JOIN);
-        ActionManager.getActionManager().registerComponents(
+        actionController.registerListener(this, CoreActionType.CHANNEL_JOIN);
+        actionController.registerComponents(
                 new ActionComponent[]{
                     new AccessLevelComponent(),
                     new ChannelAccessLevelComponent()
                 });
-        IdentityManager.getIdentityManager().getGlobalConfiguration()
-                .addChangeListener(DOMAIN, this);
+        identityController.getGlobalConfiguration().addChangeListener(DOMAIN, this);
         loadLevels();
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
-        ActionManager.getActionManager().unregisterListener(this);
-        IdentityManager.getIdentityManager().getGlobalConfiguration().removeListener(this);
+        actionController.unregisterListener(this);
+        identityController.getGlobalConfiguration().removeListener(this);
     }
 
     /** {@inheritDoc} */
@@ -127,7 +133,7 @@ public class UserLevelPlugin extends BasePlugin implements ActionListener,
     private void loadLevels() {
         LEVELS.clear();
 
-        for (Map.Entry<String, String> item : IdentityManager.getIdentityManager()
+        for (Map.Entry<String, String> item : identityController
                 .getGlobalConfiguration().getOptions(DOMAIN).entrySet()) {
             try {
                 LEVELS.put(item.getKey(), Integer.parseInt(item.getValue()));

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -30,13 +30,13 @@ import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-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.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
@@ -57,7 +57,9 @@ public final class WindowStatusPlugin extends BasePlugin
     /** The panel we use in the status bar. */
     private final WindowStatusPanel panel;
     /** Parent Swing UI. */
-    private SwingController controller;
+    private final SwingController controller;
+    /** Identity controller to read settings from. */
+    private final IdentityController identityController;
     /** Should we show the real name in queries? */
     private boolean showname;
     /** Should we show users without modes? */
@@ -70,11 +72,18 @@ public final class WindowStatusPlugin extends BasePlugin
     /**
      * Creates a new instance of WindowStatusPlugin.
      *
-     * @param pluginInfo This plugin's plugin info
+     * @param pluginInfo This plugin's plugin info.
+     * @param controller The parent {@link SwingController}.
+     * @param identityController The controller to read settings from.
      */
-    public WindowStatusPlugin(final PluginInfo pluginInfo) {
+    public WindowStatusPlugin(
+            final PluginInfo pluginInfo,
+            final SwingController controller,
+            final IdentityController identityController) {
         super();
         this.pluginInfo = pluginInfo;
+        this.controller = controller;
+        this.identityController = identityController;
 
         panel = UIUtilities.invokeAndWait(
                 new Callable<WindowStatusPanel>() {
@@ -90,12 +99,9 @@ public final class WindowStatusPlugin extends BasePlugin
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        controller = (SwingController) pluginInfo.getMetaData().getManager()
-                .getPluginInfoByName("ui_swing").getPlugin();
         controller.getSwingStatusBar().addComponent(panel);
         controller.getMainFrame().addSelectionListener(this);
-        IdentityManager.getIdentityManager().getGlobalConfiguration()
-                .addChangeListener(getDomain(), this);
+        identityController.getGlobalConfiguration().addChangeListener(getDomain(), this);
         updateCache();
     }
 
@@ -104,7 +110,6 @@ public final class WindowStatusPlugin extends BasePlugin
     public void onUnload() {
         controller.getMainFrame().removeSelectionListener(this);
         controller.getSwingStatusBar().removeComponent(panel);
-        controller = null;
     }
 
     /** {@inheritDoc} */
@@ -115,11 +120,11 @@ public final class WindowStatusPlugin extends BasePlugin
 
     /** Updates the cached config settings. */
     private void updateCache() {
-        showname = IdentityManager.getIdentityManager().getGlobalConfiguration()
+        showname = identityController.getGlobalConfiguration()
                 .getOptionBool(getDomain(), "client.showname");
-        shownone = IdentityManager.getIdentityManager().getGlobalConfiguration()
+        shownone = identityController.getGlobalConfiguration()
                 .getOptionBool(getDomain(), "channel.shownone");
-        nonePrefix = IdentityManager.getIdentityManager().getGlobalConfiguration()
+        nonePrefix = identityController.getGlobalConfiguration()
                 .getOption(getDomain(), "channel.noneprefix");
         updateStatus();
     }
@@ -129,7 +134,7 @@ public final class WindowStatusPlugin extends BasePlugin
         final TextFrame active = controller.getMainFrame().getActiveFrame();
 
         if (active != null) {
-            updateStatus(active == null ? null : active.getContainer());
+            updateStatus(active.getContainer());
         }
     }
 
@@ -149,8 +154,8 @@ public final class WindowStatusPlugin extends BasePlugin
             textString.append(((Server) current).getName());
         } else if (current instanceof Channel) {
             final ChannelInfo chan = ((Channel) current).getChannelInfo();
-            final Map<Integer, String> names = new HashMap<Integer, String>();
-            final Map<Integer, Integer> types = new HashMap<Integer, Integer>();
+            final Map<Integer, String> names = new HashMap<>();
+            final Map<Integer, Integer> types = new HashMap<>();
 
             textString.append(chan.getName());
             textString.append(" - Nicks: ");

test/com/dmdirc/addons/urlcatcher/UrlCatcherPluginTest.java

@@ -26,7 +26,9 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.ui.messages.Styliser;
 
 import org.junit.Before;
@@ -43,18 +45,20 @@ public class UrlCatcherPluginTest {
     @Mock private FrameContainer container;
     @Mock private ConfigManager manager;
     @Mock private CommandController controller;
+    @Mock private IdentityController identityController;
+    @Mock private ActionController actionController;
+    private UrlCatcherPlugin plugin;
 
     @Before
     public void setupClass() {
         when(container.getConfigManager()).thenReturn(manager);
         final Styliser styliser = new Styliser(container);
         when(container.getStyliser()).thenReturn(styliser);
+        plugin = new UrlCatcherPlugin(controller, identityController, actionController);
     }
 
     @Test
     public void testURLCounting() throws InvalidIdentityFileException {
-        final UrlCatcherPlugin plugin = new UrlCatcherPlugin(controller);
-
         plugin.processEvent(CoreActionType.CHANNEL_MESSAGE, null,
                 container, "This is a message - http://www.google.com/ foo");
         plugin.processEvent(CoreActionType.CHANNEL_MESSAGE, null,
@@ -68,8 +72,6 @@ public class UrlCatcherPluginTest {
 
     @Test
     public void testURLCatching() throws InvalidIdentityFileException {
-        final UrlCatcherPlugin plugin = new UrlCatcherPlugin(controller);
-
         plugin.processEvent(CoreActionType.CHANNEL_MESSAGE, null,
                 container, "http://www.google.com/ www.example.com foo://bar.baz");
         plugin.processEvent(CoreActionType.CHANNEL_MESSAGE, null,