Properly DI the lag display plugin.

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

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

@@ -0,0 +1,285 @@
+/*
+ * 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.ClientModule.GlobalConfig;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.ServerState;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.addons.lagdisplay.LagDisplayModule.LagDisplaySettingsDomain;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SelectionListener;
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
+import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.util.collections.RollingList;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+
+/**
+ * Manages the lifecycle of the lag display plugin.
+ */
+@Singleton
+public class LagDisplayManager implements ActionListener, ConfigChangeListener, SelectionListener {
+
+    /** Frame to listen to selection events on. */
+    // TODO: Selection/focus management should be behind an interface
+    private final MainFrame mainFrame;
+    /** Status bar to add panels to. */
+    private final SwingStatusBar statusBar;
+    private final Provider<LagDisplayPanel> panelProvider;
+    /** The settings domain to use. */
+    private final String domain;
+    /** Config to read global settings from. */
+    private final AggregateConfigProvider globalConfig;
+    /** A cache of ping times. */
+    private final Map<Connection, String> pings = new WeakHashMap<>();
+    /** Ping history. */
+    private final Map<Connection, RollingList<Long>> history = new HashMap<>();
+    /** Whether or not to show a graph in the info popup. */
+    private boolean showGraph = true;
+    /** Whether or not to show labels on that graph. */
+    private boolean showLabels = true;
+    /** The length of history to keep per-server. */
+    private int historySize = 100;
+    /** The panel currently in use. Null before {@link #load()} or after {@link #unload()}. */
+    private LagDisplayPanel panel;
+
+    @Inject
+    public LagDisplayManager(
+            final MainFrame mainFrame,
+            final SwingStatusBar statusBar,
+            final Provider<LagDisplayPanel> panelProvider,
+            @LagDisplaySettingsDomain final String domain,
+            @GlobalConfig final AggregateConfigProvider globalConfig) {
+        this.mainFrame = mainFrame;
+        this.statusBar = statusBar;
+        this.panelProvider = panelProvider;
+        this.domain = domain;
+        this.globalConfig = globalConfig;
+    }
+
+    public void load() {
+        statusBar.addComponent(panel);
+        mainFrame.addSelectionListener(this);
+
+        globalConfig.addChangeListener(domain, this);
+        readConfig();
+        ActionManager.getActionManager().registerListener(this,
+                CoreActionType.SERVER_GOTPING, CoreActionType.SERVER_NOPING,
+                CoreActionType.SERVER_DISCONNECTED,
+                CoreActionType.SERVER_PINGSENT, CoreActionType.SERVER_NUMERIC);
+
+        panel = panelProvider.get();
+    }
+
+    public void unload() {
+        mainFrame.removeSelectionListener(this);
+        statusBar.removeComponent(panel);
+        globalConfig.removeListener(this);
+        ActionManager.getActionManager().unregisterListener(this);
+
+        panel = null;
+    }
+
+    /** Reads the plugin's global configuration settings. */
+    private void readConfig() {
+        showGraph = globalConfig.getOptionBool(domain, "graph");
+        showLabels = globalConfig.getOptionBool(domain, "labels");
+        historySize = globalConfig.getOptionInt(domain, "history");
+    }
+
+    /**
+     * Retrieves the history of the specified server. If there is no history, a new list is added to
+     * the history map and returned.
+     *
+     * @param connection The connection whose history is being requested
+     *
+     * @return The history for the specified server
+     */
+    protected RollingList<Long> getHistory(final Connection connection) {
+        if (!history.containsKey(connection)) {
+            history.put(connection, new RollingList<Long>(historySize));
+        }
+        return history.get(connection);
+    }
+
+    /**
+     * Determines if the {@link ServerInfoDialog} should show a graph of the ping time for the
+     * current server.
+     *
+     * @return True if a graph should be shown, false otherwise
+     */
+    public boolean shouldShowGraph() {
+        return showGraph;
+    }
+
+    /**
+     * Determines if the {@link PingHistoryPanel} should show labels on selected points.
+     *
+     * @return True if labels should be shown, false otherwise
+     */
+    public boolean shouldShowLabels() {
+        return showLabels;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void selectionChanged(final TextFrame window) {
+        final FrameContainer source = window.getContainer();
+        if (source == null || source.getConnection() == null) {
+            panel.getComponent().setText("Unknown");
+        } else if (source.getConnection().getState() != ServerState.CONNECTED) {
+            panel.getComponent().setText("Not connected");
+        } else {
+            panel.getComponent().setText(getTime(source.getConnection()));
+        }
+        panel.refreshDialog();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void processEvent(final ActionType type, final StringBuffer format,
+            final Object... arguments) {
+        boolean useAlternate = false;
+
+        for (Object obj : arguments) {
+            if (obj instanceof FrameContainer
+                    && ((FrameContainer) obj).getConfigManager() != null) {
+                useAlternate = ((FrameContainer) obj).getConfigManager()
+                        .getOptionBool(domain, "usealternate");
+                break;
+            }
+        }
+
+        final TextFrame activeFrame = mainFrame.getActiveFrame();
+        final FrameContainer active = activeFrame == null ? null
+                : activeFrame.getContainer();
+        final boolean isActive = active != null
+                && arguments[0] instanceof Connection
+                && ((Connection) arguments[0]).equals(active.getConnection());
+
+        if (!useAlternate && type.equals(CoreActionType.SERVER_GOTPING)) {
+            final String value = formatTime(arguments[1]);
+
+            getHistory(((Connection) arguments[0])).add((Long) arguments[1]);
+            pings.put(((Connection) arguments[0]), value);
+
+            if (isActive) {
+                panel.getComponent().setText(value);
+            }
+
+            panel.refreshDialog();
+        } else if (!useAlternate && type.equals(CoreActionType.SERVER_NOPING)) {
+            final String value = formatTime(arguments[1]) + "+";
+
+            pings.put(((Connection) arguments[0]), value);
+
+            if (isActive) {
+                panel.getComponent().setText(value);
+            }
+
+            panel.refreshDialog();
+        } else if (type.equals(CoreActionType.SERVER_DISCONNECTED)) {
+            if (isActive) {
+                panel.getComponent().setText("Not connected");
+                pings.remove(arguments[0]);
+            }
+
+            panel.refreshDialog();
+        } else if (useAlternate && type.equals(CoreActionType.SERVER_PINGSENT)) {
+            ((Connection) arguments[0]).getParser().sendRawMessage("LAGCHECK_" + new Date().
+                    getTime());
+        } else if (useAlternate && type.equals(CoreActionType.SERVER_NUMERIC)
+                && ((Integer) arguments[1]) == 421
+                && ((String[]) arguments[2])[3].startsWith("LAGCHECK_")) {
+            try {
+                final long sent = Long.parseLong(((String[]) arguments[2])[3].substring(9));
+                final Long duration = new Date().getTime() - sent;
+                final String value = formatTime(duration);
+
+                pings.put((Connection) arguments[0], value);
+                getHistory(((Connection) arguments[0])).add(duration);
+
+                if (isActive) {
+                    panel.getComponent().setText(value);
+                }
+            } catch (NumberFormatException ex) {
+                pings.remove(arguments[0]);
+            }
+
+            if (format != null) {
+                format.delete(0, format.length());
+            }
+
+            panel.refreshDialog();
+        }
+    }
+
+    /**
+     * Retrieves the ping time for the specified connection.
+     *
+     * @param connection The connection whose ping time is being requested
+     *
+     * @return A String representation of the current lag, or "Unknown"
+     */
+    public String getTime(final Connection connection) {
+        return pings.get(connection) == null ? "Unknown" : pings.get(connection);
+    }
+
+    /**
+     * Formats the specified time so it's a nice size to display in the label.
+     *
+     * @param object An uncast Long representing the time to be formatted
+     *
+     * @return Formatted time string
+     */
+    protected String formatTime(final Object object) {
+        final Long time = (Long) object;
+
+        if (time >= 10000) {
+            return Math.round(time / 1000.0) + "s";
+        } else {
+            return time + "ms";
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void configChanged(final String domain, final String key) {
+        readConfig();
+    }
+
+}

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

@@ -24,24 +24,32 @@ package com.dmdirc.addons.lagdisplay;
 
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
 
+import javax.inject.Qualifier;
+
 import dagger.Module;
 import dagger.Provides;
 
 /**
  * DI module for the lag display plugin.
  */
-@Module(injects = {LagDisplayPanel.class}, addsTo = SwingModule.class)
+@Module(injects = {LagDisplayManager.class}, addsTo = SwingModule.class)
 public class LagDisplayModule {
 
-    private final LagDisplayPlugin plugin;
+    /** The domain for plugin settings. */
+    private final String domain;
+
+    @Qualifier
+    public static @interface LagDisplaySettingsDomain {
+    }
 
-    public LagDisplayModule(final LagDisplayPlugin plugin) {
-        this.plugin = plugin;
+    public LagDisplayModule(final String domain) {
+        this.domain = domain;
     }
 
     @Provides
-    public LagDisplayPlugin getPlugin() {
-        return plugin;
+    @LagDisplaySettingsDomain
+    public String getDomain() {
+        return domain;
     }
 
 }

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

@@ -22,263 +22,53 @@
 
 package com.dmdirc.addons.lagdisplay;
 
-import com.dmdirc.FrameContainer;
-import com.dmdirc.ServerState;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
-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.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.ActionListener;
-import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BasePlugin;
-import com.dmdirc.util.collections.RollingList;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.WeakHashMap;
 
 import dagger.ObjectGraph;
 
 /**
  * Displays the current server's lag in the status bar.
  */
-public final class LagDisplayPlugin extends BasePlugin implements
-        ActionListener, ConfigChangeListener, SelectionListener {
+public final class LagDisplayPlugin extends BasePlugin {
 
-    /** The panel we use in the status bar. */
-    private LagDisplayPanel panel;
-    /** A cache of ping times. */
-    private final Map<Connection, String> pings = new WeakHashMap<>();
-    /** Ping history. */
-    private final Map<Connection, RollingList<Long>> history = new HashMap<>();
-    /** Parent Swing UI. */
-    private final SwingController controller;
-    /** Whether or not to show a graph in the info popup. */
-    private boolean showGraph = true;
-    /** Whether or not to show labels on that graph. */
-    private boolean showLabels = true;
-    /** The length of history to keep per-server. */
-    private int historySize = 100;
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
-    /** Global config. */
-    private AggregateConfigProvider config;
+    /** The manager currently in use. */
+    private LagDisplayManager manager;
 
     /**
      * Creates a new LagDisplayPlugin.
      *
-     * @param controller The controller to add components to
      * @param pluginInfo This plugin's plugin info
      */
-    public LagDisplayPlugin(final SwingController controller,
-            final PluginInfo pluginInfo) {
-        super();
-        this.controller = controller;
+    public LagDisplayPlugin(final PluginInfo pluginInfo) {
         this.pluginInfo = pluginInfo;
-        config = controller.getGlobalConfig();
     }
 
     @Override
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
 
-        setObjectGraph(graph.plus(new LagDisplayModule(this)));
-        panel = getObjectGraph().get(LagDisplayPanel.class);
+        setObjectGraph(graph.plus(new LagDisplayModule(pluginInfo.getDomain())));
+        manager = getObjectGraph().get(LagDisplayManager.class);
     }
 
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        controller.getSwingStatusBar().addComponent(panel);
-        controller.getMainFrame().addSelectionListener(this);
-        config.addChangeListener(getDomain(), this);
-        readConfig();
-        ActionManager.getActionManager().registerListener(this,
-                CoreActionType.SERVER_GOTPING, CoreActionType.SERVER_NOPING,
-                CoreActionType.SERVER_DISCONNECTED,
-                CoreActionType.SERVER_PINGSENT, CoreActionType.SERVER_NUMERIC);
+        manager.load();
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
-        controller.getMainFrame().removeSelectionListener(this);
-        controller.getSwingStatusBar().removeComponent(panel);
-        config.removeListener(this);
-        ActionManager.getActionManager().unregisterListener(this);
-    }
-
-    /** Reads the plugin's global configuration settings. */
-    private void readConfig() {
-        showGraph = config.getOptionBool(getDomain(), "graph");
-        showLabels = config.getOptionBool(getDomain(), "labels");
-        historySize = config.getOptionInt(getDomain(), "history");
-    }
-
-    /**
-     * Retrieves the history of the specified server. If there is no history, a new list is added to
-     * the history map and returned.
-     *
-     * @param connection The connection whose history is being requested
-     *
-     * @return The history for the specified server
-     */
-    protected RollingList<Long> getHistory(final Connection connection) {
-        if (!history.containsKey(connection)) {
-            history.put(connection, new RollingList<Long>(historySize));
-        }
-        return history.get(connection);
-    }
-
-    /**
-     * Determines if the {@link ServerInfoDialog} should show a graph of the ping time for the
-     * current server.
-     *
-     * @return True if a graph should be shown, false otherwise
-     */
-    public boolean shouldShowGraph() {
-        return showGraph;
-    }
-
-    /**
-     * Determines if the {@link PingHistoryPanel} should show labels on selected points.
-     *
-     * @return True if labels should be shown, false otherwise
-     */
-    public boolean shouldShowLabels() {
-        return showLabels;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void selectionChanged(final TextFrame window) {
-        final FrameContainer source = window.getContainer();
-        if (source == null || source.getConnection() == null) {
-            panel.getComponent().setText("Unknown");
-        } else if (source.getConnection().getState() != ServerState.CONNECTED) {
-            panel.getComponent().setText("Not connected");
-        } else {
-            panel.getComponent().setText(getTime(source.getConnection()));
-        }
-        panel.refreshDialog();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void processEvent(final ActionType type, final StringBuffer format,
-            final Object... arguments) {
-        boolean useAlternate = false;
-
-        for (Object obj : arguments) {
-            if (obj instanceof FrameContainer
-                    && ((FrameContainer) obj).getConfigManager() != null) {
-                useAlternate = ((FrameContainer) obj).getConfigManager()
-                        .getOptionBool(getDomain(), "usealternate");
-                break;
-            }
-        }
-
-        final TextFrame activeFrame = controller.getMainFrame().getActiveFrame();
-        final FrameContainer active = activeFrame == null ? null
-                : activeFrame.getContainer();
-        final boolean isActive = active != null
-                && arguments[0] instanceof Connection
-                && ((Connection) arguments[0]).equals(active.getConnection());
-
-        if (!useAlternate && type.equals(CoreActionType.SERVER_GOTPING)) {
-            final String value = formatTime(arguments[1]);
-
-            getHistory(((Connection) arguments[0])).add((Long) arguments[1]);
-            pings.put(((Connection) arguments[0]), value);
-
-            if (isActive) {
-                panel.getComponent().setText(value);
-            }
-
-            panel.refreshDialog();
-        } else if (!useAlternate && type.equals(CoreActionType.SERVER_NOPING)) {
-            final String value = formatTime(arguments[1]) + "+";
-
-            pings.put(((Connection) arguments[0]), value);
-
-            if (isActive) {
-                panel.getComponent().setText(value);
-            }
-
-            panel.refreshDialog();
-        } else if (type.equals(CoreActionType.SERVER_DISCONNECTED)) {
-            if (isActive) {
-                panel.getComponent().setText("Not connected");
-                pings.remove(arguments[0]);
-            }
-
-            panel.refreshDialog();
-        } else if (useAlternate && type.equals(CoreActionType.SERVER_PINGSENT)) {
-            ((Connection) arguments[0]).getParser().sendRawMessage("LAGCHECK_" + new Date().
-                    getTime());
-        } else if (useAlternate && type.equals(CoreActionType.SERVER_NUMERIC)
-                && ((Integer) arguments[1]) == 421
-                && ((String[]) arguments[2])[3].startsWith("LAGCHECK_")) {
-            try {
-                final long sent = Long.parseLong(((String[]) arguments[2])[3].substring(9));
-                final Long duration = new Date().getTime() - sent;
-                final String value = formatTime(duration);
-
-                pings.put((Connection) arguments[0], value);
-                getHistory(((Connection) arguments[0])).add(duration);
-
-                if (isActive) {
-                    panel.getComponent().setText(value);
-                }
-            } catch (NumberFormatException ex) {
-                pings.remove(arguments[0]);
-            }
-
-            if (format != null) {
-                format.delete(0, format.length());
-            }
-
-            panel.refreshDialog();
-        }
-    }
-
-    /**
-     * Retrieves the ping time for the specified connection.
-     *
-     * @param connection The connection whose ping time is being requested
-     *
-     * @return A String representation of the current lag, or "Unknown"
-     */
-    public String getTime(final Connection connection) {
-        return pings.get(connection) == null ? "Unknown" : pings.get(connection);
-    }
-
-    /**
-     * Formats the specified time so it's a nice size to display in the label.
-     *
-     * @param object An uncast Long representing the time to be formatted
-     *
-     * @return Formatted time string
-     */
-    protected String formatTime(final Object object) {
-        final Long time = (Long) object;
-
-        if (time >= 10000) {
-            return Math.round(time / 1000.0) + "s";
-        } else {
-            return time + "ms";
-        }
+        manager.unload();
     }
 
     /** {@inheritDoc} */
@@ -287,29 +77,23 @@ public final class LagDisplayPlugin extends BasePlugin implements
         final PreferencesCategory cat = new PluginPreferencesCategory(
                 pluginInfo, "Lag display plugin", "");
         cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "usealternate",
+                pluginInfo.getDomain(), "usealternate",
                 "Alternate method", "Use an alternate method of determining "
                 + "lag which bypasses bouncers or proxies that may reply?",
                 manager.getConfigManager(), manager.getIdentity()));
         cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "graph", "Show graph", "Show a graph of ping times "
+                pluginInfo.getDomain(), "graph", "Show graph", "Show a graph of ping times "
                 + "for the current server in the information popup?",
                 manager.getConfigManager(), manager.getIdentity()));
         cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "labels", "Show labels", "Show labels on selected "
+                pluginInfo.getDomain(), "labels", "Show labels", "Show labels on selected "
                 + "points on the ping graph?",
                 manager.getConfigManager(), manager.getIdentity()));
         cat.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
-                getDomain(), "history", "Graph points", "Number of data points "
+                pluginInfo.getDomain(), "history", "Graph points", "Number of data points "
                 + "to plot on the graph, if enabled.",
                 manager.getConfigManager(), manager.getIdentity()));
         manager.getCategory("Plugins").addSubCategory(cat);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void configChanged(final String domain, final String key) {
-        readConfig();
-    }
-
 }

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

@@ -47,20 +47,20 @@ public class PingHistoryPanel extends JPanel {
      * class).
      */
     private static final long serialVersionUID = 1;
-    /** The plugin that this panel is for. */
-    protected final LagDisplayPlugin plugin;
+    /** The manager that this panel is for. */
+    protected final LagDisplayManager manager;
     /** The history that we're graphing. */
     protected final RollingList<Long> history;
     /** The maximum ping value. */
-    protected long maximum = 0L;
+    protected long maximum;
 
     /**
      * Creates a new history panel for the specified plugin.
      *
-     * @param plugin    The plugin that owns this panel
+     * @param manager   The manager that owns this panel
      * @param mainFrame Swing main frame
      */
-    public PingHistoryPanel(final LagDisplayPlugin plugin,
+    public PingHistoryPanel(final LagDisplayManager manager,
             final MainFrame mainFrame) {
         super();
 
@@ -68,9 +68,8 @@ public class PingHistoryPanel extends JPanel {
         setMaximumSize(new Dimension(Integer.MAX_VALUE, 100));
         setOpaque(false);
 
-        this.plugin = plugin;
-        history = plugin.getHistory(mainFrame.getActiveFrame().getContainer()
-                .getConnection());
+        this.manager = manager;
+        history = manager.getHistory(mainFrame.getActiveFrame().getContainer().getConnection());
 
         for (Long value : history.getList()) {
             maximum = Math.max(value, maximum);
@@ -115,8 +114,8 @@ public class PingHistoryPanel extends JPanel {
 
             g.drawRect((int) x - 1, (int) y - 1, 2, 2);
 
-            if (plugin.shouldShowLabels() && last1 > -1 && (last2 <= last1 || last1 >= value)) {
-                final String text = plugin.formatTime(last1);
+            if (manager.shouldShowLabels() && last1 > -1 && (last2 <= last1 || last1 >= value)) {
+                final String text = manager.formatTime(last1);
                 final Rectangle2D rect = g.getFont().getStringBounds(text,
                         ((Graphics2D) g).getFontRenderContext());
                 final int width = 10 + (int) rect.getWidth();

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

@@ -49,8 +49,8 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
      * class).
      */
     private static final long serialVersionUID = 3;
-    /** The lag display plugin. */
-    protected final LagDisplayPlugin plugin;
+    /** The lag display manager. */
+    protected final LagDisplayManager manager;
     /** Swing main frame. */
     private final MainFrame mainFrame;
     /** Server manager to retrieve servers from. */
@@ -59,19 +59,19 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
     /**
      * Creates a new ServerInfoDialog.
      *
-     * @param plugin        The {@link LagDisplayPlugin} we're using for info
+     * @param manager       The {@link LagDisplayManager} we're using for info
      * @param parent        The {@link JPanel} to use for positioning
      * @param mainFrame     The frame that will own this dialog.
      * @param serverManager The manager to use to iterate servers.
      */
     public ServerInfoDialog(
-            final LagDisplayPlugin plugin,
+            final LagDisplayManager manager,
             @Unbound final StatusbarPanel parent,
             final MainFrame mainFrame,
             final ServerManager serverManager) {
         super(parent, mainFrame);
 
-        this.plugin = plugin;
+        this.manager = manager;
         this.mainFrame = mainFrame;
         this.serverManager = serverManager;
     }
@@ -84,8 +84,8 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
         if (servers.isEmpty()) {
             panel.add(new JLabel("No open servers."));
         } else {
-            if (plugin.shouldShowGraph()) {
-                panel.add(new PingHistoryPanel(plugin, mainFrame), "span, grow, wrap");
+            if (manager.shouldShowGraph()) {
+                panel.add(new PingHistoryPanel(manager, mainFrame), "span, grow, wrap");
                 panel.add(new JSeparator(), "span, grow, wrap");
             }
 
@@ -94,7 +94,7 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
                 panel.add(new JLabel(server.getState() == ServerState.CONNECTED
                         ? server.getNetwork() : "---", JLabel.CENTER), "grow");
                 panel.add(new JLabel(server.getState() == ServerState.CONNECTED
-                        ? plugin.getTime(server) : "---", JLabel.RIGHT), "grow, wrap");
+                        ? manager.getTime(server) : "---", JLabel.RIGHT), "grow, wrap");
             }
         }
     }

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -31,7 +31,6 @@ import com.dmdirc.addons.ui_swing.commands.PopInCommand;
 import com.dmdirc.addons.ui_swing.commands.PopOutCommand;
 import com.dmdirc.addons.ui_swing.commands.ServerSettings;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
 import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -742,16 +741,4 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         return swingManager.getMainFrame();
     }
 
-    /**
-     * Retrieves the status bar that's in use.
-     *
-     * @return The status bar that's in use.
-     *
-     * @deprecated Should be injected where needed.
-     */
-    @Deprecated
-    public SwingStatusBar getSwingStatusBar() {
-        return swingManager.getMainFrame().getStatusBar();
-    }
-
 }