Remove some singleton methods from some more plugins.

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

src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.freedesktop_notifications;
 
+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;
@@ -61,15 +63,27 @@ public final class FreeDesktopNotificationsPlugin
     private boolean stripcodes;
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
+    /** Global config. */
+    private final ConfigManager config;
+    /** Addon identity. */
+    private final Identity identity;
+    /** Plugin manager instance. */
+    private final PluginManager pluginManager;
 
     /**
      * Creates a new instance of this plugin.
      *
      * @param pluginInfo This plugin's plugin info
+     * @param identityManager Identity Manager instance
      */
-    public FreeDesktopNotificationsPlugin(final PluginInfo pluginInfo) {
+    public FreeDesktopNotificationsPlugin(final PluginInfo pluginInfo,
+            final IdentityManager identityManager,
+            final PluginManager pluginManager) {
         super(pluginInfo.getMetaData());
         this.pluginInfo = pluginInfo;
+        this.pluginManager = pluginManager;
+        config = identityManager.getGlobalConfiguration();
+        identity = identityManager.getGlobalAddonIdentity();
         registerCommand(new FDNotifyCommand(this), FDNotifyCommand.INFO);
     }
 
@@ -144,11 +158,11 @@ public final class FreeDesktopNotificationsPlugin
      */
     @Override
     public void onLoad() {
-        IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
+        config.addChangeListener(getDomain(), this);
         setCachedSettings();
 
         // Extract required Files
-        final PluginInfo pi = PluginManager.getPluginManager().getPluginInfoByName("freedesktop_notifications");
+        final PluginInfo pi = pluginManager.getPluginInfoByName("freedesktop_notifications");
 
         // This shouldn't actually happen, but check to make sure.
         if (pi != null) {
@@ -175,14 +189,14 @@ public final class FreeDesktopNotificationsPlugin
      */
     @Override
     public synchronized void onUnload() {
-        IdentityManager.getGlobalConfig().removeListener(this);
+        config.removeListener(this);
         super.onUnload();
     }
 
     /** {@inheritDoc} */
     @Override
     public void domainUpdated() {
-        IdentityManager.getAddonIdentity().setOption(getDomain(),
+        identity.setOption(getDomain(),
                 "general.icon", getFilesDirString() + "icon.png");
     }
 
@@ -218,16 +232,11 @@ public final class FreeDesktopNotificationsPlugin
     }
 
     private void setCachedSettings() {
-        timeout = IdentityManager.getGlobalConfig().getOptionInt(getDomain(),
-                "general.timeout");
-        icon = IdentityManager.getGlobalConfig().getOption(getDomain(),
-                "general.icon");
-        escapehtml = IdentityManager.getGlobalConfig().getOptionBool(
-                getDomain(), "advanced.escapehtml");
-        strictescape = IdentityManager.getGlobalConfig().getOptionBool(
-                getDomain(), "advanced.strictescape");
-        stripcodes = IdentityManager.getGlobalConfig().getOptionBool(
-                getDomain(), "advanced.stripcodes");
+        timeout = config.getOptionInt(getDomain(), "general.timeout");
+        icon = config.getOption(getDomain(), "general.icon");
+        escapehtml = config.getOptionBool( getDomain(), "advanced.escapehtml");
+        strictescape = config.getOptionBool(getDomain(), "advanced.strictescape");
+        stripcodes = config.getOptionBool(getDomain(), "advanced.stripcodes");
     }
 
     /** {@inheritDoc} */

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.identd;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
@@ -82,7 +81,7 @@ public final class IdentClient implements Runnable {
             in = new BufferedReader(new InputStreamReader(mySocket.getInputStream()));
             final String inputLine;
             if ((inputLine = in.readLine()) != null) {
-                out.println(getIdentResponse(inputLine, IdentityManager.getGlobalConfig()));
+                out.println(getIdentResponse(inputLine, myPlugin.getConfig()));
             }
         } catch (IOException e) {
             if (thisThread == myThread) {

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.identd;
 import com.dmdirc.Server;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
@@ -40,6 +41,8 @@ import com.dmdirc.util.validators.PortValidator;
 import java.util.ArrayList;
 import java.util.List;
 
+import lombok.Getter;
+
 /**
  * The Identd plugin answers ident requests from IRC servers.
  */
@@ -53,6 +56,9 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
     private final PluginInfo pluginInfo;
     /** The action controller to use. */
     private final ActionController actionController;
+    /** Global config. */
+    @Getter
+    private ConfigManager config;
 
     /**
      * Creates a new instance of this plugin.
@@ -61,11 +67,13 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
      * @param actionController The action controller to register listeners with
      */
     public IdentdPlugin(final PluginInfo pluginInfo,
-            final ActionController actionController) {
+            final ActionController actionController,
+            final IdentityManager identityManager) {
         super();
 
         this.pluginInfo = pluginInfo;
         this.actionController = actionController;
+        config = identityManager.getGlobalConfiguration();
     }
 
     /**
@@ -80,8 +88,7 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
                 CoreActionType.SERVER_CONNECTERROR);
 
         myServer = new IdentdServer(this);
-        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
-                "advanced.alwaysOn")) {
+        if (config.getOptionBool(getDomain(), "advanced.alwaysOn")) {
             myServer.startServer();
         }
     }
@@ -116,10 +123,10 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
         } else if (type == CoreActionType.SERVER_CONNECTED
                 || type == CoreActionType.SERVER_CONNECTERROR) {
             synchronized (servers) {
-                servers.remove((Server) arguments[0]);
+                servers.remove(arguments[0]);
 
-                if (servers.isEmpty() && !IdentityManager.getGlobalConfig()
-                        .getOptionBool(getDomain(), "advanced.alwaysOn")) {
+                if (servers.isEmpty() && !config.getOptionBool(getDomain(),
+                        "advanced.alwaysOn")) {
                     myServer.stopServer();
                 }
             }

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

@@ -22,12 +22,8 @@
 
 package com.dmdirc.addons.identd;
 
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
-
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -122,18 +118,13 @@ public final class IdentdServer implements Runnable {
     public void startServer() {
         if (myThread == null) {
             try {
-                final int identPort = IdentityManager.getGlobalConfig().getOptionInt(myPlugin.getDomain(), "advanced.port");
+                final int identPort = myPlugin.getConfig().getOptionInt(
+                        myPlugin.getDomain(), "advanced.port");
                 serverSocket = new ServerSocket(identPort);
                 myThread = new Thread(this);
                 myThread.start();
             } catch (IOException e) {
-                Logger.userError(ErrorLevel.MEDIUM, "Unable to start identd server: " + e.getMessage());
-                if (e.getMessage().equals("Permission denied")) {
-                    final PluginInfo plugin = PluginManager.getPluginManager().getPluginInfoByName("identd");
-                    if (plugin != null && PluginManager.getPluginManager().delPlugin(plugin.getMetaData().getRelativeFilename())) {
-                        PluginManager.getPluginManager().updateAutoLoad(plugin);
-                    }
-                }
+                Logger.userError(ErrorLevel.HIGH, "Unable to start identd server: " + e.getMessage());
             }
         }
     }

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

@@ -21,6 +21,7 @@
  */
 package com.dmdirc.addons.lagdisplay;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupPanel;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupWindow;
 
@@ -40,21 +41,26 @@ public class LagDisplayPanel extends StatusbarPopupPanel<JLabel> {
     private static final long serialVersionUID = 2;
     /** Lag display plugin. */
     private final LagDisplayPlugin plugin;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates a new {@link LagDisplayPanel} for the specified plugin.
      *
      * @param plugin The plugin that owns this panel
+     * @param controller Parent Swing controller
      */
-    public LagDisplayPanel(final LagDisplayPlugin plugin) {
+    public LagDisplayPanel(final LagDisplayPlugin plugin,
+            final SwingController controller) {
         super(new JLabel());
 
         this.plugin = plugin;
+        this.controller = controller;
     }
 
     /** {@inheritDoc} */
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new ServerInfoDialog(plugin, this);
+        return new ServerInfoDialog(plugin, this, controller);
     }
 }

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

@@ -32,7 +32,6 @@ import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
@@ -42,7 +41,6 @@ import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.collections.RollingList;
 
 import java.util.Date;
@@ -57,7 +55,7 @@ public final class LagDisplayPlugin extends BasePlugin implements
         ActionListener, ConfigChangeListener, SelectionListener {
 
     /** The panel we use in the status bar. */
-    private final LagDisplayPanel panel = new LagDisplayPanel(this);
+    private final LagDisplayPanel panel;
     /** A cache of ping times. */
     private final Map<Server, String> pings = new WeakHashMap<Server, String>();
     /** Ping history. */
@@ -73,6 +71,8 @@ public final class LagDisplayPlugin extends BasePlugin implements
     private int historySize = 100;
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
+    /** Global config. */
+    private ConfigManager config;
 
     /**
      * Creates a new LagDisplayPlugin.
@@ -85,6 +85,8 @@ public final class LagDisplayPlugin extends BasePlugin implements
         super();
         this.controller = controller;
         this.pluginInfo = pluginInfo;
+        config = controller.getGlobalConfig();
+        panel = new LagDisplayPanel(this, controller);
     }
 
     /** {@inheritDoc} */
@@ -92,7 +94,7 @@ public final class LagDisplayPlugin extends BasePlugin implements
     public void onLoad() {
         controller.getSwingStatusBar().addComponent(panel);
         controller.getMainFrame().addSelectionListener(this);
-        IdentityManager.getGlobalConfig().addChangeListener(getDomain(), this);
+        config.addChangeListener(getDomain(), this);
         readConfig();
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.SERVER_GOTPING, CoreActionType.SERVER_NOPING,
@@ -105,16 +107,15 @@ public final class LagDisplayPlugin extends BasePlugin implements
     public void onUnload() {
         controller.getMainFrame().removeSelectionListener(this);
         controller.getSwingStatusBar().removeComponent(panel);
-        IdentityManager.getConfigIdentity().removeListener(this);
+        config.removeListener(this);
         ActionManager.getActionManager().unregisterListener(this);
     }
 
     /** Reads the plugin's global configuration settings. */
     private void readConfig() {
-        final ConfigManager manager = IdentityManager.getGlobalConfig();
-        showGraph = manager.getOptionBool(getDomain(), "graph");
-        showLabels = manager.getOptionBool(getDomain(), "labels");
-        historySize = manager.getOptionInt(getDomain(), "history");
+        showGraph = config.getOptionBool(getDomain(), "graph");
+        showLabels = config.getOptionBool(getDomain(), "labels");
+        historySize = config.getOptionInt(getDomain(), "history");
     }
 
     /**
@@ -180,9 +181,7 @@ public final class LagDisplayPlugin extends BasePlugin implements
             }
         }
 
-        final TextFrame activeFrame = ((SwingController) PluginManager
-                .getPluginManager().getPluginInfoByName("ui_swing").getPlugin())
-                .getMainFrame().getActiveFrame();
+        final TextFrame activeFrame = controller.getMainFrame().getActiveFrame();
         final FrameContainer active = activeFrame == null ? null
                 : activeFrame.getContainer();
 
@@ -210,7 +209,7 @@ public final class LagDisplayPlugin extends BasePlugin implements
         } else if (type.equals(CoreActionType.SERVER_DISCONNECTED)) {
             if (((Server) arguments[0]).isChild(active) || arguments[0] == active) {
                 panel.getComponent().setText("Not connected");
-                pings.remove((Server) arguments[0]);
+                pings.remove(arguments[0]);
             }
 
             panel.refreshDialog();
@@ -231,7 +230,7 @@ public final class LagDisplayPlugin extends BasePlugin implements
                     panel.getComponent().setText(value);
                 }
             } catch (NumberFormatException ex) {
-                pings.remove((Server) arguments[0]);
+                pings.remove(arguments[0]);
             }
 
             if (format != null) {

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

@@ -22,8 +22,7 @@
 
 package com.dmdirc.addons.lagdisplay;
 
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.util.collections.RollingList;
 
 import java.awt.Color;
@@ -62,8 +61,10 @@ public class PingHistoryPanel extends JPanel {
      * Creates a new history panel for the specified plugin.
      *
      * @param plugin The plugin that owns this panel
+     * @param mainFrame Swing main frame
      */
-    public PingHistoryPanel(final LagDisplayPlugin plugin) {
+    public PingHistoryPanel(final LagDisplayPlugin plugin,
+            final MainFrame mainFrame) {
         super();
 
         setMinimumSize(new Dimension(50, 100));
@@ -71,9 +72,7 @@ public class PingHistoryPanel extends JPanel {
         setOpaque(false);
 
         this.plugin = plugin;
-        this.history = plugin.getHistory(((SwingController) PluginManager
-                .getPluginManager().getPluginInfoByName("ui_swing")
-                .getPlugin()).getMainFrame().getActiveFrame().getContainer()
+        history = plugin.getHistory(mainFrame.getActiveFrame().getContainer()
                 .getServer());
 
         for (Long value : history.getList()) {

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

@@ -25,11 +25,10 @@ package com.dmdirc.addons.lagdisplay;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.ServerState;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPanel;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupWindow;
-import com.dmdirc.plugins.PluginManager;
-
 import java.util.List;
 
 import javax.swing.JLabel;
@@ -53,20 +52,23 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
 
     /** The lag display plugin. */
     protected final LagDisplayPlugin plugin;
+    /** Swing main frame. */
+    private final MainFrame mainFrame;
 
     /**
      * Creates a new ServerInfoDialog.
      *
      * @param ldp The {@link LagDisplayPlugin} we're using for info
      * @param parent The {@link JPanel} to use for positioning
+     * @param controller Parent Swing controller
      */
-    public ServerInfoDialog(final LagDisplayPlugin ldp, final StatusbarPanel parent) {
-        super(((SwingController) PluginManager.getPluginManager()
-                .getPluginInfoByName("ui_swing").getPlugin()), parent,
-                ((SwingController) PluginManager.getPluginManager()
-                .getPluginInfoByName("ui_swing").getPlugin()).getMainFrame());
+    public ServerInfoDialog(final LagDisplayPlugin ldp,
+            final StatusbarPanel parent,
+            final SwingController controller) {
+        super(controller, parent, controller.getMainFrame());
 
         plugin = ldp;
+        mainFrame = controller.getMainFrame();
     }
 
     /** {@inheritDoc} */
@@ -78,7 +80,7 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
             panel.add(new JLabel("No open servers."));
         } else {
             if (plugin.shouldShowGraph()) {
-                panel.add(new PingHistoryPanel(plugin), "span, grow, wrap");
+                panel.add(new PingHistoryPanel(plugin, mainFrame), "span, grow, wrap");
                 panel.add(new JSeparator(), "span, grow, wrap");
             }