Tidy various plugins.

In particular make the DNS plugin use the DNS dagger module, not
the debug module. Testing++.

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

src/com/dmdirc/addons/dns/DNSPlugin.java

@@ -22,14 +22,13 @@
 
 package com.dmdirc.addons.dns;
 
-import com.dmdirc.addons.debug.DebugModule;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
-import java.util.List;
+import java.util.Collection;
 
 import dagger.ObjectGraph;
 
@@ -42,7 +41,7 @@ public final class DNSPlugin extends BaseCommandPlugin {
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
 
-        setObjectGraph(graph.plus(new DebugModule()));
+        setObjectGraph(graph.plus(new DNSModule()));
         registerCommand(DNSCommand.class, DNSCommand.INFO);
     }
 
@@ -54,7 +53,7 @@ public final class DNSPlugin extends BaseCommandPlugin {
      * @return Resolved IP(s)
      */
     public static String getIPs(final String hostname) {
-        List<String> results = new ArrayList<>();
+        Collection<String> results = new ArrayList<>();
 
         try {
             final InetAddress[] ips = InetAddress.getAllByName(hostname);

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

@@ -27,6 +27,7 @@ import com.dmdirc.ServerManager;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.util.io.StreamUtils;
 
@@ -117,7 +118,7 @@ public class IdentClient implements Runnable {
      *
      * @return the ident response for the given line
      */
-    protected String getIdentResponse(final String input, final AggregateConfigProvider config) {
+    protected String getIdentResponse(final String input, final ReadOnlyConfigProvider config) {
         final String unescapedInput = unescapeString(input);
         final String[] bits = unescapedInput.replaceAll("\\s+", "").split(",", 2);
         if (bits.length < 2) {
@@ -149,7 +150,6 @@ public class IdentClient implements Runnable {
 
         final String osName = System.getProperty("os.name").toLowerCase();
         final String os;
-        final String username;
 
         final String customSystem = config.getOption(domain, "advanced.customSystem");
         if (config.getOptionBool(domain, "advanced.useCustomSystem") && customSystem
@@ -179,6 +179,7 @@ public class IdentClient implements Runnable {
         }
 
         final String customName = config.getOption(domain, "general.customName");
+        final String username;
         if (config.getOptionBool(domain, "general.useCustomName") && customName
                 != null && !customName.isEmpty() && customName.length() < 513) {
             username = customName;

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

@@ -90,14 +90,14 @@ public class IdentdPlugin extends BasePlugin {
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 domain, "general.useUsername", "Use connection "
                 + "username rather than system username", "If this is enabled,"
-                + " the username for the connection will be used rather than " + "'" + System.
-                getProperty("user.name") + "'",
+                + " the username for the connection will be used rather than '"
+                + System.getProperty("user.name") + '\'',
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 domain, "general.useNickname", "Use connection "
                 + "nickname rather than system username", "If this is enabled, "
-                + "the nickname for the connection will be used rather than " + "'" + System.
-                getProperty("user.name") + "'",
+                + "the nickname for the connection will be used rather than '"
+                + System.getProperty("user.name") + '\'',
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 domain, "general.useCustomName", "Use custom name" + " all the time",

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

@@ -54,7 +54,7 @@ public final class IdentdServer implements Runnable {
     /** Server manager. */
     private final ServerManager serverManager;
     /** Have we failed to start this server previously? */
-    private boolean failed = false;
+    private boolean failed;
     /** Global configuration to read plugin's from. */
     private final AggregateConfigProvider config;
     /** This plugin's config settings domain. */
@@ -134,7 +134,7 @@ public final class IdentdServer implements Runnable {
      * @return True if the server is running
      */
     public boolean isRunning() {
-        return (myThread != null);
+        return myThread != null;
     }
 
     /**
@@ -150,7 +150,7 @@ public final class IdentdServer implements Runnable {
             } catch (IOException e) {
                 eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, e,
                         "Unable to start identd server: " + e.getMessage(), ""));
-                if (e.getMessage().equals("Permission denied")) {
+                if ("Permission denied".equals(e.getMessage())) {
                     failed = true;
                 }
             }

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

@@ -25,11 +25,9 @@ package com.dmdirc.addons.lagdisplay;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 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.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.events.ServerGotpingEvent;
@@ -65,8 +63,6 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
     private final DMDircMBassador eventBus;
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
-    /** Status bar to add panels to. */
-    private final SwingStatusBar statusBar;
     private final Provider<LagDisplayPanel> panelProvider;
     /** The settings domain to use. */
     private final String domain;
@@ -86,16 +82,13 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
     private LagDisplayPanel panel;
 
     @Inject
-    public LagDisplayManager(
-            final DMDircMBassador eventBus,
+    public LagDisplayManager(final DMDircMBassador eventBus,
             final ActiveFrameManager activeFrameManager,
-            final SwingStatusBar statusBar,
             final Provider<LagDisplayPanel> panelProvider,
             @PluginDomain(LagDisplayPlugin.class) final String domain,
             @GlobalConfig final AggregateConfigProvider globalConfig) {
         this.eventBus = eventBus;
         this.activeFrameManager = activeFrameManager;
-        this.statusBar = statusBar;
         this.panelProvider = panelProvider;
         this.domain = domain;
         this.globalConfig = globalConfig;
@@ -177,7 +170,7 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
         if (event.getNumeric() != 421) {
             return;
         }
-        final boolean useAlternate = ((Server) event.getConnection()).getConfigManager()
+        final boolean useAlternate = ((FrameContainer) event.getConnection()).getConfigManager()
                 .getOptionBool(domain, "usealternate");
         final TextFrame activeFrame = activeFrameManager.getActiveFrame();
         final FrameContainer active = activeFrame == null ? null : activeFrame.getContainer();
@@ -230,7 +223,7 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
         final String value = formatTime(event.getPing());
 
         getHistory(event.getConnection()).add(event.getPing());
-        pings.put((event.getConnection()), value);
+        pings.put(event.getConnection(), value);
 
         if (isActive) {
             panel.getComponent().setText(value);
@@ -249,7 +242,7 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
         final FrameContainer active = activeFrame == null ? null : activeFrame.getContainer();
         final boolean isActive = active != null && event.getConnection().equals(active.
                 getConnection());
-        final String value = formatTime(event.getPing()) + "+";
+        final String value = formatTime(event.getPing()) + '+';
 
         pings.put(event.getConnection(), value);
 

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

@@ -32,6 +32,7 @@ import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import javax.swing.JPanel;
@@ -80,8 +81,6 @@ public class PingHistoryPanel extends JPanel {
         g.drawLine(1, getHeight() - 2, getWidth() - 1, getHeight() - 2);
         g.setFont(g.getFont().deriveFont(10f));
 
-        float lastX = -1;
-        float lastY = -1;
         final float pixelsperpointX = (getWidth() - 3)
                 / (float) (history.getList().size() == 1 ? 1
                 : history.getList().size() - 1);
@@ -94,8 +93,10 @@ public class PingHistoryPanel extends JPanel {
         long last1 = -1;
         long last2 = -1;
         final List<Long> list = history.getList();
-        final List<Rectangle> rects = new ArrayList<>();
+        final Collection<Rectangle> rects = new ArrayList<>();
 
+        float lastX = -1;
+        float lastY = -1;
         for (int i = 0; i < list.size(); i++) {
             final Long value = list.get(i);
 

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

@@ -34,6 +34,7 @@ import java.util.List;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
+import javax.swing.SwingConstants;
 
 /**
  * Shows information about all connected servers.
@@ -84,9 +85,9 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
             for (final Server server : servers) {
                 panel.add(new JLabel(server.getName()));
                 panel.add(new JLabel(server.getState() == ServerState.CONNECTED
-                        ? server.getNetwork() : "---", JLabel.CENTER), "grow");
+                        ? server.getNetwork() : "---", SwingConstants.CENTER), "grow");
                 panel.add(new JLabel(server.getState() == ServerState.CONNECTED
-                        ? manager.getTime(server) : "---", JLabel.RIGHT), "grow, wrap");
+                        ? manager.getTime(server) : "---", SwingConstants.RIGHT), "grow, wrap");
             }
         }
     }