Fix PMD errors in plugins.

Change-Id: I7953fd2c0bbadb5a30188641a25352c10905416c
Reviewed-on: http://gerrit.dmdirc.com/1691
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/dcc/PlaceholderContainer.java

@@ -29,8 +29,6 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.interfaces.Window;
 
 import java.awt.Dialog.ModalityType;
 
@@ -48,7 +46,8 @@ public class PlaceholderContainer extends FrameContainer<PlaceholderWindow> {
      * @param plugin The plugin which owns this placeholder
      */
     public PlaceholderContainer(final DCCPlugin plugin) {
-        super("dcc", "DCCs", "DCCs", PlaceholderWindow.class, IdentityManager.getGlobalConfig());
+        super("dcc", "DCCs", "DCCs", PlaceholderWindow.class,
+                IdentityManager.getGlobalConfig());
 
         this.plugin = plugin;
     }
@@ -71,12 +70,13 @@ public class PlaceholderContainer extends FrameContainer<PlaceholderWindow> {
                     .getPluginManager().getPluginInfoByName("ui_swing")
                     .getPlugin()).getMainFrame(), ModalityType.MODELESS,
                     "Close confirmation",
-                    "Closing this window will cause all existing DCCs " +
-                    "to terminate, are you sure you want to do this?") {
+                    "Closing this window will cause all existing DCCs "
+                    + "to terminate, are you sure you want to do this?") {
                 /**
-                 * A version number for this class. It should be changed whenever the class
-                 * structure is changed (or anything else that would prevent serialized
-                 * objects being unserialized with the new class).
+                 * A version number for this class. It should be changed
+                 * whenever the class structure is changed (or anything else
+                 * that would prevent serialized objects being unserialized
+                 * with the new class).
                  */
                 private static final long serialVersionUID = 1;
 

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

@@ -41,8 +41,6 @@ import java.util.List;
 
 /**
  * The Identd plugin answers ident requests from IRC servers.
- *
- * @author Shane
  */
 public class IdentdPlugin extends Plugin implements ActionListener {
 
@@ -52,22 +50,19 @@ public class IdentdPlugin extends Plugin implements ActionListener {
     /** The IdentdServer that we use. */
     private IdentdServer myServer;
 
-    /**
-     * Creates a new instance of IdentdPlugin.
-     */
-    public IdentdPlugin() {
-    }
-
     /**
      * Called when the plugin is loaded.
      */
     @Override
     public void onLoad() {
         // Add action hooks
-        ActionManager.addListener(this, CoreActionType.SERVER_CONNECTED, CoreActionType.SERVER_CONNECTING, CoreActionType.SERVER_CONNECTERROR);
+        ActionManager.addListener(this, CoreActionType.SERVER_CONNECTED, 
+                CoreActionType.SERVER_CONNECTING,
+                CoreActionType.SERVER_CONNECTERROR);
 
         myServer = new IdentdServer(this);
-        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.alwaysOn")) {
+        if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
+                "advanced.alwaysOn")) {
             myServer.startServer();
         }
     }
@@ -90,7 +85,8 @@ public class IdentdPlugin extends Plugin implements ActionListener {
      * @param arguments The arguments for the event
      */
     @Override
-    public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
+    public void processEvent(final ActionType type, final StringBuffer format,
+            final Object... arguments) {
         if (type == CoreActionType.SERVER_CONNECTING) {
             synchronized (servers) {
                 if (servers.isEmpty()) {
@@ -98,11 +94,13 @@ public class IdentdPlugin extends Plugin implements ActionListener {
                 }
                 servers.add((Server) arguments[0]);
             }
-        } else if (type == CoreActionType.SERVER_CONNECTED || type == CoreActionType.SERVER_CONNECTERROR) {
+        } else if (type == CoreActionType.SERVER_CONNECTED
+                || type == CoreActionType.SERVER_CONNECTERROR) {
             synchronized (servers) {
                 servers.remove(arguments[0]);
 
-                if (servers.isEmpty() && !IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.alwaysOn")) {
+                if (servers.isEmpty() && !IdentityManager.getGlobalConfig()
+                        .getOptionBool(getDomain(), "advanced.alwaysOn")) {
                     myServer.stopServer();
                 }
             }
@@ -112,10 +110,12 @@ public class IdentdPlugin extends Plugin implements ActionListener {
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory general = new PluginPreferencesCategory(getPluginInfo(), "Identd",
+        final PreferencesCategory general = new PluginPreferencesCategory(
+                getPluginInfo(), "Identd",
                 "General Identd Plugin config ('Lower' options take priority " +
                 "over those above them)");
-        final PreferencesCategory advanced = new PluginPreferencesCategory(getPluginInfo(), "Advanced",
+        final PreferencesCategory advanced = new PluginPreferencesCategory(
+                getPluginInfo(), "Advanced",
                 "Advanced Identd Plugin config - Only edit these if you need " +
                 "to/know what you are doing. Editing these could prevent " +
                 "access to some servers. ('Lower' options take priority over " +

src/com/dmdirc/addons/mediasource_dbus/DBusMediaSource.java

@@ -44,17 +44,11 @@ public class DBusMediaSource extends Plugin implements MediaSourceManager {
     /** The sources used by this media source. */
     private List<MediaSource> sources;
     /** A map of discovered mpris sources. */
-    private final Map<String, MediaSource> mprisSources = new HashMap<String, MediaSource>();
+    private final Map<String, MediaSource> mprisSources
+            = new HashMap<String, MediaSource>();
     /** The path to qdbus. */
     private String qdbus;
-       
-    /**
-     * Creates a new instance of DBusMediaSource.
-     */
-    public DBusMediaSource() {
-        super();
-    }
-    
+
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
@@ -68,7 +62,7 @@ public class DBusMediaSource extends Plugin implements MediaSourceManager {
             qdbus = "/bin/qdbus";
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
@@ -114,7 +108,7 @@ public class DBusMediaSource extends Plugin implements MediaSourceManager {
         exeArgs[3] = method;
 
         for (int i = 0; i < args.length; i++) {
-            exeArgs[4 + i] = args[i];
+            exeArgs[4 + i] = args[i]; //NOPMD
         }
 
         return getInfo(exeArgs);
@@ -170,7 +164,7 @@ public class DBusMediaSource extends Plugin implements MediaSourceManager {
             if (index == -1 || index >= line.length() - 2) {
                 continue;
             }
-            
+
             final String key = line.substring(0, index);
             final String value = line.substring(index + 2);
 

src/com/dmdirc/addons/nowplaying/ConfigPanel.java

@@ -84,7 +84,8 @@ public class ConfigPanel extends JPanel implements PreferencesInterface,
      * @param plugin The plugin that owns this panel
      * @param sources A list of sources to be used in the panel
      */
-    public ConfigPanel(final NowPlayingPlugin plugin, final List<String> sources) {
+    public ConfigPanel(final NowPlayingPlugin plugin,
+            final List<String> sources) {
         super();
 
         if (sources == null) {
@@ -157,13 +158,14 @@ public class ConfigPanel extends JPanel implements PreferencesInterface,
         }
 
         final String text = plugin.doSubstitution(
-                        UIUtilities.invokeAndWait(new ReturnableThread<String>() {
+                UIUtilities.invokeAndWait(new ReturnableThread<String>() {
 
-                    @Override
-                    public void run() {
-                        setObject(textfield.getText());
-                    }
-                }), source);
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                setObject(textfield.getText());
+            }
+        }), source);
         SwingUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */
@@ -248,7 +250,10 @@ public class ConfigPanel extends JPanel implements PreferencesInterface,
             public void run() {
                 try {
                     updatePreview();
-                } catch (Throwable ex) {
+                } catch (LinkageError e) {
+                    Logger.appError(ErrorLevel.MEDIUM,
+                            "Error when updating nowplaying preview", e);
+                } catch (Exception ex) {
                     Logger.appError(ErrorLevel.MEDIUM,
                             "Error when updating nowplaying preview", ex);
                 }

src/com/dmdirc/addons/redirect/RedirectCommand.java

@@ -38,30 +38,26 @@ import com.dmdirc.ui.input.TabCompleter;
  * The redirect command allows the user to redirect the output from another
  * command that would normally echo results locally to a query or channel
  * window instead.
- *
- * @author Chris
  */
 public class RedirectCommand extends Command implements IntelligentCommand,
         CommandInfo {
-    
-    public RedirectCommand() {
-    }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
             final CommandArguments args, final CommandContext context) {
-        final MessageTarget<?> target = ((ChatCommandContext) context).getChat();
-        target.getCommandParser().parseCommand(new FakeWriteableFrameContainer(target),
-                context.getSource(), args.getArgumentsAsString());
+        final MessageTarget<?> target = ((ChatCommandContext) context)
+                .getChat();
+        target.getCommandParser().parseCommand(new FakeWriteableFrameContainer(
+                target), context.getSource(), args.getArgumentsAsString());
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "redirect";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -73,11 +69,12 @@ public class RedirectCommand extends Command implements IntelligentCommand,
     public CommandType getType() {
         return CommandType.TYPE_CHAT;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
-        return "redirect <command> - sends the output of the command to a channel or query window";
+        return "redirect <command> - sends the output of the command to a "
+                + "channel or query window";
     }
 
     /** {@inheritDoc} */
@@ -86,5 +83,5 @@ public class RedirectCommand extends Command implements IntelligentCommand,
             final IntelligentCommandContext context) {
         return TabCompleter.getIntelligentResults(arg, context, 0);
     }
-    
+
 }

src/com/dmdirc/addons/relaybot/RelayChannelHandler.java

@@ -46,7 +46,7 @@ import java.util.Map;
  * This class replaces the ChannelHandler in the core to allow intercepting
  * callbacks from the parser.
  *
- * This allows us to hide them from the core and send faked ones instead.
+ * This allows us to hide them from the core and send faked onullnes instead.
  *
  * @author shane
  */
@@ -60,40 +60,45 @@ public class RelayChannelHandler implements ChannelMessageListener {
     /** Plugin that owns this RelayChannelHandler. */
     private final RelayBotPlugin myPlugin;
 
-    /** Known ChannelClients */
-    private final Map<String, IRCChannelClientInfo> channelClients = new HashMap<String, IRCChannelClientInfo>();
+    /** Known ChannelClients. */
+    private final Map<String, IRCChannelClientInfo> channelClients
+            = new HashMap<String, IRCChannelClientInfo>();
 
     /**
      * Create a new RelayChannelHandler.
      *
-     * @param myPlugin 
+     * @param myPlugin Parent plugin
      * @param myChannel channel to hax!
      */
-    public RelayChannelHandler(final RelayBotPlugin myPlugin, final Channel myChannel) {
+    public RelayChannelHandler(final RelayBotPlugin myPlugin,
+            final Channel myChannel) {
         this.myChannel = myChannel;
         this.myPlugin = myPlugin;
-        ChannelEventHandler ceh = null;
+        ChannelEventHandler ceh;
         try {
             // Get the core Channel handler.
-            final Field field = myChannel.getClass().getDeclaredField("eventHandler");
+            final Field field = myChannel.getClass().getDeclaredField(
+                    "eventHandler");
             field.setAccessible(true);
             ceh = (ChannelEventHandler) field.get(myChannel);
         } catch (IllegalArgumentException ex) {
-            ex.printStackTrace();
+            ceh = null;
         } catch (IllegalAccessException ex) {
-            ex.printStackTrace();
+            ceh = null;
         } catch (NoSuchFieldException ex) {
-            ex.printStackTrace();
+            ceh = null;
         } catch (SecurityException ex) {
-            ex.printStackTrace();
+            ceh = null;
         }
 
         coreChannelHandler = ceh;
 
         if (coreChannelHandler != null) {
-            final IRCCallbackManager cbm = (IRCCallbackManager) myChannel.getServer().getParser().getCallbackManager();
+            final IRCCallbackManager cbm = (IRCCallbackManager) myChannel
+                    .getServer().getParser().getCallbackManager();
             cbm.delCallback(ChannelMessageListener.class, coreChannelHandler);
-            cbm.addCallback(ChannelMessageListener.class, this, myChannel.getName());
+            cbm.addCallback(ChannelMessageListener.class, this,
+                    myChannel.getName());
         }
     }
 
@@ -102,22 +107,28 @@ public class RelayChannelHandler implements ChannelMessageListener {
      * Get a ChannelClient object for the given nick@server.
      *
      * @param channel Channel
+     * @param date Date for event
      * @param nick Nickname to get channel client for.
-     * @param sendJoinIfNew
+     * @param sendJoinIfNew Send join if new client seen
      * @return Requested ChannelClient Info.
      */
-    private IRCChannelClientInfo getChannelClient(final ChannelInfo channel, final Date date, final String nick, final boolean sendJoinIfNew) {
+    private IRCChannelClientInfo getChannelClient(final ChannelInfo channel,
+            final Date date, final String nick, final boolean sendJoinIfNew) {
         final Parser parser = channel.getParser();
         final String storeName = parser.getStringConverter().toLowerCase(nick);
         synchronized (channelClients) {
             if (!channelClients.containsKey(storeName)) {
-                final RelayClientInfo client = new RelayClientInfo(channel.getParser(), nick);
-                final IRCChannelClientInfo newChannelClient = new IRCChannelClientInfo((IRCParser) channel.getParser(), client, channel);
+                final RelayClientInfo client = new RelayClientInfo(channel
+                        .getParser(), nick);
+                final IRCChannelClientInfo newChannelClient
+                        = new IRCChannelClientInfo((IRCParser) channel
+                        .getParser(), client, channel);
                 colourClient(newChannelClient);
 
                 channelClients.put(storeName, newChannelClient);
                 if (sendJoinIfNew && !client.isServer()) {
-                    coreChannelHandler.onChannelJoin(parser, date, channel, newChannelClient);
+                    coreChannelHandler.onChannelJoin(parser, date, channel,
+                            newChannelClient);
                     // The nickcolour plugin colours the nicknames on join
                     // and uses nickname@server when colouring rather than
                     // the setting the user wanted, we can recolour here to
@@ -131,12 +142,13 @@ public class RelayChannelHandler implements ChannelMessageListener {
     }
 
     /**
-     * Remove a stored ChannelClient
+     * Remove a stored ChannelClient.
      *
      * @param channel Channel
      * @param nick Nickname to get channel client for.
      */
-    private void removeChannelClient(final ChannelInfo channel, final String nick) {
+    private void removeChannelClient(final ChannelInfo channel,
+            final String nick) {
         final Parser parser = channel.getParser();
         final String storeName = parser.getStringConverter().toLowerCase(nick);
         synchronized (channelClients) {
@@ -145,18 +157,21 @@ public class RelayChannelHandler implements ChannelMessageListener {
     }
 
     /**
-     * Rename a stored ChannelClient
+     * Rename a stored ChannelClient.
      *
      * @param channelClient ChannelClient
      * @param newNick new Nickname
      */
-    private void renameChannelClient(final IRCChannelClientInfo channelClient, final String newNick) {
+    private void renameChannelClient(final IRCChannelClientInfo channelClient,
+            final String newNick) {
         final Parser parser = channelClient.getChannel().getParser();
-        final String storeName = parser.getStringConverter().toLowerCase(newNick);
+        final String storeName = parser.getStringConverter().toLowerCase(
+                newNick);
 
         synchronized (channelClients) {
             channelClients.remove(channelClient.getClient().toString());
-            ((RelayClientInfo) channelClient.getClient()).changeNickname(newNick);
+            ((RelayClientInfo) channelClient.getClient()).changeNickname(
+                    newNick);
             channelClients.put(storeName, channelClient);
         }
     }
@@ -166,13 +181,17 @@ public class RelayChannelHandler implements ChannelMessageListener {
      */
     public void restoreCoreChannelHandler() {
         if (coreChannelHandler != null) {
-            final IRCCallbackManager cbm = (IRCCallbackManager) myChannel.getServer().getParser().getCallbackManager();
+            final IRCCallbackManager cbm = (IRCCallbackManager) myChannel
+                    .getServer().getParser().getCallbackManager();
 
             // Force adding this callback to the CBM.
             if (cbm instanceof RelayCallbackManager) {
-                ((RelayCallbackManager) cbm).forceAddCallback(ChannelMessageListener.class, coreChannelHandler, myChannel.getName());
+                ((RelayCallbackManager) cbm).forceAddCallback(
+                        ChannelMessageListener.class, coreChannelHandler,
+                        myChannel.getName());
             } else {
-                cbm.addCallback(ChannelMessageListener.class, coreChannelHandler, myChannel.getName());
+                cbm.addCallback(ChannelMessageListener.class,
+                        coreChannelHandler, myChannel.getName());
             }
             unset();
             updateNames();
@@ -180,10 +199,11 @@ public class RelayChannelHandler implements ChannelMessageListener {
     }
 
     /**
-     * Remove channel message handling from this ChannelHandler
+     * Remove channel message handling from this ChannelHandler.
      */
     public void unset() {
-        myChannel.getServer().getParser().getCallbackManager().delCallback(ChannelMessageListener.class, this);
+        myChannel.getServer().getParser().getCallbackManager().delCallback(
+                ChannelMessageListener.class, this);
     }
 
     /**
@@ -193,25 +213,35 @@ public class RelayChannelHandler implements ChannelMessageListener {
     */
     private void colourClient(final ChannelClientInfo channelClient) {
         // Use nick colour plugin to colour the client if available.
-        final PluginInfo nickColour = PluginManager.getPluginManager().getPluginInfoByName("nickcolour");
+        final PluginInfo nickColour = PluginManager.getPluginManager()
+                .getPluginInfoByName("nickcolour");
 
-        final boolean fullColour = IdentityManager.getGlobalConfig().getOptionBool(myPlugin.getDomain(), "colourFullName");
-        final RelayClientInfo client = (RelayClientInfo) channelClient.getClient();
+        final boolean fullColour = IdentityManager.getGlobalConfig()
+                .getOptionBool(myPlugin.getDomain(), "colourFullName");
+        final RelayClientInfo client = (RelayClientInfo) channelClient
+                .getClient();
         final boolean oldValue = client.getShowFullNickname();
         client.setShowFullNickname(fullColour);
 
         if (nickColour != null && nickColour.isLoaded()) {
             try {
-                final Method gpcl = PluginInfo.class.getDeclaredMethod("getPluginClassLoader");
+                final Method gpcl = PluginInfo.class.getDeclaredMethod(
+                        "getPluginClassLoader");
                 gpcl.setAccessible(true);
 
                 final Class<?> nc = nickColour.getPlugin().getClass();
-                final Method colourClient = nc.getDeclaredMethod("colourClient", new Class<?>[]{String.class, ChannelClientInfo.class});
+                final Method colourClient = nc.getDeclaredMethod("colourClient",
+                        new Class<?>[]{String.class, ChannelClientInfo.class});
                 colourClient.setAccessible(true);
-                colourClient.invoke(nickColour.getPlugin(), myChannel.getServer().getNetwork(), channelClient);
-            } catch (Throwable t) { /* If it can't colour then oh well. */ }
+                colourClient.invoke(nickColour.getPlugin(), myChannel
+                        .getServer().getNetwork(), channelClient);
+            } catch (LinkageError e) {
+                // If it can't colour then oh well.
+            } catch (Exception t) {
+                // If it can't colour then oh well.
+            }
         }
-        
+
         client.setShowFullNickname(oldValue);
     }
 
@@ -220,41 +250,53 @@ public class RelayChannelHandler implements ChannelMessageListener {
      * Handle the IRCParsers incoming message.
      *
      * @param parser Parser that sent the message
+     * @param date Date for event
      * @param channel Channel the message went to
      * @param channelClient Client who send the message
      * @param message Message content
      * @param host Host of client
      */
     @Override
-    public void onChannelMessage(final Parser parser, final Date date, final ChannelInfo channel, final ChannelClientInfo channelClient, final String message, final String host) {
-        final String channelName = parser.getStringConverter().toLowerCase(channel.getName());
+    public void onChannelMessage(final Parser parser, final Date date,
+            final ChannelInfo channel, final ChannelClientInfo channelClient,
+            final String message, final String host) {
+        final String channelName = parser.getStringConverter().toLowerCase(
+                channel.getName());
         String botName;
         try {
-            botName = IdentityManager.getGlobalConfig().getOption(myPlugin.getDomain(), channelName);
+            botName = IdentityManager.getGlobalConfig().getOption(
+                    myPlugin.getDomain(), channelName);
         } catch (IllegalArgumentException iae) {
             botName = "";
         }
-        final boolean isBot = parser.getStringConverter().equalsIgnoreCase(botName, channelClient.getClient().getNickname());
+        final boolean isBot = parser.getStringConverter().equalsIgnoreCase(
+                botName, channelClient.getClient().getNickname());
 
-        final boolean joinNew = IdentityManager.getGlobalConfig().getOptionBool(myPlugin.getDomain(), "joinOnDiscover");
+        final boolean joinNew = IdentityManager.getGlobalConfig().getOptionBool(
+                myPlugin.getDomain(), "joinOnDiscover");
 
         // See if we need to modify this message
-        if (channelClient instanceof IRCChannelClientInfo && !botName.isEmpty() && isBot) {
+        if (channelClient instanceof IRCChannelClientInfo
+                && !botName.isEmpty() && isBot) {
             final String[] bits = message.split(" ", 2);
             final String initial = Styliser.stipControlCodes(bits[0]);
 
             if (initial.charAt(0) == '+') {
                 // Channel Message
-                final IRCChannelClientInfo newChannelClient = getChannelClient(channel, date, bits[0].substring(2, bits[0].length() - 1), joinNew);
+                final IRCChannelClientInfo newChannelClient = getChannelClient(
+                        channel, date, bits[0].substring(2, bits[0].length() - 1), joinNew);
 
-                coreChannelHandler.onChannelMessage(parser, date, channel, newChannelClient, bits[1], host);
+                coreChannelHandler.onChannelMessage(parser, date, channel,
+                        newChannelClient, bits[1], host);
                 return;
             } else if (initial.equalsIgnoreCase("***")) {
                 // Some kind of state-changing action
                 final String[] newBits = bits[1].split(" ");
 
                 if (newBits.length > 2) {
-                    final IRCChannelClientInfo newChannelClient = getChannelClient(channel, date, newBits[0], joinNew);
+                    final IRCChannelClientInfo newChannelClient
+                            = getChannelClient(channel, date, newBits[0],
+                            joinNew);
 
                     if (newBits[2].equalsIgnoreCase("joined")) {
                         // User joined a relayed channel.
@@ -262,7 +304,8 @@ public class RelayChannelHandler implements ChannelMessageListener {
                             // If auto join on discover isn't enabled, we will
                             // need to send this join, else it will already
                             // have been sent.
-                            coreChannelHandler.onChannelJoin(parser, date, channel, newChannelClient);
+                            coreChannelHandler.onChannelJoin(parser, date,
+                                    channel, newChannelClient);
                             // And recolour to combat the nickcolour plugin
                             // changing the colour on join.
                             colourClient(newChannelClient);
@@ -270,35 +313,46 @@ public class RelayChannelHandler implements ChannelMessageListener {
                         return;
                     } else if (newBits[2].equalsIgnoreCase("left")) {
                         // User left a relayed channel.
-                        String reason = (newBits.length > 4) ? mergeBits(newBits, 4, newBits.length - 1, " ") : "()";
+                        String reason = (newBits.length > 4) ? mergeBits(
+                                newBits, 4, newBits.length - 1, " ") : "()";
                         reason = reason.substring(1, reason.length() - 1);
 
-                        coreChannelHandler.onChannelPart(parser, date, channel, newChannelClient, reason);
+                        coreChannelHandler.onChannelPart(parser, date, channel,
+                                newChannelClient, reason);
                         removeChannelClient(channel, newBits[0]);
                         return;
                     } else if (newBits[2].equalsIgnoreCase("quit")) {
                         // User quit a relayed channel.
-                        String reason = (newBits.length > 4) ? mergeBits(newBits, 4, newBits.length - 1, " ") : "()";
+                        String reason = (newBits.length > 4) ? mergeBits(
+                                newBits, 4, newBits.length - 1, " ") : "()";
                         reason = reason.substring(1, reason.length() - 1);
 
-                        coreChannelHandler.onChannelQuit(parser, date, channel, newChannelClient, reason);
+                        coreChannelHandler.onChannelQuit(parser, date, channel,
+                                newChannelClient, reason);
                         removeChannelClient(channel, newBits[0]);
                         return;
                     } else if (newBits[2].equalsIgnoreCase("kicked")) {
                         // User was kicked from a relayed channel.
-                        String reason = (newBits.length > 7) ? mergeBits(newBits, 7, newBits.length - 1, " ") : "()";
+                        String reason = (newBits.length > 7) ? mergeBits(
+                                newBits, 7, newBits.length - 1, " ") : "()";
                         reason = reason.substring(1, reason.length() - 1);
 
-                        final IRCChannelClientInfo kickingChannelClient = (newBits.length > 6) ? getChannelClient(channel, date, newBits[6], joinNew) : null;
+                        final IRCChannelClientInfo kickingChannelClient
+                                = (newBits.length > 6) ? getChannelClient(
+                                channel, date, newBits[6], joinNew) : null;
 
-                        coreChannelHandler.onChannelKick(parser, date, channel, newChannelClient, kickingChannelClient, reason, "");
+                        coreChannelHandler.onChannelKick(parser, date, channel,
+                                newChannelClient, kickingChannelClient, reason,
+                                "");
                         removeChannelClient(channel, newBits[0]);
                         return;
-                    } else if (newBits[2].equalsIgnoreCase("now") && newBits.length > 3) {
+                    } else if (newBits[2].equalsIgnoreCase("now")
+                            && newBits.length > 3) {
                         // User changed their nickname in a relayed channel.
                         renameChannelClient(newChannelClient, newBits[3]);
 
-                        coreChannelHandler.onChannelNickChanged(parser, date, channel, newChannelClient, newBits[0]);
+                        coreChannelHandler.onChannelNickChanged(parser, date,
+                                channel, newChannelClient, newBits[0]);
                         return;
                     }
                 }
@@ -306,27 +360,31 @@ public class RelayChannelHandler implements ChannelMessageListener {
                 // Channel Action
                 final String[] newBits = bits[1].split(" ", 2);
 
-                final IRCChannelClientInfo newChannelClient = getChannelClient(channel, date, newBits[0], joinNew);
+                final IRCChannelClientInfo newChannelClient = getChannelClient(
+                        channel, date, newBits[0], joinNew);
 
-                coreChannelHandler.onChannelAction(parser, date, channel, newChannelClient, newBits[1], "");
+                coreChannelHandler.onChannelAction(parser, date, channel,
+                        newChannelClient, newBits[1], "");
                 return;
             }
         }
 
         // Pass it on unchanged.
-        coreChannelHandler.onChannelMessage(parser, date, channel, channelClient, message, host);
+        coreChannelHandler.onChannelMessage(parser, date, channel,
+                channelClient, message, host);
     }
 
     /**
      * Merge the given bits.
-     *and
+     *
      * @param bits Bits to merge
      * @param start Start
      * @param end end
      * @param joiner What to use to join them
      * @return Joined bits.
      */
-    private String mergeBits(final String[] bits, final int start, final int end, final String joiner) {
+    private String mergeBits(final String[] bits, final int start,
+            final int end, final String joiner) {
         final StringBuilder builder = new StringBuilder();
         for (int i = start; i <= end; i++) {
             if (bits.length < i) { break; }
@@ -342,6 +400,7 @@ public class RelayChannelHandler implements ChannelMessageListener {
      * This will cause all remote clients to vanish from the nicklist.
      */
     public void updateNames() {
-        coreChannelHandler.onChannelGotNames(myChannel.getServer().getParser(), new Date(), myChannel.getChannelInfo());
+        coreChannelHandler.onChannelGotNames(myChannel.getServer().getParser(),
+                new Date(), myChannel.getChannelInfo());
     }
 }

src/com/dmdirc/addons/scriptplugin/JavaScriptHelper.java

@@ -21,79 +21,100 @@
  */
 
 package com.dmdirc.addons.scriptplugin;
+
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 /**
  * Used to allow the rhino javascript to do stuff that it otherwise can't, such
  * as setting global variables, string triming and getting a char.
- *
- * @author Shane 'Dataforce' McCormack
  */
 public class JavaScriptHelper {
     /** Used to identify the JavaScriptHelper. */
     private static final String ID = "DMDIRC-JSH";
-    
-    /** Used to allow scripts to know if a specific function they need is available. */
+
+    /**
+     * Used to allow scripts to know if a specific function they need is
+     * available.
+     */
     private static final int VERSION = 2;
 
     /** Hashtable for storing stuff. */
-    private static final Map<String, Object> SETTINGS = new HashMap<String, Object>();
-    
+    private static final Map<String, Object> SETTINGS
+            = new HashMap<String, Object>();
+
     /**
      * Method to set Stuff.
      *
      * @param setting Name of setting
      * @param value Value of setting
      */
-    public void setGlobal(String setting, final Object value) {
-        if (setting.equals("")) { return; }
-        setting = setting.toLowerCase();
-        if (SETTINGS.containsKey(setting)) { SETTINGS.remove(setting); }
-        if (value != null) { SETTINGS.put(setting, value); }
+    public void setGlobal(final String setting, final Object value) {
+        if (setting.isEmpty()) {
+            return;
+        }
+        final String key = setting.toLowerCase(Locale.getDefault());
+        if (SETTINGS.containsKey(key)) {
+            SETTINGS.remove(key);
+        }
+        if (value != null) {
+            SETTINGS.put(key, value);
+        }
     }
-    
+
     /**
      * Method to get Stuff.
      *
      * @param setting Name of setting
+     *
      * @return Value of setting
      */
-    public Object getGlobal(String setting) {
-        if (setting.equals("")) { return ""; }
-        setting = setting.toLowerCase();
-        if (SETTINGS.containsKey(setting)) { return SETTINGS.get(setting); }
-        return null;
+    public Object getGlobal(final String setting) {
+        if (setting.isEmpty()) {
+            return "";
+        }
+        return SETTINGS.get(setting.toLowerCase(Locale.getDefault()));
     }
-    
+
     /**
      * Method to trim spaces from strings.
      *
      * @param str String to trim
+     *
      * @return String without spaces on the ends
      */
-    public String trim(String str) { return str.trim(); }
-    
+    public String trim(final String str) {
+        return str.trim();
+    }
+
     /**
      * Method to get a java Character object.
      *
      * @param str String to make object from
+     *
      * @return Character represending first char in the string
      */
-    public Character toChar(String str) { return str.charAt(0); }
-    
+    public Character toChar(final String str) {
+        return str.charAt(0);
+    }
+
     /**
      * Get the version of JavaScriptHelper in use.
      *
      * @return JavaScriptHelper version
      */
-    public int getVersion() { return VERSION; }
-    
+    public int getVersion() {
+        return VERSION;
+    }
+
     /**
      * Get the ID of this JavaScriptHelper.
      * If you extend or modify this, you should change the myIDString variable.
      *
      * @return JavaScriptHelper ID
      */
-    public String getID() { return ID; }
-}
+    public String getID() {
+        return ID;
+    }
+}

src/com/dmdirc/addons/time/TimerManager.java

@@ -20,7 +20,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
 package com.dmdirc.addons.time;
 
 import com.dmdirc.FrameContainer;
@@ -34,7 +33,6 @@ import java.util.Set;
 /**
  * Class to manage Timers.
  *
- * @author Simon Mott
  * @since 0.6.5
  */
 public class TimerManager {
@@ -56,13 +54,14 @@ public class TimerManager {
      * @param origin The frame container to use for the execution
      * @param commandContext The window the command came from
      */
-    public void addTimer(final int repetitions, final int interval, String command,
-            final FrameContainer<?> origin, final Window commandContext) {
+    public void addTimer(final int repetitions, final int interval,
+            final String command, final FrameContainer<?> origin,
+            final Window commandContext) {
 
         synchronized (this) {
             final int timerKey = findFreeKey();
-            timerList.put(timerKey, new TimedCommand(this, timerKey, repetitions,
-                interval, command, origin, commandContext));
+            timerList.put(timerKey, new TimedCommand(this, timerKey,
+                    repetitions, interval, command, origin, commandContext));
         }
     }
 
@@ -124,10 +123,9 @@ public class TimerManager {
      *
      * @param id ID that we want to check if there is a timer for
      *
-     * @return Returns True of there is a timer with the ID. False if there isn't
+     * @return Returns True iif there is a timer with the ID
      */
     public boolean hasTimerWithID(final int id) {
         return timerList.containsKey(id);
     }
-
-}
+}

src/com/dmdirc/addons/ui_dummy/DummyInputField.java

@@ -82,7 +82,7 @@ public class DummyInputField implements InputField {
 
     /** {@inheritDoc} */
     @Override
-    public void setText(String text) {
+    public void setText(final String text) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfoCellEditor.java

@@ -45,10 +45,11 @@ public class AddonInfoCellEditor extends AbstractCellEditor implements
     /** Table to edit. */
     private Object value;
 
-    /** {@innheritDoc} */
+    /** {@inheritDoc} */
     @Override
-    public Component getTableCellEditorComponent(JTable table, Object value,
-            boolean isSelected, int row, int column) {
+    public Component getTableCellEditorComponent(final JTable table,
+            final Object value, final boolean isSelected, final int row,
+            final int column) {
         this.value = value;
         if (value instanceof AddonInfoLabel) {
             final AddonInfoLabel label = (AddonInfoLabel) value;
@@ -64,7 +65,7 @@ public class AddonInfoCellEditor extends AbstractCellEditor implements
         }
     }
 
-    /** {@innheritDoc} */
+    /** {@inheritDoc} */
     @Override
     public Object getCellEditorValue() {
         return value;

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfoLabel.java

@@ -1,17 +1,16 @@
 /*
- * 
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -50,7 +49,7 @@ public class AddonInfoLabel extends JPanel {
     /** Addon info to be represented. */
     private final AddonInfo addonInfo;
     /** Parent window. */
-    private BrowserWindow parentWindow;
+    private final BrowserWindow parentWindow;
 
     /**
      * Creates a new addon info label to describe the specified addon info.
@@ -58,14 +57,19 @@ public class AddonInfoLabel extends JPanel {
      * @param addonInfo Addon to describe
      * @param parentWindow Parent window
      */
-    public AddonInfoLabel(final AddonInfo addonInfo, 
+    public AddonInfoLabel(final AddonInfo addonInfo,
             final BrowserWindow parentWindow) {
+        super();
+
         this.addonInfo = addonInfo;
         this.parentWindow = parentWindow;
 
         init();
     }
 
+    /**
+     * Initialises the components used in this addon info label.
+     */
     private void init() {
         setLayout(new MigLayout("fillx, ins 0"));
 
@@ -75,15 +79,15 @@ public class AddonInfoLabel extends JPanel {
 
         title = new JLabel(addonInfo.getScreenshot());
         title.setBorder(BorderFactory.createLineBorder(Color.BLACK));
-        add(title, "wmin 150, wmax 150, hmin 150, hmax 150, wrap, spany 5, " +
-                "gapright 5, gaptop 5, gapbottom 5");
+        add(title, "wmin 150, wmax 150, hmin 150, hmax 150, wrap, spany 5, "
+                + "gapright 5, gaptop 5, gapbottom 5");
 
-        title = new JLabel(addonInfo.getType().toString() + ", rated " +
-                addonInfo.getRating() + "/10");
+        title = new JLabel(addonInfo.getType().toString() + ", rated "
+                + addonInfo.getRating() + "/10");
         add(title, "wrap, gapleft 5");
 
-        TextLabel label = new TextLabel(addonInfo.getDescription());
-        add(label, "wmax 100%-170, hmax 150, growy, wrap, pushy, gapleft 5");
+        add(new TextLabel(addonInfo.getDescription()),
+                "wmax 100%-170, hmax 150, growy, wrap, pushy, gapleft 5");
 
         final JButton button = new JButton("Install");
         button.addActionListener(new InstallListener(addonInfo, parentWindow));
@@ -92,8 +96,8 @@ public class AddonInfoLabel extends JPanel {
 
         if (installed || !addonInfo.isDownloadable()) {
             button.setEnabled(false);
-            title = new JLabel(
-                    installed ? "Already installed" : "No download available");
+            title = new JLabel(installed ? "Already installed"
+                    : "No download available");
             title.setForeground(Color.GRAY);
             add(title);
         }
@@ -113,23 +117,27 @@ public class AddonInfoLabel extends JPanel {
     /** {@inheritDoc} */
     @Override
     public void repaint() {
+        //NOOP for performance reasons
     }
 
     /** {@inheritDoc} */
     @Override
-    public void firePropertyChange(String propertyName, Object oldValue,
-            Object newValue) {
+    public void firePropertyChange(final String propertyName,
+            final Object oldValue, final Object newValue) {
+        //NOOP for performance reasons
     }
 
     /** {@inheritDoc} */
     @Override
-    public void firePropertyChange(String propertyName, boolean oldValue,
-            boolean newValue) {
+    public void firePropertyChange(final String propertyName,
+            final boolean oldValue, final boolean newValue) {
+        //NOOP for performance reasons
     }
 
     /** {@inheritDoc} */
     @Override
-    public void firePropertyChange(String propertyName, int oldValue,
-            int newValue) {
+    public void firePropertyChange(final String propertyName,
+            final int oldValue, final int newValue) {
+        //NOOP for performance reasons
     }
 }

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

@@ -69,20 +69,23 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
             localTarget = (JTextComponent) target;
         } else if (target instanceof SwingInputField) {
             localTarget = ((SwingInputField) target).getTextField();
+        } else {
+            throw new IllegalArgumentException("Unknown target");
         }
 
         localTarget.getActionMap().put("upArrow", new AbstractAction() {
 
             /**
-             * A version number for this class. It should be changed whenever the class
-             * structure is changed (or anything else that would prevent serialized
-             * objects being unserialized with the new class).
+             * A version number for this class. It should be changed whenever
+             * the class structure is changed (or anything else that would
+             * prevent serialized objects being unserialized with the new
+             * class).
              */
             private static final long serialVersionUID = 1;
 
             /** {@inheritDoc} */
             @Override
-            public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(final ActionEvent e) {
                 doBufferUp();
             }
         });
@@ -104,29 +107,35 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
             localTarget = (JTextComponent) target;
         } else if (target instanceof SwingInputField) {
             localTarget = ((SwingInputField) target).getTextField();
+        } else {
+            throw new IllegalArgumentException("Unknown target");
         }
+
         localTarget.getActionMap().put("downArrow", new AbstractAction() {
 
             /**
-             * A version number for this class. It should be changed whenever the class
-             * structure is changed (or anything else that would prevent serialized
-             * objects being unserialized with the new class).
+             * A version number for this class. It should be changed whenever
+             * the class structure is changed (or anything else that would
+             * prevent serialized objects being unserialized with the new
+             * class).
              */
             private static final long serialVersionUID = 1;
 
             /** {@inheritDoc} */
             @Override
-            public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(final ActionEvent e) {
                 doBufferDown();
             }
         });
         if (Apple.isAppleUI()) {
             localTarget.getInputMap(JComponent.WHEN_FOCUSED).
-                    put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0), "downArrow");
+                    put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0),
+                    "downArrow");
         } else {
             localTarget.getInputMap(
                     JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
-                    put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0), "downArrow");
+                    put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0),
+                    "downArrow");
         }
     }
 
@@ -141,12 +150,14 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
         } else {
             throw new IllegalArgumentException("Unknown target");
         }
+
         localTarget.getActionMap().put("insert-tab", new AbstractAction() {
 
             /**
-             * A version number for this class. It should be changed whenever the class
-             * structure is changed (or anything else that would prevent serialized
-             * objects being unserialized with the new class).
+             * A version number for this class. It should be changed whenever
+             * the class structure is changed (or anything else that would
+             * prevent serialized objects being unserialized with the new
+             * class).
              */
             private static final long serialVersionUID = 1;
 
@@ -171,12 +182,14 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
                 }.executeInExecutor();
             }
         });
-        localTarget.getActionMap().put("insert-shift-tab", new AbstractAction() {
+        localTarget.getActionMap().put("insert-shift-tab",
+                new AbstractAction() {
 
             /**
-             * A version number for this class. It should be changed whenever the class
-             * structure is changed (or anything else that would prevent serialized
-             * objects being unserialized with the new class).
+             * A version number for this class. It should be changed whenever
+             * the class structure is changed (or anything else that would
+             * prevent serialized objects being unserialized with the new
+             * class).
              */
             private static final long serialVersionUID = 1;
 
@@ -216,13 +229,17 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
             localTarget = (JTextComponent) target;
         } else if (target instanceof SwingInputField) {
             localTarget = ((SwingInputField) target).getTextField();
+        } else {
+            throw new IllegalArgumentException("Unknown target");
         }
+
         localTarget.getActionMap().put("enterButton", new AbstractAction() {
 
             /**
-             * A version number for this class. It should be changed whenever the class
-             * structure is changed (or anything else that would prevent serialized
-             * objects being unserialized with the new class).
+             * A version number for this class. It should be changed whenever
+             * the class structure is changed (or anything else that would
+             * prevent serialized objects being unserialized with the new
+             * class).
              */
             private static final long serialVersionUID = 1;
 
@@ -238,7 +255,8 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
                     public void run() {
                         final JTextField source;
                         if (e.getSource() instanceof SwingInputField) {
-                            source = ((SwingInputField) e.getSource()).getTextField();
+                            source = ((SwingInputField) e.getSource())
+                                    .getTextField();
                         } else if (e.getSource() instanceof JTextField) {
                             source = (JTextField) e.getSource();
                         } else {
@@ -252,8 +270,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
                                 /** {@inheritDoc} */
                                 @Override
-                                protected Object doInBackground() throws
-                                        Exception {
+                                protected Object doInBackground() {
                                     enterPressed(line);
                                     return null;
                                 }
@@ -264,7 +281,8 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
             }
         });
         localTarget.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
-                put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "enterButton");
+                put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),
+                "enterButton");
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/components/statusbar/FeedbackNag.java

@@ -41,7 +41,7 @@ import javax.swing.JPopupMenu;
 /**
  * Feedback nag icon.
  */
-public class FeedbackNag extends JLabel implements StatusBarComponent, 
+public class FeedbackNag extends JLabel implements StatusBarComponent,
         MouseListener, ActionListener {
 
     /**
@@ -50,33 +50,30 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    /** Nag icon. */
-    private final ImageIcon icon;
     /** Dismiss menu. */
     private final JPopupMenu menu;
-    /** Dismiss menu item. */
-    private final JMenuItem dismiss;
     /** Show menu item. */
     private final JMenuItem show;
     /** Swing Controller. */
-    private SwingController controller;
+    private final SwingController controller;
 
     /**
      * Creates a new feedback nag.
-     * 
+     *
      * @param controller Swing controller
      */
     public FeedbackNag(final SwingController controller) {
         super();
         this.controller = controller;
-        icon = new ImageIcon(IconManager.getIconManager().getImage("feedback"));
         menu = new JPopupMenu();
-        dismiss = new JMenuItem("Dismiss");
         show = new JMenuItem("Open");
+        final JMenuItem dismiss = new JMenuItem("Dismiss");
 
-        setIcon(icon);
+        setIcon(new ImageIcon(IconManager.getIconManager().getImage(
+                "feedback")));
         setBorder(BorderFactory.createEtchedBorder());
-        setToolTipText("We would appreciate any feedback you may have about DMDirc.");
+        setToolTipText("We would appreciate any feedback you may have about "
+                + "DMDirc.");
 
         menu.add(show);
         menu.add(dismiss);
@@ -84,7 +81,6 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
         show.addActionListener(this);
         dismiss.addActionListener(this);
         addMouseListener(this);
-
         controller.getSwingStatusBar().addComponent(this);
     }
 
@@ -94,7 +90,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
      * @param e Mouse event
      */
     @Override
-    public void mouseClicked(MouseEvent e) {
+    public void mouseClicked(final MouseEvent e) {
         checkMouseEvent(e);
     }
 
@@ -104,7 +100,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
      * @param e Mouse event
      */
     @Override
-    public void mousePressed(MouseEvent e) {
+    public void mousePressed(final MouseEvent e) {
         checkMouseEvent(e);
     }
 
@@ -114,7 +110,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
      * @param e Mouse event
      */
     @Override
-    public void mouseReleased(MouseEvent e) {
+    public void mouseReleased(final MouseEvent e) {
         if (e.getButton() == 1) {
             FeedbackDialog.showFeedbackDialog(controller.getMainFrame());
             controller.getSwingStatusBar().removeComponent(this);
@@ -128,7 +124,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
      * @param e Mouse event
      */
     @Override
-    public void mouseEntered(MouseEvent e) {
+    public void mouseEntered(final MouseEvent e) {
         checkMouseEvent(e);
     }
 
@@ -138,7 +134,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
      * @param e Mouse event
      */
     @Override
-    public void mouseExited(MouseEvent e) {
+    public void mouseExited(final MouseEvent e) {
         checkMouseEvent(e);
     }
 
@@ -147,7 +143,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
      *
      * @param e Mouse event
      */
-    private void checkMouseEvent(MouseEvent e) {
+    private void checkMouseEvent(final MouseEvent e) {
         if (e.isPopupTrigger()) {
             menu.show(this, e.getX(), e.getY());
         }
@@ -159,7 +155,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
      * @param e Action event
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == show) {
             FeedbackDialog.showFeedbackDialog(controller.getMainFrame());
         }

src/com/dmdirc/addons/ui_swing/components/substitutions/SubstitutionLabel.java

@@ -74,7 +74,6 @@ public class SubstitutionLabel extends JButton implements MouseListener,
 
         initComponents();
         addListeners();
-        layoutComponents();
     }
 
     /** Initialises the components. */
@@ -102,10 +101,6 @@ public class SubstitutionLabel extends JButton implements MouseListener,
         addActionListener(this);
     }
 
-    /** Lays out the components. */
-    private void layoutComponents() {
-    }
-
     /**
      * {@inheritDoc}
      *
@@ -159,8 +154,9 @@ public class SubstitutionLabel extends JButton implements MouseListener,
     /** {@inheritDoc} */
     @Override
     public void dragGestureRecognized(final DragGestureEvent dge) {
-        dragSource.startDrag(dge, Cursor.getPredefinedCursor(Cursor.HAND_CURSOR),
-                new StringTransferable(substitution.toString()), null);
+        dragSource.startDrag(dge, Cursor.getPredefinedCursor(
+                Cursor.HAND_CURSOR), new StringTransferable(substitution
+                .toString()), null);
     }
 
     /**
@@ -169,9 +165,10 @@ public class SubstitutionLabel extends JButton implements MouseListener,
      * @param e Action event
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(final ActionEvent e) {
         if (previousComponent instanceof JTextComponent) {
-            ((JTextComponent) previousComponent).replaceSelection(substitution.toString());
+            ((JTextComponent) previousComponent).replaceSelection(
+                    substitution.toString());
         }
     }
 
@@ -181,7 +178,7 @@ public class SubstitutionLabel extends JButton implements MouseListener,
      * @param e Focus event
      */
     @Override
-    public void focusGained(FocusEvent e) {
+    public void focusGained(final FocusEvent e) {
         previousComponent = e.getOppositeComponent();
     }
 
@@ -191,7 +188,7 @@ public class SubstitutionLabel extends JButton implements MouseListener,
      * @param e Focus event
      */
     @Override
-    public void focusLost(FocusEvent e) {
+    public void focusLost(final FocusEvent e) {
         //Ignore
     }
 }

src/com/dmdirc/addons/ui_swing/components/text/DMDircHTMLFactory.java

@@ -34,7 +34,7 @@ public class DMDircHTMLFactory extends HTMLFactory {
 
     /** {@inheritDoc} */
     @Override
-    public View create(Element elem) {
+    public View create(final Element elem) {
         final View view = super.create(elem);
         if (view instanceof ImageView) {
             return new DMDircImageView(elem);

src/com/dmdirc/addons/ui_swing/dialogs/FeedbackDialog.java

@@ -56,8 +56,8 @@ import javax.swing.event.DocumentListener;
 import net.miginfocom.swing.MigLayout;
 
 /** Feedback form. */
-public class FeedbackDialog extends StandardDialog implements ActionListener,
-        DocumentListener {
+public final class FeedbackDialog extends StandardDialog implements 
+        ActionListener, DocumentListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -66,7 +66,7 @@ public class FeedbackDialog extends StandardDialog implements ActionListener,
      */
     private static final long serialVersionUID = 1;
     /** A previously created instance of FeedbackDialog. */
-    private static volatile FeedbackDialog me;
+    private static FeedbackDialog me;
     /** Information label. */
     private TextLabel info;
     /** Name field. */
@@ -82,9 +82,9 @@ public class FeedbackDialog extends StandardDialog implements ActionListener,
     /** Sent. */
     private boolean sentReport = false;
 
-    /** 
-     * Instantiates the feedback dialog. 
-     * 
+    /**
+     * Instantiates the feedback dialog.
+     *
      * @param parentWindow Parent window
      */
     private FeedbackDialog(final Window parentWindow) {
@@ -100,7 +100,7 @@ public class FeedbackDialog extends StandardDialog implements ActionListener,
 
     /**
      * Creates the new feedback dialog if one doesn't exist, and displays it.
-     * 
+     *
      * @param parentWindow Parent window
      */
     public static void showFeedbackDialog(final Window parentWindow) {
@@ -112,7 +112,7 @@ public class FeedbackDialog extends StandardDialog implements ActionListener,
 
     /**
      * Returns the current instance of the FeedbackDialog.
-     * 
+     *
      * @param parentWindow Parent window
      *
      * @return The current FeedbackDialog instance
@@ -142,15 +142,15 @@ public class FeedbackDialog extends StandardDialog implements ActionListener,
         getOkButton().setEnabled(false);
         getCancelButton().setActionCommand("Close");
 
-        info = new TextLabel("Thank you for using DMDirc. If you have any " +
-                "feedback about the client, such as bug reports or feature " +
-                "requests, please send it to us using the form below.  " +
-                "The name and e-mail address fields are optional if you " +
-                "don't want us to contact you about your feedback.\n\n" +
-                "Please note that this is for feedback such as bug reports " +
-                "and suggestions, not for technical support. For " +
-                "technical support, please join #DMDirc using the button " +
-                "in the help menu.");
+        info = new TextLabel("Thank you for using DMDirc. If you have any "
+                + "feedback about the client, such as bug reports or feature "
+                + "requests, please send it to us using the form below.  "
+                + "The name and e-mail address fields are optional if you "
+                + "don't want us to contact you about your feedback.\n\n"
+                + "Please note that this is for feedback such as bug reports "
+                + "and suggestions, not for technical support. For "
+                + "technical support, please join #DMDirc using the button "
+                + "in the help menu.");
         name = new JTextField();
         email = new JTextField();
         feedback = new JTextArea();
@@ -170,7 +170,8 @@ public class FeedbackDialog extends StandardDialog implements ActionListener,
         dmdircCheckbox.setMargin(new Insets(0, 0, 0, 0));
         dmdircCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 
-        setLayout(new MigLayout("fill, wmin 600, wmax 600, hmin 400, hmax 400"));
+        setLayout(new MigLayout(
+                "fill, wmin 600, wmax 600, hmin 400, hmax 400"));
 
         add(info, "span, growx, wrap, gapbottom unrel");
 
@@ -201,7 +202,8 @@ public class FeedbackDialog extends StandardDialog implements ActionListener,
         getOkButton().setText("Close");
         getOkButton().setActionCommand("Close");
 
-        setLayout(new MigLayout("fill, wmin 600, wmax 600, hmin 400, hmax 400"));
+        setLayout(new MigLayout(
+                "fill, wmin 600, wmax 600, hmin 400, hmax 400"));
 
         info.setText(error.toString());
 
@@ -226,40 +228,45 @@ public class FeedbackDialog extends StandardDialog implements ActionListener,
         final StringBuilder serverInfo = new StringBuilder();
         final StringBuilder dmdircInfo = new StringBuilder();
         if (serverCheckbox.isSelected()) {
-            for (Server server : ServerManager.getServerManager().getServers()) {
-                if (!server.getState().isDisconnected()) {
-                    serverInfo.append("Server name: ").append(server.getName())
-                            .append("\n");
-                    serverInfo.append("Actual name: ").append(server.getParser()
-                            .getServerName()).append("\n");
-                    serverInfo.append("Network: ").append(server.getNetwork())
-                            .append("\n");
-                    serverInfo.append("IRCd: ").append(server.getParser()
-                            .getServerSoftware()).append(" - ");
-                    serverInfo.append(server.getParser()
-                            .getServerSoftwareType()).append("\n");
-                    serverInfo.append("Modes: ").append(server.getParser()
-                            .getBooleanChannelModes()).append(" ");
-                    serverInfo.append(server.getParser().getListChannelModes())
-                            .append(" ");
-                    serverInfo.append(server.getParser().
-                            getParameterChannelModes()).append(" ");
-                    serverInfo.append(server.getParser().
-                            getDoubleParameterChannelModes());
+            for (Server server : ServerManager.getServerManager()
+                    .getServers()) {
+                if (server.getState().isDisconnected()) {
+                    continue;
                 }
+                serverInfo.append("Server name: ").append(server.getName())
+                        .append("\n");
+                serverInfo.append("Actual name: ").append(server.getParser()
+                        .getServerName()).append("\n");
+                serverInfo.append("Network: ").append(server.getNetwork())
+                        .append("\n");
+                serverInfo.append("IRCd: ").append(server.getParser()
+                        .getServerSoftware()).append(" - ");
+                serverInfo.append(server.getParser().getServerSoftwareType())
+                        .append("\n");
+                serverInfo.append("Modes: ").append(server.getParser()
+                        .getBooleanChannelModes()).append(" ");
+                serverInfo.append(server.getParser().getListChannelModes())
+                        .append(" ");
+                serverInfo.append(server.getParser().getParameterChannelModes())
+                        .append(" ");
+                serverInfo.append(server.getParser().
+                        getDoubleParameterChannelModes());
             }
         }
         if (dmdircCheckbox.isSelected()) {
-            dmdircInfo.append("DMDirc version: " + Info.getDMDircVersion()).
-                    append("\n");
-            dmdircInfo.append("Profile directory: " + Main.getConfigDir()).
-                    append("\n");
-            dmdircInfo.append("Java version: " + Info.getJavaVersion()).append("\n");
-            dmdircInfo.append("OS Version: " + Info.getOSVersion()).append("\n");
-            dmdircInfo.append("Look & Feel: " + SwingController.getLookAndFeel());
+            dmdircInfo.append("DMDirc version: ").append(
+                    Info.getDMDircVersion()).append("\n");
+            dmdircInfo.append("Profile directory: ").append(
+                    Main.getConfigDir()).append("\n");
+            dmdircInfo.append("Java version: ").append(
+                    Info.getJavaVersion()).append("\n");
+            dmdircInfo.append("OS Version: ").append(
+                    Info.getOSVersion()).append("\n");
+            dmdircInfo.append("Look & Feel: ").append(
+                    SwingController.getLookAndFeel());
         }
         new SendWorker(me, name.getText().trim(), email.getText().trim(),
-                feedback.getText().trim(), serverInfo. toString().trim(),
+                feedback.getText().trim(), serverInfo.toString().trim(),
                 dmdircInfo.toString().trim()).executeInExecutor();
     }
 
@@ -290,19 +297,19 @@ public class FeedbackDialog extends StandardDialog implements ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void insertUpdate(DocumentEvent e) {
+    public void insertUpdate(final DocumentEvent e) {
         validateInput();
     }
 
     /** {@inheritDoc} */
     @Override
-    public void removeUpdate(DocumentEvent e) {
+    public void removeUpdate(final DocumentEvent e) {
         validateInput();
     }
 
     /** {@inheritDoc} */
     @Override
-    public void changedUpdate(DocumentEvent e) {
+    public void changedUpdate(final DocumentEvent e) {
     //Ignore
     }
 
@@ -347,8 +354,8 @@ class SendWorker extends LoggingSwingWorker {
      * @param email Email
      * @param feedback Feedback
      */
-    public SendWorker(FeedbackDialog dialog, String name, String email,
-            String feedback) {
+    public SendWorker(final FeedbackDialog dialog, final String name,
+            final String email, final String feedback) {
         this(dialog, name, email, feedback, "", "");
     }
 
@@ -365,6 +372,8 @@ class SendWorker extends LoggingSwingWorker {
     public SendWorker(final FeedbackDialog dialog, final String name,
             final String email, final String feedback,
             final String serverInfo, final String dmdircInfo) {
+        super();
+
         this.dialog = dialog;
         this.name = name;
         this.email = email;
@@ -375,13 +384,9 @@ class SendWorker extends LoggingSwingWorker {
         error = new StringBuilder();
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @throws java.lang.Exception If unable to return a result
-     */
+    /** {@inheritDoc} */
     @Override
-    protected Object doInBackground() throws Exception {
+    protected Object doInBackground() {
         final Map<String, String> postData =
                 new HashMap<String, String>();
 
@@ -394,7 +399,8 @@ class SendWorker extends LoggingSwingWorker {
         if (!feedback.isEmpty()) {
             postData.put("feedback", feedback);
         }
-        postData.put("version", IdentityManager.getGlobalConfig().getOption("version", "version"));
+        postData.put("version", IdentityManager.getGlobalConfig().getOption(
+                "version", "version"));
         if (!serverInfo.isEmpty()) {
             postData.put("serverInfo", serverInfo);
         }
@@ -402,6 +408,18 @@ class SendWorker extends LoggingSwingWorker {
             postData.put("dmdircInfo", dmdircInfo);
         }
 
+        sendData(postData);
+
+        return error;
+    }
+
+    /**
+     * Sends the error data to the server appending returned information to the
+     * global error variable.
+     *
+     * @param postData Feedback data to send
+     */
+    private void sendData(final Map<String, String> postData) {
         try {
             final List<String> response =
                     Downloader.getPage("http://www.dmdirc.com/feedback.php",
@@ -416,10 +434,8 @@ class SendWorker extends LoggingSwingWorker {
         } catch (MalformedURLException ex) {
             error.append("Malformed feedback URL.");
         } catch (IOException ex) {
-            error.append("Failure: " + ex.getMessage());
+            error.append("Failure: ").append(ex.getMessage());
         }
-
-        return error;
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/dialogs/StandardInputDialog.java

@@ -58,15 +58,14 @@ public abstract class StandardInputDialog extends StandardDialog {
 
     /**
      * Instantiates a new standard input dialog.
-     * 
+     *
      * @param owner Dialog owner
      * @param modal modality type
      * @param title Dialog title
      * @param message Dialog message
      */
-    public StandardInputDialog(Window owner, ModalityType modal,
-            final String title,
-            final String message) {
+    public StandardInputDialog(final Window owner, final ModalityType modal,
+            final String title, final String message) {
         this(owner, modal, title, message, new Validator<String>() {
 
             /** {@inheritDoc} */
@@ -79,14 +78,14 @@ public abstract class StandardInputDialog extends StandardDialog {
 
     /**
      * Instantiates a new standard input dialog.
-     * 
+     *
      * @param owner Dialog owner
      * @param modal modality type
      * @param validator Textfield validator
      * @param title Dialog title
      * @param message Dialog message
      */
-    public StandardInputDialog(Window owner, ModalityType modal,
+    public StandardInputDialog(final Window owner, final ModalityType modal,
             final String title, final String message,
             final Validator<String> validator) {
         super(owner, modal);
@@ -104,7 +103,7 @@ public abstract class StandardInputDialog extends StandardDialog {
 
     /**
      * Called when the dialog's OK button is clicked.
-     * 
+     *
      * @return whether the dialog can close
      */
     public abstract boolean save();
@@ -125,14 +124,14 @@ public abstract class StandardInputDialog extends StandardDialog {
     }
 
     /**
-     * Adds the listeners
+     * Adds the listeners.
      */
     private void addListeners() {
         getOkButton().addActionListener(new ActionListener() {
 
             /** {@inheritDoc} */
             @Override
-            public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(final ActionEvent e) {
                 if (save()) {
                     dispose();
                 }
@@ -142,7 +141,7 @@ public abstract class StandardInputDialog extends StandardDialog {
 
             /** {@inheritDoc} */
             @Override
-            public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(final ActionEvent e) {
                 cancelled();
                 dispose();
             }
@@ -151,13 +150,13 @@ public abstract class StandardInputDialog extends StandardDialog {
 
             /** {@inheritDoc} */
             @Override
-            public void windowOpened(WindowEvent e) {
+            public void windowOpened(final WindowEvent e) {
                 textField.requestFocusInWindow();
             }
 
             /** {@inheritDoc} */
             @Override
-            public void windowClosed(WindowEvent e) {
+            public void windowClosed(final WindowEvent e) {
                 cancelled();
             //dispose();
             }
@@ -166,19 +165,19 @@ public abstract class StandardInputDialog extends StandardDialog {
 
             /** {@inheritDoc} */
             @Override
-            public void insertUpdate(DocumentEvent e) {
+            public void insertUpdate(final DocumentEvent e) {
                 validateText();
             }
 
             /** {@inheritDoc} */
             @Override
-            public void removeUpdate(DocumentEvent e) {
+            public void removeUpdate(final DocumentEvent e) {
                 validateText();
             }
 
             /** {@inheritDoc} */
             @Override
-            public void changedUpdate(DocumentEvent e) {
+            public void changedUpdate(final DocumentEvent e) {
             //Ignore
             }
         });
@@ -212,7 +211,7 @@ public abstract class StandardInputDialog extends StandardDialog {
 
     /**
      * Returns the text in the input field.
-     * 
+     *
      * @return Input text
      */
     public final String getText() {
@@ -221,7 +220,7 @@ public abstract class StandardInputDialog extends StandardDialog {
 
     /**
      * Sets the dialogs text to the specified text.
-     * 
+     *
      * @param text New test
      */
     public final void setText(final String text) {

src/com/dmdirc/addons/ui_swing/dialogs/StandardMessageDialog.java

@@ -1,17 +1,16 @@
 /*
- * 
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -46,10 +45,10 @@ public class StandardMessageDialog extends StandardDialog {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
+    /** Message. */
+    private final String message;
     /** Blurb label. */
     private TextLabel blurb;
-    /** Message. */
-    private String message;
 
     /**
      * Instantiates a new standard input dialog.
@@ -59,7 +58,7 @@ public class StandardMessageDialog extends StandardDialog {
      * @param title Dialog title
      * @param message Dialog message
      */
-    public StandardMessageDialog(Window owner, ModalityType modal,
+    public StandardMessageDialog(final Window owner, final ModalityType modal,
             final String title, final String message) {
         super(owner, modal);
 
@@ -86,6 +85,7 @@ public class StandardMessageDialog extends StandardDialog {
      * Called when the dialog's cancel button is clicked, or otherwise closed.
      */
     public void cancelled() {
+        //Do nothing
     }
 
     /**
@@ -98,14 +98,14 @@ public class StandardMessageDialog extends StandardDialog {
     }
 
     /**
-     * Adds the listeners
+     * Adds the listeners.
      */
     private void addListeners() {
         final ActionListener listener = new ActionListener() {
 
             /** {@inheritDoc} */
             @Override
-            public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(final ActionEvent e) {
                 if (save()) {
                     dispose();
                 }
@@ -117,13 +117,13 @@ public class StandardMessageDialog extends StandardDialog {
 
             /** {@inheritDoc} */
             @Override
-            public void windowOpened(WindowEvent e) {
+            public void windowOpened(final WindowEvent e) {
                 //Ignore
             }
 
             /** {@inheritDoc} */
             @Override
-            public void windowClosed(WindowEvent e) {
+            public void windowClosed(final WindowEvent e) {
                 cancelled();
             }
         });

src/com/dmdirc/addons/ui_swing/dialogs/StandardQuestionDialog.java

@@ -39,10 +39,10 @@ import net.miginfocom.swing.MigLayout;
  */
 public abstract class StandardQuestionDialog extends StandardDialog {
 
+    /** Message. */
+    private final String message;
     /** Blurb label. */
     private TextLabel blurb;
-    /** Message. */
-    private String message;
     /** Question result. */
     private boolean result = false;
 
@@ -54,7 +54,7 @@ public abstract class StandardQuestionDialog extends StandardDialog {
      * @param title Dialog title
      * @param message Dialog message
      */
-    public StandardQuestionDialog(Window owner, ModalityType modal,
+    public StandardQuestionDialog(final Window owner, final ModalityType modal,
             final String title, final String message) {
         super(owner, modal);
 
@@ -91,14 +91,14 @@ public abstract class StandardQuestionDialog extends StandardDialog {
     }
 
     /**
-     * Adds the listeners
+     * Adds the listeners.
      */
     private void addListeners() {
         getOkButton().addActionListener(new ActionListener() {
 
             /** {@inheritDoc} */
             @Override
-            public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(final ActionEvent e) {
                 if (save()) {
                     result = true;
                     dispose();
@@ -109,7 +109,7 @@ public abstract class StandardQuestionDialog extends StandardDialog {
 
             /** {@inheritDoc} */
             @Override
-            public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(final ActionEvent e) {
                 cancelled();
                 dispose();
             }
@@ -118,13 +118,13 @@ public abstract class StandardQuestionDialog extends StandardDialog {
 
             /** {@inheritDoc} */
             @Override
-            public void windowOpened(WindowEvent e) {
+            public void windowOpened(final WindowEvent e) {
                 //Ignore
             }
 
             /** {@inheritDoc} */
             @Override
-            public void windowClosed(WindowEvent e) {
+            public void windowClosed(final WindowEvent e) {
                 if (!result) {
                     cancelled();
                 }

src/com/dmdirc/addons/ui_swing/dialogs/about/AboutDialog.java

@@ -50,7 +50,7 @@ public final class AboutDialog extends StandardDialog implements
      */
     private static final long serialVersionUID = 5;
     /** Previously created instance of AboutDialog. */
-    private static volatile AboutDialog me = null;
+    private static AboutDialog me = null;
     /** Tabbed pane to use. */
     private JTabbedPane tabbedPane;
     /** Credits panel. */
@@ -66,7 +66,8 @@ public final class AboutDialog extends StandardDialog implements
      * @param parentWindow Parent window
      * @param urlHandler The URL Handler to use to handle clicked links
      */
-    private AboutDialog(final Window parentWindow, final URLHandler urlHandler) {
+    private AboutDialog(final Window parentWindow,
+            final URLHandler urlHandler) {
         super(parentWindow, ModalityType.MODELESS);
 
         this.urlHandler = urlHandler;
@@ -80,7 +81,8 @@ public final class AboutDialog extends StandardDialog implements
      * @param parentWindow Parent window
      * @param urlHandler The URL Handler to use to handle clicked links
      */
-    public static void showAboutDialog(final Window parentWindow, final URLHandler urlHandler) {
+    public static void showAboutDialog(final Window parentWindow,
+            final URLHandler urlHandler) {
         me = getAboutDialog(parentWindow, urlHandler);
 
         me.display();
@@ -163,10 +165,11 @@ public final class AboutDialog extends StandardDialog implements
 
     /** {@inheritDoc} */
     @Override
-    public void stateChanged(ChangeEvent e) {
+    public void stateChanged(final ChangeEvent e) {
         history = 10 * (history % 10000) + tabbedPane.getSelectedIndex();
 
-        if (history / 10 % 100 == 32 && (history & 1) == 1 && history >> 8 == 118) {
+        if (history / 10 % 100 == 32 && (history & 1) == 1
+                && history >> 8 == 118) {
             cp.showEE();
         }
     }

src/com/dmdirc/addons/ui_swing/dialogs/about/LicenceLoader.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -48,9 +48,9 @@ import javax.swing.tree.DefaultTreeModel;
 public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
 
     /** Tree. */
-    private JTree tree;
+    private final JTree tree;
     /** Model to load licences into. */
-    private DefaultTreeModel model;
+    private final DefaultTreeModel model;
 
     /**
      * Instantiates a new licence loader.
@@ -59,6 +59,8 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
      * @param model Model to load licences into
      */
     public LicenceLoader(final JTree tree, final DefaultTreeModel model) {
+        super();
+
         this.tree = tree;
         this.model = model;
     }
@@ -66,18 +68,18 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
     /**
      * {@inheritDoc}
      *
-     * @throws Exception on any exception in the background task
+     * @throws IOException on any exception in the background task
      */
     @Override
-    protected Void doInBackground() throws Exception {
+    protected Void doInBackground() throws IOException {
         final ResourceManager rm = ResourceManager.getResourceManager();
         if (rm == null) {
             Logger.userError(ErrorLevel.LOW, "Unable to load licences, "
                     + "no resource manager");
         } else {
             addCoreLicences(rm);
-            for (PluginInfo pi :
-                    PluginManager.getPluginManager().getPluginInfos()) {
+            for (PluginInfo pi : PluginManager.getPluginManager()
+                    .getPluginInfos()) {
                 addPluginLicences(pi);
             }
         }

src/com/dmdirc/addons/ui_swing/dialogs/about/LicenceRenderer.java

@@ -1,17 +1,16 @@
 /*
- * 
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -47,16 +46,17 @@ public class LicenceRenderer extends DefaultTreeCellRenderer {
 
     /** {@inheritDoc} */
     @Override
-    public Component getTreeCellRendererComponent(JTree tree, Object value,
-            boolean sel, boolean expanded, boolean leaf, int row,
-            boolean hasFocus) {
+    public Component getTreeCellRendererComponent(final JTree tree,
+            final Object value, final boolean sel, final boolean expanded,
+            final boolean leaf, final int row, final boolean hasFocus) {
         final JLabel label = (JLabel) super.getTreeCellRendererComponent(tree,
                 value, sel, expanded, leaf, row, hasFocus);
         label.setIcon(null);
         label.setOpaque(false);
-        if (((DefaultMutableTreeNode) value).getUserObject() instanceof PluginInfo) {
-            setText(((PluginInfo) ((DefaultMutableTreeNode) value).getUserObject()).
-                    getNiceName());
+        if (((DefaultMutableTreeNode) value).getUserObject()
+                instanceof PluginInfo) {
+            setText(((PluginInfo) ((DefaultMutableTreeNode) value)
+                    .getUserObject()).getNiceName());
         }
         return label;
     }
@@ -75,5 +75,5 @@ public class LicenceRenderer extends DefaultTreeCellRenderer {
     @Override
     public Color getBackground() {
         return null;
-    } 
+    }
 }

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionEditorPanel.java

@@ -48,7 +48,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Action conditioneditor panel.
  */
-public class ActionConditionEditorPanel extends JPanel implements 
+public class ActionConditionEditorPanel extends JPanel implements
         ActionListener, DocumentListener, PropertyChangeListener {
 
     /**
@@ -280,7 +280,7 @@ public class ActionConditionEditorPanel extends JPanel implements
 
     /** {@inheritDoc} */
     @Override
-    public void setEnabled(boolean enabled) {
+    public void setEnabled(final boolean enabled) {
         super.setEnabled(enabled);
         arguments.setEnabled(enabled);
         if (enabled) {
@@ -299,7 +299,7 @@ public class ActionConditionEditorPanel extends JPanel implements
      *
      * @param trigger new trigger
      */
-    void setTrigger(final ActionType trigger) {
+    public void setTrigger(final ActionType trigger) {
         this.trigger = trigger;
 
         setEnabled(trigger != null);
@@ -310,7 +310,7 @@ public class ActionConditionEditorPanel extends JPanel implements
 
     /** {@inheritDoc} */
     @Override
-    public void propertyChange(PropertyChangeEvent evt) {
+    public void propertyChange(final PropertyChangeEvent evt) {
         firePropertyChange("validationResult", evt.getOldValue(),
                 evt.getNewValue());
     }

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersListPanel.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -62,7 +62,7 @@ public class ActionTriggersListPanel extends JPanel {
 
     /**
      * Instantiates the panel.
-     * 
+     *
      * @param triggers Trigger list
      */
     public ActionTriggersListPanel(final List<ActionType> triggers) {
@@ -71,7 +71,6 @@ public class ActionTriggersListPanel extends JPanel {
         this.triggers = new ArrayList<ActionType>(triggers);
 
         initComponents();
-        addListeners();
         layoutComponents();
     }
 
@@ -81,10 +80,6 @@ public class ActionTriggersListPanel extends JPanel {
         setLayout(new MigLayout("fillx, wrap 2"));
     }
 
-    /** Adds the listeners. */
-    private void addListeners() {
-    }
-
     /** Lays out the components. */
     private void layoutComponents() {
         synchronized (triggers) {
@@ -100,18 +95,18 @@ public class ActionTriggersListPanel extends JPanel {
 
                     /** {@inheritDoc} */
                     @Override
-                    public void actionPerformed(ActionEvent e) {
+                    public void actionPerformed(final ActionEvent e) {
                         delTrigger(trigger);
                     }
                 });
-                
+
                 button.setEnabled(isEnabled());
-                
+
                 add(new JLabel(trigger.getName()), "growx, pushx");
                 add(button, "right");
             }
 
-            if (triggers.size() == 0) {
+            if (triggers.isEmpty()) {
                 add(new TextLabel("No triggers."));
             }
             setVisible(true);
@@ -120,7 +115,7 @@ public class ActionTriggersListPanel extends JPanel {
 
     /**
      * Adds a trigger to the list.
-     * 
+     *
      * @param trigger Trigger to add
      */
     public void addTrigger(final ActionType trigger) {
@@ -142,7 +137,7 @@ public class ActionTriggersListPanel extends JPanel {
 
     /**
      * Deletes a trigger from the list.
-     * 
+     *
      * @param trigger Trigger to delete
      */
     public void delTrigger(final ActionType trigger) {
@@ -174,7 +169,7 @@ public class ActionTriggersListPanel extends JPanel {
 
     /**
      * Returns the current list of triggers.
-     * 
+     *
      * @return Trigger list
      */
     public List<ActionType> getTriggers() {
@@ -185,9 +180,9 @@ public class ActionTriggersListPanel extends JPanel {
 
     /**
      * Gets the trigger at the specified index.
-     * 
+     *
      * @param index Index to retrieve
-     * 
+     *
      * @return Requested action trigger
      */
     public ActionType getTrigger(final int index) {
@@ -196,7 +191,7 @@ public class ActionTriggersListPanel extends JPanel {
 
     /**
      * Returns the number of triggers.
-     * 
+     *
      * @return Trigger count
      */
     public int getTriggerCount() {
@@ -210,7 +205,8 @@ public class ActionTriggersListPanel extends JPanel {
      *
      * @param listener Listener to add
      */
-    public void addTriggerListener(final ActionTriggerRemovalListener listener) {
+    public void addTriggerListener(
+            final ActionTriggerRemovalListener listener) {
         if (listener == null) {
             return;
         }
@@ -223,7 +219,8 @@ public class ActionTriggersListPanel extends JPanel {
      *
      * @param listener Listener to remove
      */
-    public void removeTriggerListener(final ActionTriggerRemovalListener listener) {
+    public void removeTriggerListener(
+            final ActionTriggerRemovalListener listener) {
         listeners.remove(ActionTriggerRemovalListener.class, listener);
     }
 
@@ -233,7 +230,8 @@ public class ActionTriggersListPanel extends JPanel {
      * @param type Removed trigger
      */
     protected void fireTriggerRemoved(final ActionType type) {
-        for (ActionTriggerRemovalListener listener : listeners.get(ActionTriggerRemovalListener.class)) {
+        for (ActionTriggerRemovalListener listener : listeners.get(
+                ActionTriggerRemovalListener.class)) {
             listener.triggerRemoved(type);
         }
     }
@@ -251,7 +249,7 @@ public class ActionTriggersListPanel extends JPanel {
             }
         });
     }
-    
+
     /** Validates the triggers. */
     public void validateTriggers() {
         firePropertyChange("triggerCount", triggers.size(), triggers.size());

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersPanel.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -91,15 +91,15 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
         trigger.addPopupMenuListener(new PopupMenuListener() {
 
             @Override
-            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-                JComboBox box = (JComboBox) e.getSource();
-                Object comp = box.getUI().getAccessibleChild(box, 0);
+            public void popupMenuWillBecomeVisible(final PopupMenuEvent e) {
+                final JComboBox box = (JComboBox) e.getSource();
+                final Object comp = box.getUI().getAccessibleChild(box, 0);
                 if (!(comp instanceof JPopupMenu)) {
                     return;
                 }
-                JComponent scrollPane = (JComponent) ((JPopupMenu) comp).
+                final JComponent scrollPane = (JComponent) ((JPopupMenu) comp).
                         getComponent(0);
-                Dimension size = scrollPane.getPreferredSize();
+                final Dimension size = scrollPane.getPreferredSize();
                 if (scrollPane instanceof JScrollPane) {
                     size.width = Math.max(size.width, ((ActionTypeModel)
                             trigger.getModel()).getMaxWidth() + (int)
@@ -107,18 +107,20 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
                             getPreferredSize().getWidth());
                 } else {
                     size.width = Math.max(size.width, ((ActionTypeModel)
-                            trigger.getModel()). getMaxWidth());
+                            trigger.getModel()).getMaxWidth());
                 }
                 scrollPane.setPreferredSize(size);
                 scrollPane.setMaximumSize(size);
             }
 
             @Override
-            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+            public void popupMenuWillBecomeInvisible(final PopupMenuEvent e) {
+                //Not required
             }
 
             @Override
-            public void popupMenuCanceled(PopupMenuEvent e) {
+            public void popupMenuCanceled(final PopupMenuEvent e) {
+                //Not required
             }
         });
 
@@ -142,9 +144,8 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
     private void layoutComponents() {
         setLayout(new MigLayout("fill, pack"));
 
-        add(new TextLabel(
-                "This action will be triggered when any of these events occurs: "),
-                "growx, pushx, wrap, spanx");
+        add(new TextLabel("This action will be triggered when any of these "
+                + "events occurs: "), "growx, pushx, wrap, spanx");
         add(triggerList, "grow, push, wrap, spanx");
         add(trigger, "growx, pushx");
         add(add, "right");
@@ -152,7 +153,7 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
 
     /**
      * Returns the primary trigger for this panel.
-     * 
+     *
      * @return Primary trigger or null
      */
     public ActionType getPrimaryTrigger() {
@@ -164,7 +165,7 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
 
     /**
      * Returns the list of triggers.
-     * 
+     *
      * @return Trigger list
      */
     public ActionType[] getTriggers() {
@@ -174,10 +175,10 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
 
     /**
      * Sets the triggers.
-     * 
+     *
      * @param triggers Sets the triggers.
      */
-    void setTriggers(final ActionType[] triggers) {
+    public void setTriggers(final ActionType[] triggers) {
         triggerList.clearTriggers();
 
         for (ActionType localTrigger : triggers) {
@@ -187,9 +188,9 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
         repopulateTriggers();
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @Override
@@ -220,8 +221,8 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
                 ((ActionTypeModel) trigger.getModel()).removeAllElements();
 
                 if (triggerList.getTriggerCount() == 0) {
-                    ((ActionTypeModel) trigger.getModel()).setTypeGroup(ActionManager.
-                            getTypeGroups());
+                    ((ActionTypeModel) trigger.getModel()).setTypeGroup(
+                            ActionManager.getTypeGroups());
                     trigger.setEnabled((trigger.getModel().getSize() > 0));
                     return;
                 }

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsGroupPanel.java

@@ -65,7 +65,7 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
      */
     private static final long serialVersionUID = 1;
     /** Parent dialog. */
-    private Window parent;
+    private final Window parent;
     /** Table scrollpane. */
     private JScrollPane scrollPane;
     /** Actions table. */
@@ -81,9 +81,9 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
     /** Action group. */
     private ActionGroup group;
 
-    /** 
+    /**
      * Creates a new instance of ActionsManagerDialog.
-     * 
+     *
      * @param parent Parent window
      * @param group Action group to display
      */
@@ -100,7 +100,7 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
 
     /**
      * Updates or creates the new action.
-     * 
+     *
      * @param action Action changed or created
      */
     public void actionChanged(final Action action) {
@@ -116,7 +116,7 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
 
     /**
      * Deletes an action from the group.
-     * 
+     *
      * @param name Name of the action
      */
     public void actionDeleted(final String name) {
@@ -131,14 +131,15 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
      */
     private void initComponents() {
         scrollPane = new JScrollPane();
-        model = new ActionTableModel(group == null ? new ArrayList<Action>() : group.
-                getActions());
+        model = new ActionTableModel(group == null ? new ArrayList<Action>()
+                : group.getActions());
         table = new PackingTable(model, false, scrollPane, false) {
 
             /**
-             * A version number for this class. It should be changed whenever the class
-             * structure is changed (or anything else that would prevent serialized
-             * objects being unserialized with the new class).
+             * A version number for this class. It should be changed whenever
+             * the class structure is changed (or anything else that would
+             * prevent serialized objects being unserialized with the new
+             * class).
              */
             private static final long serialVersionUID = 1;
             /** Action type renderer. */
@@ -150,7 +151,8 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
 
             /** {@inheritDoc} */
             @Override
-            public TableCellRenderer getCellRenderer(int row, int column) {
+            public TableCellRenderer getCellRenderer(final int row,
+                    final int column) {
                 switch (column) {
                     case 1:
                         return typeRenderer;
@@ -222,7 +224,7 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
 
     /**
      * Sets the action group for the panel.
-     * 
+     *
      * @param group New action group
      */
     public void setActionGroup(final ActionGroup group) {
@@ -232,9 +234,9 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
         add.setEnabled(group != null);
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param e Action event
      */
     @Override
@@ -257,9 +259,10 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
                     getName() + "'?") {
 
                 /**
-                 * A version number for this class. It should be changed whenever the class
-                 * structure is changed (or anything else that would prevent serialized
-                 * objects being unserialized with the new class).
+                 * A version number for this class. It should be changed
+                 * whenever the class structure is changed (or anything else
+                 * that would prevent serialized objects being unserialized
+                 * with the new class).
                  */
                 private static final long serialVersionUID = 1;
 
@@ -273,7 +276,7 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
                 /** {@inheritDoc} */
                 @Override
                 public void cancelled() {
-                    return;
+                    //Ignore
                 }
             }.display();
         }

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicTable.java

@@ -1,17 +1,16 @@
 /*
- * 
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -52,7 +51,7 @@ public class TopicTable extends JTable {
 
     /** {@inheritDoc} */
     @Override
-    public boolean isCellEditable(int row, int column) {
+    public boolean isCellEditable(final int row, final int column) {
         return false;
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/prefs/CategoryLabel.java

@@ -1,17 +1,16 @@
 /*
- * 
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -23,14 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.IconManager;
 
 import java.awt.Dimension;
-import java.util.concurrent.ExecutionException;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
@@ -54,17 +48,22 @@ public class CategoryLabel extends JLabel {
     /** Panel gap. */
     private final int padding = (int)
             (1.5 * PlatformDefaults.getUnitValueX("related").getValue());
-    private JList parentList;
+    /** Parent list. */
+    private final JList parentList;
 
     /**
-     * 
-     * @param parentList
-     * @param category
-     * @param numCats
-     * @param index 
+     * Creates a new category label.
+     *
+     * @param parentList Parent list
+     * @param category Parent category
+     * @param numCats Number of categories shown
+     * @param index Index of this label
      */
     public CategoryLabel(final JList parentList,
-            final PreferencesCategory category, final int numCats, final int index) {
+            final PreferencesCategory category, final int numCats,
+            final int index) {
+        super();
+        
         this.parentList = parentList;
 
         setText(category.getTitle());
@@ -77,11 +76,10 @@ public class CategoryLabel extends JLabel {
             level++;
         }
 
-        setPreferredSize(new Dimension(100000, Math.max(16,
-                getFont().getSize()) + padding));
-        setBorder(BorderFactory.createEmptyBorder(padding / 2, padding + level *
-                18, padding / 2,
-                padding));
+        setPreferredSize(new Dimension(100000, Math.max(16, getFont().getSize())
+                + padding));
+        setBorder(BorderFactory.createEmptyBorder(padding / 2, padding + level
+                * 18, padding / 2, padding));
         setBackground(parentList.getBackground());
         setForeground(parentList.getForeground());
         setOpaque(true);
@@ -101,9 +99,9 @@ public class CategoryLabel extends JLabel {
             setBackground(UIManager.getColor("ToolTip.background"));
             setForeground(UIManager.getColor("ToolTip.foreground"));
             setBorder(BorderFactory.createCompoundBorder(
-                    BorderFactory.createMatteBorder(1, 0, hasChildren ? 1 : 0, 0,
-                    UIManager.getColor("ToolTip.background").darker().darker()),
-                    getBorder()));
+                    BorderFactory.createMatteBorder(1, 0, hasChildren ? 1 : 0,
+                    0, UIManager.getColor("ToolTip.background").darker()
+                    .darker()), getBorder()));
         }
     }
 
@@ -113,7 +111,7 @@ public class CategoryLabel extends JLabel {
      * @param icon New icon
      */
     @Override
-    public void setIcon(Icon icon) {
+    public void setIcon(final Icon icon) {
         super.setIcon(icon);
 
         if (parentList != null) {
@@ -121,34 +119,4 @@ public class CategoryLabel extends JLabel {
         }
     }
 
-    private static class IconLoader extends LoggingSwingWorker<Icon, Void> {
-
-        private CategoryLabel label;
-        private String icon;
-
-        public IconLoader(final CategoryLabel label, final String icon) {
-            this.label = label;
-            this.icon = icon;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        protected Icon doInBackground() throws Exception {
-            return IconManager.getIconManager().getIcon(icon);
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        protected void done() {
-            try {
-                label.setIcon(get());
-            } catch (InterruptedException ex) {
-                //Ignore
-            } catch (ExecutionException ex) {
-                Logger.appError(ErrorLevel.LOW, ex.getMessage(), ex);
-            }
-
-        }
-    }
-
 }

src/com/dmdirc/addons/ui_swing/dialogs/prefs/IconLoader.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.ui_swing.dialogs.prefs;
+
+import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.IconManager;
+import java.util.concurrent.ExecutionException;
+import javax.swing.Icon;
+
+/**
+ * Loads an icon in the background and uses it for a category label once it
+ * has been loaded.
+ */
+public class IconLoader extends LoggingSwingWorker<Icon, Void> {
+
+    /** Category this icon will be used for. */
+    private final CategoryLabel label;
+    /** Icon to load. */
+    private final String icon;
+
+    /**
+     * Creates a new icon loader adding the specified icon to the specified
+     * icon after it has been loaded in the background.
+     *
+     * @param label Label to load category for
+     * @param icon Icon to load
+     */
+    public IconLoader(final CategoryLabel label, final String icon) {
+        super();
+
+        this.label = label;
+        this.icon = icon;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Icon doInBackground() {
+        return IconManager.getIconManager().getIcon(icon);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void done() {
+        try {
+            label.setIcon(get());
+        } catch (InterruptedException ex) {
+            //Ignore
+        } catch (ExecutionException ex) {
+            Logger.appError(ErrorLevel.LOW, ex.getMessage(), ex);
+        }
+
+    }
+}

src/com/dmdirc/addons/ui_swing/dialogs/prefs/NoRemovePanel.java

@@ -1,17 +1,16 @@
 /*
- * 
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -40,40 +39,15 @@ public class NoRemovePanel extends JPanel {
      */
     private static final long serialVersionUID = 1;
 
-    /**
-     * Creates a new JPanel that prevents components being removed.
-     */
-    public NoRemovePanel() {
-    }
-
-    /**
-     * Creates a new JPanel that prevents components being removed.
-     *
-     * @param isDoubleBuffered Use double buffering?
-     */
-    public NoRemovePanel(boolean isDoubleBuffered) {
-        super(isDoubleBuffered);
-    }
-
     /**
      * Creates a new JPanel that prevents components being removed.
      *
      * @param layout Layout manager
      */
-    public NoRemovePanel(LayoutManager layout) {
+    public NoRemovePanel(final LayoutManager layout) {
         super(layout);
     }
 
-    /**
-     * Creates a new JPanel that prevents components being removed.
-     *
-     * @param layout Layout manager
-     * @param isDoubleBuffered Use double buffering?
-     */
-    public NoRemovePanel(LayoutManager layout, boolean isDoubleBuffered) {
-        super(layout, isDoubleBuffered);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void remove(final Component comp) {

src/com/dmdirc/addons/ui_swing/dialogs/prefs/URLHandlerTableModel.java

@@ -57,12 +57,14 @@ public class URLHandlerTableModel extends AbstractTableModel {
 
     /**
      * Instantiates a new table model.
-     * 
+     *
      * @param uris URIs to show
      * @param handlers Handlers to show
      */
     public URLHandlerTableModel(final List<URI> uris,
             final List<String> handlers) {
+        super();
+
         this.uris = uris;
         this.handlers = handlers;
     }
@@ -88,8 +90,8 @@ public class URLHandlerTableModel extends AbstractTableModel {
             case 1:
                 return "Handler";
             default:
-                throw new IllegalArgumentException("Unknown column: " +
-                        columnIndex);
+                throw new IllegalArgumentException("Unknown column: "
+                        + columnIndex);
         }
     }
 
@@ -109,13 +111,14 @@ public class URLHandlerTableModel extends AbstractTableModel {
 
     /** {@inheritDoc} */
     @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
+    public Object getValueAt(final int rowIndex, final int columnIndex) {
         if (uris.size() <= rowIndex) {
-            throw new IndexOutOfBoundsException(rowIndex + " >= " +
-                    uris.size());
+            throw new IndexOutOfBoundsException(rowIndex + " >= "
+                    + uris.size());
         }
         if (rowIndex < 0) {
-            throw new IllegalArgumentException("Must specify a positive integer");
+            throw new IllegalArgumentException(
+                    "Must specify a positive integer");
         }
         switch (columnIndex) {
             case 0:
@@ -123,20 +126,22 @@ public class URLHandlerTableModel extends AbstractTableModel {
             case 1:
                 return handlers.get(rowIndex);
             default:
-                throw new IllegalArgumentException("Unknown column: " +
-                        columnIndex);
+                throw new IllegalArgumentException("Unknown column: "
+                        + columnIndex);
         }
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
+    public void setValueAt(final Object aValue, final int rowIndex,
+            final int columnIndex) {
         if (uris.size() <= rowIndex) {
-            throw new IndexOutOfBoundsException(rowIndex + " >= " +
-                    uris.size());
+            throw new IndexOutOfBoundsException(rowIndex + " >= "
+                    + uris.size());
         }
         if (rowIndex < 0) {
-            throw new IllegalArgumentException("Must specify a positive integer");
+            throw new IllegalArgumentException(
+                    "Must specify a positive integer");
         }
         switch (columnIndex) {
             case 0:
@@ -147,26 +152,29 @@ public class URLHandlerTableModel extends AbstractTableModel {
                 break;
             case 1:
                 if (!(aValue instanceof String)) {
-                    throw new IllegalArgumentException("Value must be a String");
+                    throw new IllegalArgumentException(
+                            "Value must be a String");
                 }
                 handlers.set(rowIndex, (String) aValue);
                 break;
             default:
-                throw new IllegalArgumentException("Unknown column: " +
-                        columnIndex);
+                throw new IllegalArgumentException("Unknown column: "
+                        + columnIndex);
         }
         fireTableCellUpdated(rowIndex, columnIndex);
     }
 
     /**
      * Adds a URI to the model.
-     * 
+     *
      * @param uri URI to add
      */
     public void addURI(final URI uri) {
         final String handler;
-        if (IdentityManager.getGlobalConfig().hasOptionString("protocol", uri.getScheme())) {
-            handler = IdentityManager.getGlobalConfig().getOption("protocol", uri.getScheme());
+        if (IdentityManager.getGlobalConfig().hasOptionString("protocol",
+                uri.getScheme())) {
+            handler = IdentityManager.getGlobalConfig().getOption("protocol",
+                    uri.getScheme());
         } else {
             handler = "";
         }
@@ -177,7 +185,7 @@ public class URLHandlerTableModel extends AbstractTableModel {
 
     /**
      * Removes a URI to the model.
-     * 
+     *
      * @param uri URI to remove
      */
     public void removeURI(final URI uri) {
@@ -186,7 +194,7 @@ public class URLHandlerTableModel extends AbstractTableModel {
 
     /**
      * Removes a URI to the model.
-     * 
+     *
      * @param index Index of the URI to remove
      */
     public void removeURI(final int index) {
@@ -196,19 +204,19 @@ public class URLHandlerTableModel extends AbstractTableModel {
             fireTableRowsDeleted(index, index);
         }
     }
-    
+
     /**
      * Returns a map of the URL handlers in this model.
-     * 
+     *
      * @return URL Handler map
      */
     public Map<URI, String> getURLHandlers() {
         final Map<URI, String> urlHandlers = new HashMap<URI, String>();
-        
+
         for (int i = 0; i < uris.size(); i++) {
             urlHandlers.put(uris.get(i), handlers.get(i));
         }
-        
+
         return urlHandlers;
     }
 }

src/com/dmdirc/addons/ui_swing/dialogs/prefs/UpdateTableModel.java

@@ -33,7 +33,7 @@ import java.util.Map;
 import javax.swing.table.AbstractTableModel;
 
 /**
- * Update component table model
+ * Update component table model.
  */
 public class UpdateTableModel extends AbstractTableModel {
 
@@ -57,10 +57,12 @@ public class UpdateTableModel extends AbstractTableModel {
 
     /**
      * Instantiates a new table model.
-     * 
+     *
      * @param updates Update components to show
      */
     public UpdateTableModel(final List<UpdateComponent> updates) {
+        super();
+
         this.updates = new ArrayList<UpdateComponent>(updates);
         this.enabled = new HashMap<UpdateComponent, Boolean>();
 
@@ -94,8 +96,8 @@ public class UpdateTableModel extends AbstractTableModel {
             case 2:
                 return "Version";
             default:
-                throw new IllegalArgumentException("Unknown column: " +
-                        columnIndex);
+                throw new IllegalArgumentException("Unknown column: "
+                        + columnIndex);
         }
     }
 
@@ -110,8 +112,8 @@ public class UpdateTableModel extends AbstractTableModel {
             case 2:
                 return Integer.class;
             default:
-                throw new IllegalArgumentException("Unknown column: " +
-                        columnIndex);
+                throw new IllegalArgumentException("Unknown column: "
+                        + columnIndex);
         }
     }
 
@@ -123,14 +125,15 @@ public class UpdateTableModel extends AbstractTableModel {
 
     /** {@inheritDoc} */
     @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
+    public Object getValueAt(final int rowIndex, final int columnIndex) {
         synchronized (updates) {
             if (updates.size() <= rowIndex) {
-                throw new IndexOutOfBoundsException(rowIndex + " >= " +
-                        updates.size());
+                throw new IndexOutOfBoundsException(rowIndex + " >= "
+                        + updates.size());
             }
             if (rowIndex < 0) {
-                throw new IllegalArgumentException("Must specify a positive integer");
+                throw new IllegalArgumentException(
+                        "Must specify a positive integer");
             }
             switch (columnIndex) {
                 case 0:
@@ -140,8 +143,8 @@ public class UpdateTableModel extends AbstractTableModel {
                 case 2:
                     return updates.get(rowIndex).getFriendlyVersion();
                 default:
-                    throw new IllegalArgumentException("Unknown column: " +
-                            columnIndex);
+                    throw new IllegalArgumentException("Unknown column: "
+                            + columnIndex);
             }
         }
     }
@@ -152,19 +155,20 @@ public class UpdateTableModel extends AbstractTableModel {
             final int columnIndex) {
         synchronized (updates) {
             if (updates.size() <= rowIndex) {
-                throw new IndexOutOfBoundsException(rowIndex + " >= " +
-                        updates.size());
+                throw new IndexOutOfBoundsException(rowIndex + " >= "
+                        + updates.size());
             }
             if (rowIndex < 0) {
-                throw new IllegalArgumentException("Must specify a positive integer");
+                throw new IllegalArgumentException(
+                        "Must specify a positive integer");
             }
             switch (columnIndex) {
                 case 1:
                     enabled.put(updates.get(rowIndex), (Boolean) aValue);
                     break;
                 default:
-                    throw new IllegalArgumentException("Unknown column: " +
-                            columnIndex);
+                    throw new IllegalArgumentException("Unknown column: "
+                            + columnIndex);
             }
             fireTableCellUpdated(rowIndex, columnIndex);
         }
@@ -172,7 +176,7 @@ public class UpdateTableModel extends AbstractTableModel {
 
     /**
      * Adds a update component to the model.
-     * 
+     *
      * @param component update component to add
      */
     public void add(final UpdateComponent component) {
@@ -184,7 +188,7 @@ public class UpdateTableModel extends AbstractTableModel {
 
     /**
      * Removes a update component to the model.
-     * 
+     *
      * @param component update component to remove
      */
     public void remove(final UpdateComponent component) {
@@ -195,7 +199,7 @@ public class UpdateTableModel extends AbstractTableModel {
 
     /**
      * Removes a update component to the model.
-     * 
+     *
      * @param index Index of the update component to remove
      */
     public void remove(final int index) {

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/IgnoreListModel.java

@@ -36,12 +36,19 @@ public class IgnoreListModel extends AbstractListModel {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-
+    /** Ignore list backing this model. */
     private final IgnoreList ignoreList;
-
+    /** Are we in simple mode. */
     private boolean isSimple;
 
+    /**
+     * Creates a new ignore list based on the specified ignore list.
+     *
+     * @param ignoreList Ignorelist backing this model
+     */
     public IgnoreListModel(final IgnoreList ignoreList) {
+        super();
+
         this.ignoreList = ignoreList;
         isSimple = ignoreList.canConvert();
     }
@@ -62,12 +69,20 @@ public class IgnoreListModel extends AbstractListModel {
         }
     }
 
-    public void setIsSimple(boolean isSimple) {
+    /**
+     * Sets the is simple flag.
+     *
+     * @param isSimple Are we in simple mode or not?
+     */
+    public void setIsSimple(final boolean isSimple) {
         this.isSimple = isSimple;
 
         fireContentsChanged(this, 0, getSize());
     }
-    
+
+    /**
+     * Notifies this model that it has been updated and needs to fire listeners.
+     */
     public void notifyUpdated() {
         fireContentsChanged(this, 0, getSize());
     }

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

@@ -71,12 +71,11 @@ import net.miginfocom.swing.MigLayout;
 /**
  * The button bar manager is a grid of buttons that presents a manager similar
  * to that used by mIRC.
- *
- * @author chris
  */
 public final class ButtonBar implements FrameManager, ActionListener,
         ComponentListener, Serializable, NotificationListener,
-        SelectionListener, FrameInfoListener, MouseListener, ConfigChangeListener {
+        SelectionListener, FrameInfoListener, MouseListener,
+        ConfigChangeListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -84,32 +83,32 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 3;
+    /** The default number of buttons per row or column. */
+    private static final int cells = 1;
+    /** The default number of buttons to render per {cell,row}. */
+    private static final int maxButtons = Integer.MAX_VALUE;
+    /** The default height of buttons. */
+    private static final int buttonHeight = 25;
     /** A map of windows to the buttons we're using for them. */
     private final Map<Window, FrameToggleButton> buttons;
-    /** The position of this frame manager. */
-    private final FramemanagerPosition position;
-    /** The parent for the manager. */
-    private JComponent parent;
-    /** The scrolling panel for our ButtonBar */
+    /** The scrolling panel for our ButtonBar. */
      private final JScrollPane scrollPane;
     /** The panel used for our buttons. */
     private final ButtonPanel buttonPanel;
+    /** The position of this frame manager. */
+    private FramemanagerPosition position;
+    /** The default width of buttons. */
+    private int buttonWidth = 0;
+    /** The parent for the manager. */
+    private JComponent parent;
     /** The currently selected frame. */
     private transient FrameContainer<?> selected;
     /** Selected window. */
     private Window activeWindow;
-    /** The default number of buttons per row or column. */
-    private int cells = 1;
-    /** The default number of buttons to render per {cell,row}. */
-    private int maxButtons = Integer.MAX_VALUE;
-    /** The default width of buttons. */
-    private int buttonWidth = 0;
-    /** The default height of buttons. */
-    private int buttonHeight = 25;
-    /** Sort root windows prefs setting */
+    /** Sort root windows prefs setting. */
     private boolean sortRootWindows = IdentityManager.getGlobalConfig()
             .getOptionBool("ui", "sortrootwindows");
-    /** Sort child windows prefs setting */
+    /** Sort child windows prefs setting. */
     private boolean sortChildWindows = IdentityManager.getGlobalConfig()
             .getOptionBool("ui", "sortchildwindows");
     /** UI Window Factory. */
@@ -126,9 +125,11 @@ public final class ButtonBar implements FrameManager, ActionListener,
         scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants
                 .VERTICAL_SCROLLBAR_AS_NEEDED);
         scrollPane.setMinimumSize(new Dimension(0, buttonHeight
-                + ((int) PlatformDefaults.getUnitValueX("related").getValue()) * 2));
+                + ((int) PlatformDefaults.getUnitValueX("related")
+                .getValue()) * 2));
 
-        buttons = Collections.synchronizedMap(new HashMap<Window, FrameToggleButton>());
+        buttons = Collections.synchronizedMap(
+                new HashMap<Window, FrameToggleButton>());
         position = FramemanagerPosition.getPosition(
                 IdentityManager.getGlobalConfig().getOption("ui",
                 "framemanagerPosition"));
@@ -160,7 +161,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
     }
 
     /**
-     * Returns the button object of the current selected window
+     * Returns the button object of the current selected window.
      *
      * @return Button object for the current selected window
      */
@@ -205,7 +206,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * @author Simon Mott
      * @since 0.6.4
      */
-    private void initButtons(final Collection<FrameContainer<?>> windowCollection) {
+    private void initButtons(
+            final Collection<FrameContainer<?>> windowCollection) {
         Window window;
         Window parentWindow;
         for (FrameContainer<?> frame : windowCollection) {
@@ -227,8 +229,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * Retreives the button object associated with {@link FrameContainer}.
      *
      * @param frame FrameContainer to find associated button for
-     * @return {@link FrameToggleButton} object asociated with this FrameContainer.
-     * Returns null if none exist
+     * @return {@link FrameToggleButton} object asociated with this
+     * FrameContainer. Returns null if none exist
      */
     public FrameToggleButton getButton(final FrameContainer<?> frame) {
         final Window window = windowFactory.getSwingWindow(frame);
@@ -242,8 +244,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
     @Override
     public void setController(final UIController controller) {
         if (!(controller instanceof SwingController)) {
-            throw new IllegalArgumentException("Controller must be an instance" +
-                    " of SwingController");
+            throw new IllegalArgumentException(
+                    "Controller must be an instance of SwingController");
         }
         this.windowFactory = ((SwingController) controller).getWindowFactory();
         this.controller = ((SwingController) controller);
@@ -262,18 +264,21 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * @author Simon Mott
      * @since 0.6.4
      */
-    private void displayButtons(final Collection<FrameContainer<?>> windowCollection) {
+    private void displayButtons(
+            final Collection<FrameContainer<?>> windowCollection) {
         FrameToggleButton button;
         for (FrameContainer<?> window : windowCollection) {
             button = getButton(window);
             if (button != null) {
-                button.setPreferredSize(new Dimension(buttonWidth, buttonHeight));
+                button.setPreferredSize(
+                        new Dimension(buttonWidth, buttonHeight));
                 buttonPanel.add(button);
                 if (!window.getChildren().isEmpty()) {
                     final ArrayList<FrameContainer<?>> childList = new ArrayList
                             <FrameContainer<?>>(window.getChildren());
                     if (sortChildWindows) {
-                         Collections.sort(childList, new FrameContainerComparator());
+                         Collections.sort(childList,
+                                 new FrameContainerComparator());
                     }
                     displayButtons(childList);
                 }
@@ -305,9 +310,9 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * @param source The Container to get title/icon info from
      */
     private void addButton(final Window source) {
-        final FrameToggleButton button = new FrameToggleButton(source.getContainer()
-                .toString(), IconManager.getIconManager().getIcon(
-                source.getContainer().getIcon()), source);
+        final FrameToggleButton button = new FrameToggleButton(
+                source.getContainer().toString(), IconManager.getIconManager()
+                .getIcon(source.getContainer().getIcon()), source);
         button.addActionListener(this);
         button.addMouseListener(this);
         button.setHorizontalAlignment(SwingConstants.LEFT);
@@ -353,7 +358,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
             /** {@inheritDoc} */
             @Override
             public void run() {
-                window.getContainer().removeNotificationListener(ButtonBar.this);
+                window.getContainer().removeNotificationListener(
+                        ButtonBar.this);
                 window.getContainer().removeFrameInfoListener(ButtonBar.this);
                 window.getContainer().removeSelectionListener(ButtonBar.this);
                 if (buttons.containsKey(window)) {
@@ -389,7 +395,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
      */
     @Override
     public void componentResized(final ComponentEvent e) {
-        buttonWidth = position.isHorizontal() ? 150 : (parent.getWidth() / cells);
+        buttonWidth = position.isHorizontal() ? 150
+                : (parent.getWidth() / cells);
         relayout();
     }
 
@@ -425,7 +432,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void notificationSet(final FrameContainer<?> window, final Color colour) {
+    public void notificationSet(final FrameContainer<?> window,
+            final Color colour) {
         UIUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */
@@ -470,7 +478,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
                 selected = window;
                 button = getButton(window);
                 if (button != null) {
-                    scrollPane.getViewport().scrollRectToVisible(button.getBounds());
+                    scrollPane.getViewport().scrollRectToVisible(
+                            button.getBounds());
                     button.setSelected(true);
                 }
             }
@@ -511,7 +520,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void titleChanged(final FrameContainer<?> window, final String title) {
+    public void titleChanged(final FrameContainer<?> window,
+            final String title) {
         // Do nothing
     }
 
@@ -520,16 +530,16 @@ public final class ButtonBar implements FrameManager, ActionListener,
      *
      * @param e MouseEvent for this event
      */
-    public void processMouseEvents(MouseEvent e) {
+    public void processMouseEvents(final MouseEvent e) {
         if (e.isPopupTrigger()) {
             final FrameToggleButton button = (FrameToggleButton) e.getSource();
 
-            TextFrame frame = (TextFrame) button.getWindow();
+            final TextFrame frame = (TextFrame) button.getWindow();
             if (frame == null) {
                 return;
             }
             final JPopupMenu popupMenu = frame.getPopupMenu(null,
-                    new Object[][] { new Object[] { "" } });
+                    new Object[][] {new Object[]{""}});
             frame.addCustomPopupItems(popupMenu);
             popupMenu.add(new JMenuItem(new CloseFrameContainerAction(frame.
                         getContainer())));
@@ -543,7 +553,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * @param e MouseEvent for this event
      */
     @Override
-    public void mouseClicked(MouseEvent e) {
+    public void mouseClicked(final MouseEvent e) {
         processMouseEvents(e);
     }
 
@@ -553,7 +563,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * @param e MouseEvent for this event
      */
     @Override
-    public void mousePressed(MouseEvent e) {
+    public void mousePressed(final MouseEvent e) {
         processMouseEvents(e);
     }
 
@@ -563,7 +573,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * @param e MouseEvent for this event
      */
     @Override
-    public void mouseReleased(MouseEvent e) {
+    public void mouseReleased(final MouseEvent e) {
         processMouseEvents(e);
     }
 
@@ -573,7 +583,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * @param e MouseEvent for this event
      */
     @Override
-    public void mouseEntered(MouseEvent e) {
+    public void mouseEntered(final MouseEvent e) {
         //Do nothing
     }
 
@@ -583,13 +593,13 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * @param e MouseEvent for this event
      */
     @Override
-    public void mouseExited(MouseEvent e) {
+    public void mouseExited(final MouseEvent e) {
         //Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
-    public void configChanged(String domain, String key) {
+    public void configChanged(final String domain, final String key) {
         if ("sortrootwindows".equals(key)) {
             sortRootWindows = IdentityManager.getGlobalConfig()
                     .getOptionBool("ui", "sortrootwindows");

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonPanel.java

@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 package com.dmdirc.addons.ui_swing.framemanager.buttonbar;
 
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Rectangle;
-
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
 
@@ -37,10 +37,10 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Implements scrollable onto a JPanel so we have more control over scrolling.
  *
- * @author Simon Mott
  * @since 0.6.4
  */
-public class ButtonPanel extends JPanel implements Scrollable, MouseWheelListener {
+public class ButtonPanel extends JPanel implements Scrollable,
+        MouseWheelListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -49,7 +49,7 @@ public class ButtonPanel extends JPanel implements Scrollable, MouseWheelListene
      */
     private static final long serialVersionUID = 1;
     /** The ButtonBar that created this Panel. */
-    private ButtonBar buttonBar;
+    private final ButtonBar buttonBar;
 
     /**
      * Constructor for ButtonPanel.
@@ -57,7 +57,7 @@ public class ButtonPanel extends JPanel implements Scrollable, MouseWheelListene
      * @param layout Layout settings for this ButtonPanel
      * @param buttonBar the buttonBar that created this Panel
      */
-    public ButtonPanel(final MigLayout layout, ButtonBar buttonBar) {
+    public ButtonPanel(final MigLayout layout, final ButtonBar buttonBar) {
         super(layout);
         this.buttonBar = buttonBar;
     }
@@ -70,13 +70,15 @@ public class ButtonPanel extends JPanel implements Scrollable, MouseWheelListene
 
     /** {@inheritDoc} */
     @Override
-    public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) {
+    public int getScrollableUnitIncrement(final Rectangle visibleRect,
+            final int orientation, final int direction) {
         return buttonBar.getButtonHeight();
     }
 
     /** {@inheritDoc} */
     @Override
-    public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) {
+    public int getScrollableBlockIncrement(final Rectangle visibleRect,
+            final int orientation, final int direction) {
         return buttonBar.getButtonHeight();
     }
 
@@ -94,19 +96,20 @@ public class ButtonPanel extends JPanel implements Scrollable, MouseWheelListene
 
     /** {@inheritDoc} */
     @Override
-    public void mouseWheelMoved(MouseWheelEvent e) {
+    public void mouseWheelMoved(final MouseWheelEvent e) {
         e.consume();
         final int selectedIndex = getSelectedIndex();
         int newIndex = 0;
         if (e.getWheelRotation() < 0) {
             //Up
-            newIndex = selectedIndex > 0 ? selectedIndex - 1 :
-                getComponentCount() - 1;
+            newIndex = selectedIndex > 0 ? selectedIndex - 1
+                    : getComponentCount() - 1;
         } else if (e.getWheelRotation() > 0) {
             //Down
             newIndex = (selectedIndex + 1) % getComponentCount();
         }
-        ((FrameToggleButton) getComponent(newIndex)).getWindow().activateFrame();
+        ((FrameToggleButton) getComponent(newIndex)).getWindow()
+                .activateFrame();
     }
 
     /**
@@ -128,5 +131,4 @@ public class ButtonPanel extends JPanel implements Scrollable, MouseWheelListene
         }
         return selectedIndex;
     }
-
 }

src/com/dmdirc/addons/ui_swing/framemanager/tree/Tree.java

@@ -207,7 +207,7 @@ public class Tree extends JTree implements MouseMotionListener,
      * @param e Mouse event
      */
     @Override
-    public void mouseClicked(MouseEvent e) {
+    public void mouseClicked(final MouseEvent e) {
         processMouseEvents(e);
     }
 
@@ -217,12 +217,14 @@ public class Tree extends JTree implements MouseMotionListener,
      * @param e Mouse event
      */
     @Override
-    public void mousePressed(MouseEvent e) {
+    public void mousePressed(final MouseEvent e) {
         if (e.getButton() == MouseEvent.BUTTON1) {
             dragButton = true;
-            final TreePath selectedPath = getPathForLocation(e.getX(), e.getY());
+            final TreePath selectedPath = getPathForLocation(e.getX(),
+                    e.getY());
             if (selectedPath != null) {
-                ((TreeViewNode) selectedPath.getLastPathComponent()).getWindow().
+                ((TreeViewNode) selectedPath.getLastPathComponent())
+                        .getWindow().
                         activateFrame();
             }
         }
@@ -235,7 +237,7 @@ public class Tree extends JTree implements MouseMotionListener,
      * @param e Mouse event
      */
     @Override
-    public void mouseReleased(MouseEvent e) {
+    public void mouseReleased(final MouseEvent e) {
         dragButton = false;
         processMouseEvents(e);
     }
@@ -246,7 +248,7 @@ public class Tree extends JTree implements MouseMotionListener,
      * @param e Mouse event
      */
     @Override
-    public void mouseEntered(MouseEvent e) {
+    public void mouseEntered(final MouseEvent e) {
         //Ignore
     }
 
@@ -256,7 +258,7 @@ public class Tree extends JTree implements MouseMotionListener,
      * @param e Mouse event
      */
     @Override
-    public void mouseExited(MouseEvent e) {
+    public void mouseExited(final MouseEvent e) {
         manager.checkRollover(null);
     }
 
@@ -278,7 +280,7 @@ public class Tree extends JTree implements MouseMotionListener,
             }
 
             final JPopupMenu popupMenu = frame.getPopupMenu(null,
-                    new Object[][] { new Object[] { "" } });
+                    new Object[][] {new Object[]{""}});
             frame.addCustomPopupItems(popupMenu);
             if (popupMenu.getComponentCount() > 0) {
                 popupMenu.addSeparator();

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeViewNode.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -30,7 +30,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
  * Tree node representing a NodeLabel and a FrameContainer.
  */
 public class TreeViewNode extends DefaultMutableTreeNode {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
@@ -50,7 +50,7 @@ public class TreeViewNode extends DefaultMutableTreeNode {
      */
     public TreeViewNode(final NodeLabel label, final FrameContainer<?> window) {
         super();
-        
+
         this.label = label;
         this.window = window;
     }

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeViewNodeMenuItem.java

@@ -1,17 +1,16 @@
 /*
- * 
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * 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
@@ -49,13 +48,13 @@ public class TreeViewNodeMenuItem extends JMenuItem {
     public TreeViewNodeMenuItem(final String name, final String actionCommand,
             final TreeViewNode treeNode) {
         super(name);
-        
+
         this.treeNode = treeNode;
         setActionCommand(actionCommand);
     }
 
     /**
-     * Get the value of treeNode
+     * Get the value of treeNode.
      *
      * @return the value of treeNode
      */
@@ -64,11 +63,11 @@ public class TreeViewNodeMenuItem extends JMenuItem {
     }
 
     /**
-     * Set the value of treeNode
+     * Set the value of treeNode.
      *
      * @param treeNode new value of treeNode
      */
-    public void setTreeNode(TreeViewNode treeNode) {
+    public void setTreeNode(final TreeViewNode treeNode) {
         this.treeNode = treeNode;
     }
 }

src/com/dmdirc/addons/ui_swing/textpane/LineInfo.java

@@ -34,8 +34,8 @@ public final class LineInfo {
     /** Character index? */
     private int index;
 
-    /** 
-     * Creates a new instance of LineInfo. 
+    /**
+     * Creates a new instance of LineInfo.
      *
      * @param line Line number
      * @param part line wrap number
@@ -44,8 +44,8 @@ public final class LineInfo {
         this(line, part, -1);
     }
 
-    /** 
-     * Creates a new instance of LineInfo. 
+    /**
+     * Creates a new instance of LineInfo.
      *
      * @param line Line number
      * @param part line wrap number
@@ -77,43 +77,44 @@ public final class LineInfo {
 
     /**
      * Returns the index for this line.
-     * 
+     *
      * @return Index for the line of -1
      */
     public int getIndex() {
         return index;
     }
-    
+
     /**
      * Sets the index for this line.
-     * 
+     *
      * @param index New index
      */
-    public void setIndex(int index) {
+    public void setIndex(final int index) {
         this.index = index;
     }
 
     /**
      * Sets the line for this line.
-     * 
+     *
      * @param line New line
      */
-    public void setLine(int line) {
+    public void setLine(final int line) {
         this.line = line;
     }
 
     /**
-     * Sets the line part for this line
-     * 
+     * Sets the line part for this line.
+     *
      * @param part New part
      */
-    public void setPart(int part) {
+    public void setPart(final int part) {
         this.part = part;
     }
-    
+
     /* {@inheritDoc} */
     @Override
     public String toString() {
-        return "LineInfo[line=" + line + ", part=" + part + ", index=" + index + "]";
+        return "LineInfo[line=" + line + ", part=" + part + ", index="
+                + index + "]";
     }
 }

src/com/dmdirc/addons/ui_swing/textpane/TextPane.java

@@ -44,7 +44,6 @@ import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
 
 import javax.swing.BoundedRangeModel;
-import javax.swing.DefaultBoundedRangeModel;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JScrollBar;
@@ -116,19 +115,20 @@ public final class TextPane extends JComponent implements MouseWheelListener,
         document.addIRCDocumentListener(this);
         setAutoscrolls(true);
 
-        MouseMotionListener doScrollRectToVisible = new MouseMotionAdapter() {
+        final MouseMotionListener doScrollRectToVisible
+                = new MouseMotionAdapter() {
 
             /** {@inheritDoc} */
             @Override
-            public void mouseDragged(MouseEvent e) {
-                if (e.getXOnScreen() > getLocationOnScreen().getX() && e.
-                        getXOnScreen() < (getLocationOnScreen().
-                        getX() + getWidth()) && e.getModifiersEx() ==
-                        MouseEvent.BUTTON1_DOWN_MASK) {
+            public void mouseDragged(final MouseEvent e) {
+                if (e.getXOnScreen() > getLocationOnScreen().getX()
+                        && e.getXOnScreen() < (getLocationOnScreen().getX()
+                        + getWidth()) && e.getModifiersEx()
+                        == MouseEvent.BUTTON1_DOWN_MASK) {
                     if (getLocationOnScreen().getY() > e.getYOnScreen()) {
                         scrollModel.setValue(scrollBar.getValue() - 1);
-                    } else if (getLocationOnScreen().getY() + getHeight() <
-                            e.getYOnScreen()) {
+                    } else if (getLocationOnScreen().getY() + getHeight() 
+                            < e.getYOnScreen()) {
                         scrollModel.setValue(scrollBar.getValue() + 1);
                     }
                     canvas.highlightEvent(MouseEventType.DRAG, e);

src/com/dmdirc/addons/ui_swing/textpane/TextPaneEndAction.java

@@ -39,7 +39,7 @@ public class TextPaneEndAction extends AbstractAction {
      */
     private static final long serialVersionUID = 1;
     /** TextPane instance. */
-    private TextPane textpane;
+    private final TextPane textpane;
 
     /**
      * Instantiates a new action.
@@ -47,6 +47,8 @@ public class TextPaneEndAction extends AbstractAction {
      * @param textpane Textpane
      */
     public TextPaneEndAction(final TextPane textpane) {
+        super();
+
         this.textpane = textpane;
     }
 
@@ -55,7 +57,7 @@ public class TextPaneEndAction extends AbstractAction {
      * @param e Action event
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(final ActionEvent e) {
         textpane.goToEnd();
     }
-}
+}

src/com/dmdirc/addons/ui_swing/textpane/TextPaneHomeAction.java

@@ -39,7 +39,7 @@ public class TextPaneHomeAction extends AbstractAction {
      */
     private static final long serialVersionUID = 1;
     /** TextPane instance. */
-    private TextPane textpane;
+    private final TextPane textpane;
 
     /**
      * Instantiates a new action.
@@ -47,6 +47,8 @@ public class TextPaneHomeAction extends AbstractAction {
      * @param textpane Textpane
      */
     public TextPaneHomeAction(final TextPane textpane) {
+        super();
+
         this.textpane = textpane;
     }
 
@@ -55,7 +57,7 @@ public class TextPaneHomeAction extends AbstractAction {
      * @param e Action event
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(final ActionEvent e) {
         textpane.goToHome();
     }
-}
+}

src/com/dmdirc/addons/ui_swing/textpane/TextPanePageDownAction.java

@@ -37,7 +37,7 @@ public class TextPanePageDownAction extends AbstractAction {
      */
     private static final long serialVersionUID = 1;
     /** TextPane instance. */
-    private TextPane textpane;
+    private final TextPane textpane;
 
     /**
      * Instantiates a new action.
@@ -45,6 +45,8 @@ public class TextPanePageDownAction extends AbstractAction {
      * @param textpane Textpane
      */
     public TextPanePageDownAction(final TextPane textpane) {
+        super();
+
         this.textpane = textpane;
     }
 
@@ -53,7 +55,7 @@ public class TextPanePageDownAction extends AbstractAction {
      * @param e Action event
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(final ActionEvent e) {
         textpane.pageDown();
     }
-}
+}

src/com/dmdirc/addons/ui_swing/textpane/TextPanePageUpAction.java

@@ -37,7 +37,7 @@ public class TextPanePageUpAction extends AbstractAction {
      */
     private static final long serialVersionUID = 1;
     /** TextPane instance. */
-    private TextPane textpane;
+    private final TextPane textpane;
 
     /**
      * Instantiates a new action.
@@ -45,6 +45,8 @@ public class TextPanePageUpAction extends AbstractAction {
      * @param textpane Textpane
      */
     public TextPanePageUpAction(final TextPane textpane) {
+        super();
+        
         this.textpane = textpane;
     }
 
@@ -53,7 +55,7 @@ public class TextPanePageUpAction extends AbstractAction {
      * @param e Action event
      */
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(final ActionEvent e) {
         textpane.pageUp();
     }
-}
+}

src/com/dmdirc/addons/ui_web/Client.java

@@ -45,12 +45,14 @@ public class Client {
     private final List<Event> events = new LinkedList<Event>();
 
     public Client(final WebInterfaceUI controller, final String ip) {
-        events.add(new Event("statusbar", "Welcome to the DMDirc web interface"));
+        events.add(new Event("statusbar",
+                "Welcome to the DMDirc web interface"));
 
         this.ip = ip;
 
         final List<Window> added = new LinkedList<Window>();
-        final List<Window> queued = new LinkedList<Window>(WebWindow.getWindows());
+        final List<Window> queued = new LinkedList<Window>(
+                WebWindow.getWindows());
 
         while (!queued.isEmpty()) {
             final Window window = queued.remove(0);
@@ -81,7 +83,7 @@ public class Client {
         return events;
     }
 
-    public void setContinuation(Continuation continuation) {
+    public void setContinuation(final Continuation continuation) {
         this.continuation = continuation;
     }
 

src/com/dmdirc/addons/ui_web/DynamicRequestHandler.java

@@ -55,16 +55,17 @@ import org.mortbay.util.ajax.JSONObjectConvertor;
 
 /**
  * Handles requests for dynamic resources (prefixed with /dynamic/).
- * 
+ *
  * @author chris
  */
 public class DynamicRequestHandler extends AbstractHandler {
-    
+
     /** Number of milliseconds before a client is timed out. */
     private static final long TIMEOUT = 1000 * 60 * 2; // Two minutes
 
     /** The last time each client was seen. */
-    private static final Map<String, Client> CLIENTS = new HashMap<String, Client>();
+    private static final Map<String, Client> CLIENTS
+            = new HashMap<String, Client>();
 
     /** The controller which owns this request handler. */
     private final WebInterfaceUI controller;
@@ -82,12 +83,12 @@ public class DynamicRequestHandler extends AbstractHandler {
         JSON.registerConvertor(WebWindow.class, new JSONObjectConvertor());
         JSON.registerConvertor(Message.class, new JSONObjectConvertor());
         JSON.registerConvertor(Client.class, new JSONObjectConvertor());
-        
+
         new Timer().schedule(new TimerTask() {
             @Override
             public void run() {
                 synchronized (CLIENTS) {
-                    for (Map.Entry<String, Client> entry 
+                    for (Map.Entry<String, Client> entry
                             : new HashMap<String, Client>(CLIENTS).entrySet()) {
                         if (entry.getValue().getTime() > TIMEOUT) {
                             CLIENTS.remove(entry.getKey());
@@ -100,7 +101,7 @@ public class DynamicRequestHandler extends AbstractHandler {
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @throws IOException If unable to write response
      */
     @Override
@@ -110,18 +111,19 @@ public class DynamicRequestHandler extends AbstractHandler {
 
         if (request.getParameter("clientID") != null) {
             final String clientID = request.getParameter("clientID");
-            
+
             if (!CLIENTS.containsKey(clientID)) {
-                CLIENTS.put(clientID, new Client(controller, request.getRemoteHost()));
+                CLIENTS.put(clientID, new Client(controller,
+                        request.getRemoteHost()));
             }
 
             synchronized (CLIENTS) {
                 CLIENTS.get(clientID).touch();
             }
         }
-        
-        if (((request instanceof Request) ? (Request) request
-                : HttpConnection.getCurrentConnection().getRequest()).isHandled()) {
+
+        if (((request instanceof Request) ? (Request) request : HttpConnection
+                .getCurrentConnection().getRequest()).isHandled()) {
             return;
         }
 
@@ -146,7 +148,8 @@ public class DynamicRequestHandler extends AbstractHandler {
         } else if (target.equals("/dynamic/tab")) {
             doTab(request, response);
             handled(request);
-        } else if (target.equals("/dynamic/keyup") || target.equals("/dynamic/keydown")) {
+        } else if (target.equals("/dynamic/keyup")
+                || target.equals("/dynamic/keydown")) {
             doKeyUpDown(target.equals("/dynamic/keyup"), request, response);
             handled(request);
         } else if (target.equals("/dynamic/key")) {
@@ -166,7 +169,7 @@ public class DynamicRequestHandler extends AbstractHandler {
 
     /**
      * Handles a request for the event feed.
-     * 
+     *
      * @param request The servlet request that is being handled
      * @param response The servlet response object to write to
      * @throws IOException If unable to write the response
@@ -182,8 +185,8 @@ public class DynamicRequestHandler extends AbstractHandler {
             List<Event> myEvents = client.retrieveEvents();
 
             if (myEvents.isEmpty()) {
-                Continuation continuation = ContinuationSupport.getContinuation(request,
-                        client.getMutex());
+                Continuation continuation = ContinuationSupport
+                        .getContinuation(request, client.getMutex());
                 client.setContinuation(continuation);
                 continuation.suspend(30000L);
 
@@ -199,7 +202,8 @@ public class DynamicRequestHandler extends AbstractHandler {
 
     private void doInput(final HttpServletRequest request,
             final HttpServletResponse response) throws IOException {
-        final WebWindow window = WebWindow.getWindow(request.getParameter("window"));
+        final WebWindow window = WebWindow.getWindow(
+                request.getParameter("window"));
 
         if (window instanceof WebInputWindow) {
             final WebInputWindow wiw = (WebInputWindow) window;
@@ -210,7 +214,8 @@ public class DynamicRequestHandler extends AbstractHandler {
 
     private void doKey(final HttpServletRequest request,
             final HttpServletResponse response) throws IOException {
-        final WebWindow window = WebWindow.getWindow(request.getParameter("window"));
+        final WebWindow window = WebWindow.getWindow(
+                request.getParameter("window"));
 
         if (window instanceof WebInputWindow) {
             final WebInputWindow wiw = (WebInputWindow) window;
@@ -231,21 +236,25 @@ public class DynamicRequestHandler extends AbstractHandler {
         }
     }
 
-    private void doTab(HttpServletRequest request, HttpServletResponse response)
-            throws IOException {
-        final WebWindow window = WebWindow.getWindow(request.getParameter("window"));
-        
+    private void doTab(final HttpServletRequest request,
+            final HttpServletResponse response) throws IOException {
+        final WebWindow window = WebWindow.getWindow(request.getParameter(
+                "window"));
+
         if (window instanceof WebInputWindow) {
             final WebInputWindow wiw = (WebInputWindow) window;
-            ((WebInputHandler) wiw.getInputHandler(request.getParameter("clientID"),
-                    request.getParameter("input"), request.getParameter("selstart"),
+            ((WebInputHandler) wiw.getInputHandler(request.getParameter(
+                    "clientID"),
+                    request.getParameter("input"), request.getParameter(
+                    "selstart"),
                     request.getParameter("selend"))).doTabCompletion(false);
         }
     }
 
-    private void doKeyUpDown(final boolean up, HttpServletRequest request,
-            HttpServletResponse response) throws IOException {
-        final WebWindow window = WebWindow.getWindow(request.getParameter("window"));
+    private void doKeyUpDown(final boolean up, final HttpServletRequest request,
+            final HttpServletResponse response) throws IOException {
+        final WebWindow window = WebWindow.getWindow(request.getParameter(
+                "window"));
 
         if (window instanceof WebInputWindow) {
             final WebInputWindow wiw = (WebInputWindow) window;
@@ -276,8 +285,8 @@ public class DynamicRequestHandler extends AbstractHandler {
         }
     }
 
-    private void doNicklist(HttpServletRequest request,
-            HttpServletResponse response) throws IOException {
+    private void doNicklist(final HttpServletRequest request,
+            final HttpServletResponse response) throws IOException {
         response.setStatus(HttpServletResponse.SC_OK);
         response.setContentType("application/json");
 
@@ -304,15 +313,16 @@ public class DynamicRequestHandler extends AbstractHandler {
 
         profileEvents.add(new Event("clearprofiles", null));
 
-        for (Identity identity : IdentityManager.getCustomIdentities("profile")) {
+        for (Identity identity : IdentityManager.getCustomIdentities(
+                "profile")) {
             profileEvents.add(new Event("addprofile", identity.getName()));
         }
 
         response.getWriter().write(JSON.toString(profileEvents.toArray()));
     }
 
-    private void doWindowRefresh(HttpServletRequest request,
-            HttpServletResponse response) throws IOException {
+    private void doWindowRefresh(final HttpServletRequest request,
+            final HttpServletResponse response) throws IOException {
         response.setStatus(HttpServletResponse.SC_OK);
         response.setContentType("application/json");
 
@@ -329,14 +339,14 @@ public class DynamicRequestHandler extends AbstractHandler {
 
         response.getWriter().write(JSON.toString(windowEvents.toArray()));
     }
-    
+
     private void doClients(final HttpServletRequest request,
             final HttpServletResponse response) throws IOException {
         response.setStatus(HttpServletResponse.SC_OK);
         response.setContentType("application/json");
         response.getWriter().write(JSON.toString(CLIENTS.values().toArray()));
     }
-    
+
     private void doJoinChannel(final HttpServletRequest request,
             final HttpServletResponse response) throws IOException {
         final String windowID = request.getParameter("source");
@@ -344,16 +354,18 @@ public class DynamicRequestHandler extends AbstractHandler {
         window.getContainer().getServer().join(new ChannelJoinRequest(request.
                 getParameter("channel")));
     }
-    
+
     private void doOpenQuery(final HttpServletRequest request,
             final HttpServletResponse response) throws IOException {
         final String windowID = request.getParameter("source");
         final WebWindow window = WebWindow.getWindow(windowID);
-        window.getContainer().getServer().getQuery(request.getParameter("target"));
+        window.getContainer().getServer().getQuery(request.getParameter(
+                "target"));
     }
 
     private Identity findProfile(final String parameter) {
-        for (Identity identity : IdentityManager.getCustomIdentities("profile")) {
+        for (Identity identity : IdentityManager.getCustomIdentities(
+                "profile")) {
             if (identity.getName().equals(parameter)) {
                 return identity;
             }
@@ -364,8 +376,8 @@ public class DynamicRequestHandler extends AbstractHandler {
 
     private void handled(final HttpServletRequest request) {
         ((request instanceof Request) ? (Request) request
-                : HttpConnection.getCurrentConnection().getRequest()).setHandled(
-                true);
+                : HttpConnection.getCurrentConnection().getRequest())
+                .setHandled(true);
     }
 
     public static void addEvent(final Event event) {
@@ -376,7 +388,7 @@ public class DynamicRequestHandler extends AbstractHandler {
         }
     }
 
-    public static void addEvent(String clientID, Event event) {
+    public static void addEvent(final String clientID, final Event event) {
         CLIENTS.get(clientID).addEvent(event);
     }
 

src/com/dmdirc/addons/ui_web/Event.java

@@ -24,17 +24,17 @@ package com.dmdirc.addons.ui_web;
 
 /**
  * Details an event that occured.
- * 
+ *
  * @author chris
  */
 public class Event {
-   
+
     /** The type of event that occurred. */
-    private String type;
+    private final String type;
     /** The argument(s) for the event. */
-    private Object arg1;
+    private final Object arg1;
 
-    public Event(String type, Object arg1) {
+    public Event(final String type, final Object arg1) {
         this.type = type;
         this.arg1 = arg1;
     }

src/com/dmdirc/addons/ui_web/Message.java

@@ -29,19 +29,19 @@ import com.dmdirc.addons.ui_web.uicomponents.WebWindow;
  * @author chris
  */
 public class Message {
-    
-    private String message;
-    private WebWindow window;
 
-    public Message(String message, WebWindow aThis) {
+    private final String message;
+    private final WebWindow window;
+
+    public Message(final String message, final WebWindow aThis) {
         this.message = message;
         this.window = aThis;
     }
-    
+
     public String getMessage() {
         return message;
     }
-    
+
     public String getWindow() {
         return window.getId();
     }

src/com/dmdirc/addons/ui_web/WebPrincipal.java

@@ -29,7 +29,7 @@ import java.security.Principal;
  * @author chris
  */
 public class WebPrincipal implements Principal {
-    
+
     private final String username;
 
     public WebPrincipal(final String username) {
@@ -44,7 +44,7 @@ public class WebPrincipal implements Principal {
 
     /** {@inheritDoc} */
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (obj == null) {
             return false;
         }
@@ -52,8 +52,9 @@ public class WebPrincipal implements Principal {
             return false;
         }
         final WebPrincipal other = (WebPrincipal) obj;
-        if (this.username != other.username &&
-            (this.username == null || !this.username.equals(other.username))) {
+        if (this.username != other.username 
+                && (this.username == null
+                || !this.username.equals(other.username))) {
             return false;
         }
         return true;

src/com/dmdirc/addons/ui_web/WebUserRealm.java

@@ -38,13 +38,14 @@ import org.mortbay.jetty.security.UserRealm;
 
 /**
  * Describes the users allowed to access the web UI.
- * 
+ *
  * @author chris
  */
 public class WebUserRealm implements UserRealm {
-    
-    private final Map<String, Principal> principals = new HashMap<String, Principal>();
-    
+
+    private final Map<String, Principal> principals
+            = new HashMap<String, Principal>();
+
     private final ConfigManager config = IdentityManager.getGlobalConfig();
 
     /** {@inheritDoc} */
@@ -53,8 +54,9 @@ public class WebUserRealm implements UserRealm {
         if (config.hasOptionString(WebInterfaceUI.DOMAIN, "users")) {
             return "DMDirc web UI";
         } else {
-            return "DMDirc web UI first run -- " 
-                    + "enter the username and password you wish to use in the future";
+            return "DMDirc web UI first run -- "
+                    + "enter the username and password you wish to use in "
+                    + "the future";
         }
     }
 
@@ -66,16 +68,17 @@ public class WebUserRealm implements UserRealm {
 
     /** {@inheritDoc} */
     @Override
-    public Principal authenticate(final String username, final Object credentials,
-            final Request request) {
+    public Principal authenticate(final String username,
+            final Object credentials, final Request request) {
         if (!config.hasOptionString(WebInterfaceUI.DOMAIN, "users")) {
             final List<String> users = new ArrayList<String>();
             users.add(username + ":" + getHash(username, credentials));
             IdentityManager.getConfigIdentity().setOption(WebInterfaceUI.DOMAIN,
                     "users", users);
         }
-        
-        for (String userinfo : config.getOptionList(WebInterfaceUI.DOMAIN, "users")) {
+
+        for (String userinfo : config.getOptionList(WebInterfaceUI.DOMAIN,
+                "users")) {
             if (userinfo.startsWith(username + ":")) {
                 final String pass = userinfo.substring(username.length() + 1);
 
@@ -85,7 +88,7 @@ public class WebUserRealm implements UserRealm {
                 }
             }
         }
-        
+
         return null;
     }
 
@@ -127,12 +130,12 @@ public class WebUserRealm implements UserRealm {
         principals.remove(user.getName());
     }
 
-    private String getHash(String username, Object credentials) {
+    private String getHash(final String username, final Object credentials) {
         final String target = username + "--" + (String) credentials;
-        
+
         try {
             final MessageDigest md = MessageDigest.getInstance("SHA-512");
-            
+
             return new BigInteger(md.digest(target.getBytes())).toString(16);
         } catch (NoSuchAlgorithmException ex) {
             // Don't hash

src/com/dmdirc/addons/ui_web/uicomponents/WebChannelWindow.java

@@ -36,29 +36,31 @@ import java.util.Collection;
  * @author chris
  */
 public class WebChannelWindow extends WebInputWindow implements ChannelWindow {
-    
+
     private final Channel channel;
 
-    public WebChannelWindow(final WebInterfaceUI controller, Channel channel) {
+    public WebChannelWindow(final WebInterfaceUI controller,
+            final Channel channel) {
         super(controller, channel);
         this.channel = channel;
     }
 
     /** {@inheritDoc} */
     @Override
-    public void updateNames(Collection<ChannelClientInfo> clients) {
+    public void updateNames(final Collection<ChannelClientInfo> clients) {
         updateNames();
     }
 
     /** {@inheritDoc} */
     @Override
-    public void addName(ChannelClientInfo client) {
-        DynamicRequestHandler.addEvent(new Event("addnicklist", client.getClient().getNickname()));
+    public void addName(final ChannelClientInfo client) {
+        DynamicRequestHandler.addEvent(new Event("addnicklist",
+                client.getClient().getNickname()));
     }
 
     /** {@inheritDoc} */
     @Override
-    public void removeName(ChannelClientInfo client) {
+    public void removeName(final ChannelClientInfo client) {
         updateNames();
     }
 
@@ -66,8 +68,10 @@ public class WebChannelWindow extends WebInputWindow implements ChannelWindow {
     @Override
     public void updateNames() {
         DynamicRequestHandler.addEvent(new Event("clearnicklist", null));
-        for (ChannelClientInfo cci : channel.getChannelInfo().getChannelClients()) {
-            DynamicRequestHandler.addEvent(new Event("addnicklist", cci.getClient().getNickname()));
+        for (ChannelClientInfo cci : channel.getChannelInfo()
+                .getChannelClients()) {
+            DynamicRequestHandler.addEvent(new Event("addnicklist",
+                    cci.getClient().getNickname()));
         }
     }
 

src/com/dmdirc/addons/ui_web/uicomponents/WebInputField.java

@@ -34,29 +34,30 @@ import java.awt.event.KeyListener;
  * @author chris
  */
 public class WebInputField implements InputField {
-    
+
     private String clientID;
-    
+
     private String text;
-    
+
     private int selStart, selEnd;
 
     public WebInputField() {
+        super();
     }
 
-    public WebInputField(String clientID) {
+    public WebInputField(final String clientID) {
         this.clientID = clientID;
     }
 
     /** {@inheritDoc} */
     @Override
-    public void addActionListener(ActionListener listener) {
+    public void addActionListener(final ActionListener listener) {
         // Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
-    public void addKeyListener(KeyListener listener) {
+    public void addKeyListener(final KeyListener listener) {
         // Do nothing
     }
 
@@ -69,13 +70,13 @@ public class WebInputField implements InputField {
 
     /** {@inheritDoc} */
     @Override
-    public void removeActionListener(ActionListener listener) {
+    public void removeActionListener(final ActionListener listener) {
         // Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
-    public void removeKeyListener(KeyListener listener) {
+    public void removeKeyListener(final KeyListener listener) {
         // Do nothing
     }
 
@@ -105,7 +106,7 @@ public class WebInputField implements InputField {
 
     /** {@inheritDoc} */
     @Override
-    public void setText(String text) {
+    public void setText(final String text) {
         DynamicRequestHandler.addEvent(clientID, new Event("settext", text));
     }
 
@@ -117,13 +118,14 @@ public class WebInputField implements InputField {
 
     /** {@inheritDoc} */
     @Override
-    public void setCaretPosition(int position) {
-        DynamicRequestHandler.addEvent(clientID, new Event("setcaret", position));
+    public void setCaretPosition(final int position) {
+        DynamicRequestHandler.addEvent(clientID, new Event(
+                "setcaret", position));
     }
 
     /** {@inheritDoc} */
     @Override
-    public void showColourPicker(boolean irc, boolean hex) {
+    public void showColourPicker(final boolean irc, final boolean hex) {
         // Do nothing
     }
 
@@ -133,14 +135,14 @@ public class WebInputField implements InputField {
         // Do nothing
     }
 
-    public void setSelEnd(int selEnd) {
+    public void setSelEnd(final int selEnd) {
         this.selEnd = selEnd;
     }
 
-    public void setSelStart(int selStart) {
+    public void setSelStart(final int selStart) {
         this.selStart = selStart;
     }
-    
+
     public void setContent(final String text) {
         this.text = text;
     }

src/com/dmdirc/addons/ui_web/uicomponents/WebInputHandler.java

@@ -33,9 +33,9 @@ import com.dmdirc.ui.interfaces.InputField;
  */
 public class WebInputHandler extends InputHandler {
 
-    public WebInputHandler(InputField thisTarget,
-                           CommandParser thisCommandParser,
-                           WebInputWindow thisParentWindow) {
+    public WebInputHandler(final InputField thisTarget,
+                           final CommandParser thisCommandParser,
+                           final WebInputWindow thisParentWindow) {
         super(thisTarget, thisCommandParser, thisParentWindow);
     }
 
@@ -80,7 +80,7 @@ public class WebInputHandler extends InputHandler {
     /** {@inheritDoc} */
     @Override
     @SuppressWarnings("PMD")
-    public void doTabCompletion(boolean shiftPressed) {
+    public void doTabCompletion(final boolean shiftPressed) {
         super.doTabCompletion(shiftPressed);
     }
 

src/com/dmdirc/addons/ui_web/uicomponents/WebInputWindow.java

@@ -36,21 +36,23 @@ import java.util.Map;
  * @author chris
  */
 public class WebInputWindow extends WebWindow implements InputWindow {
-    
+
     private final WritableFrameContainer<?> parent;
-    
+
     private final CommandParser commandparser;
-    
+
     private final WebInputHandler inputhandler;
-    
+
     private final Map<String, WebInputHandler> inputHandlers
             = new HashMap<String, WebInputHandler>();
 
-    public WebInputWindow(WebInterfaceUI controller, WritableFrameContainer<?> parent) {
+    public WebInputWindow(final WebInterfaceUI controller,
+            final WritableFrameContainer<?> parent) {
         super(controller, parent);
         this.parent = parent;
         this.commandparser = parent.getCommandParser();
-        this.inputhandler = new WebInputHandler(new WebInputField(), commandparser, this);
+        this.inputhandler = new WebInputHandler(new WebInputField(),
+                commandparser, this);
     }
 
     /** {@inheritDoc} */
@@ -68,19 +70,19 @@ public class WebInputWindow extends WebWindow implements InputWindow {
 
     public InputHandler getInputHandler(final String clientID) {
         if (!inputHandlers.containsKey(clientID)) {
-            WebInputHandler ih
-                    = new WebInputHandler(new WebInputField(clientID), commandparser, this);
+            final WebInputHandler ih = new WebInputHandler(
+                    new WebInputField(clientID), commandparser, this);
             ih.setTabCompleter(inputhandler.getTabCompleter());
             inputHandlers.put(clientID, ih);
         }
-        
+
         return inputHandlers.get(clientID);
     }
-    
-    public InputHandler getInputHandler(final String clientID, final String text,
-            final String selStart, final String selEnd) {
+
+    public InputHandler getInputHandler(final String clientID,
+            final String text, final String selStart, final String selEnd) {
         int sel1, sel2;
-        
+
         try {
             sel1 = Integer.parseInt(selStart);
             sel2 = Integer.parseInt(selEnd);
@@ -88,20 +90,20 @@ public class WebInputWindow extends WebWindow implements InputWindow {
             sel1 = 0;
             sel2 = 0;
         }
-        
-        WebInputHandler ih = (WebInputHandler) getInputHandler(clientID);
-        WebInputField field = (WebInputField) ih.getTarget();
+
+        final WebInputHandler ih = (WebInputHandler) getInputHandler(clientID);
+        final WebInputField field = (WebInputField) ih.getTarget();
         field.setContent(text);
         field.setSelStart(sel1);
         field.setSelEnd(sel2);
-        
+
         return ih;
-    }    
+    }
 
     /** {@inheritDoc} */
     @Override
     @Deprecated
-    public void setAwayIndicator(boolean isAway) {
+    public void setAwayIndicator(final boolean isAway) {
         // Do nothing
     }
 

src/com/dmdirc/addons/ui_web/uicomponents/WebMainWindow.java

@@ -48,7 +48,7 @@ public class WebMainWindow implements MainWindow {
 
     /** {@inheritDoc} */
     @Override
-    public void setMaximised(boolean max) {
+    public void setMaximised(final boolean max) {
         //TODO FIXME
         throw new UnsupportedOperationException("Not supported yet.");
     }
@@ -69,7 +69,7 @@ public class WebMainWindow implements MainWindow {
 
     /** {@inheritDoc} */
     @Override
-    public void setVisible(boolean visible) {
+    public void setVisible(final boolean visible) {
         //TODO FIXME
         throw new UnsupportedOperationException("Not supported yet.");
     }

src/com/dmdirc/addons/ui_web/uicomponents/WebQueryWindow.java

@@ -31,7 +31,7 @@ import com.dmdirc.ui.interfaces.QueryWindow;
  * @author chris
  */
 public class WebQueryWindow extends WebInputWindow implements QueryWindow {
-    
+
     private final Query query;
 
     public WebQueryWindow(final WebInterfaceUI controller, final Query parent) {

src/com/dmdirc/addons/ui_web/uicomponents/WebServerWindow.java

@@ -31,12 +31,13 @@ import com.dmdirc.ui.interfaces.ServerWindow;
  * @author chris
  */
 public class WebServerWindow extends WebInputWindow implements ServerWindow {
- 
+
     private final Server server;
 
-    public WebServerWindow(WebInterfaceUI controller, Server server) {
+    public WebServerWindow(final WebInterfaceUI controller,
+            final Server server) {
         super(controller, server);
-        
+
         this.server = server;
     }
 

src/com/dmdirc/addons/ui_web/uicomponents/WebStatusBar.java

@@ -42,14 +42,15 @@ public class WebStatusBar implements StatusBar {
 
     /** {@inheritDoc} */
     @Override
-    public void setMessage(String newMessage, StatusMessageNotifier newNotifier) {
+    public void setMessage(final String newMessage,
+            final StatusMessageNotifier newNotifier) {
         DynamicRequestHandler.addEvent(new Event("statusbar", newMessage));
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setMessage(String newMessage, StatusMessageNotifier newNotifier,
-                           int timeout) {
+    public void setMessage(final String newMessage,
+            final StatusMessageNotifier newNotifier, final int timeout) {
         DynamicRequestHandler.addEvent(new Event("statusbar", newMessage));
     }
 
@@ -61,33 +62,33 @@ public class WebStatusBar implements StatusBar {
 
     /** {@inheritDoc} */
     @Override
-    public void addComponent(StatusBarComponent component) {
+    public void addComponent(final StatusBarComponent component) {
         // Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
-    public void removeComponent(StatusBarComponent component) {
+    public void removeComponent(final StatusBarComponent component) {
         // Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setMessage(String iconType, String newMessage) {
+    public void setMessage(final String iconType, final String newMessage) {
         DynamicRequestHandler.addEvent(new Event("statusbar", newMessage));
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setMessage(String iconType, String newMessage,
-            StatusMessageNotifier newNotifier) {
+    public void setMessage(final String iconType, final String newMessage,
+            final StatusMessageNotifier newNotifier) {
         DynamicRequestHandler.addEvent(new Event("statusbar", newMessage));
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setMessage(String iconType, String newMessage,
-            StatusMessageNotifier newNotifier, int timeout) {
+    public void setMessage(final String iconType, final String newMessage,
+            final StatusMessageNotifier newNotifier, final int timeout) {
         DynamicRequestHandler.addEvent(new Event("statusbar", newMessage));
     }
 

src/com/dmdirc/addons/ui_web/uicomponents/WebWindow.java

@@ -52,21 +52,24 @@ import org.apache.commons.lang.StringEscapeUtils;
  *
  * @author chris
  */
-public class WebWindow implements Window, IRCDocumentListener, FrameInfoListener {
+public class WebWindow implements Window, IRCDocumentListener,
+        FrameInfoListener {
 
     protected static int counter = 0;
 
-    protected static final Map<String, WebWindow> WINDOWS = new HashMap<String, WebWindow>();
+    protected static final Map<String, WebWindow> WINDOWS
+            = new HashMap<String, WebWindow>();
 
     protected int myID = ++counter;
 
     private final FrameContainer<?> parent;
 
-    private List<String> messages = new ArrayList<String>();
+    private final List<String> messages = new ArrayList<String>();
 
     private String title;
 
-    public WebWindow(final WebInterfaceUI controller, final FrameContainer<?> parent) {
+    public WebWindow(final WebInterfaceUI controller,
+            final FrameContainer<?> parent) {
         super();
 
         this.parent = parent;
@@ -81,8 +84,8 @@ public class WebWindow implements Window, IRCDocumentListener, FrameInfoListener
             DynamicRequestHandler.addEvent(new Event("newwindow", this));
         } else {
             DynamicRequestHandler.addEvent(new Event("newchildwindow",
-                    new Object[]{controller.getWindowManager().getWindow(parent.getParent()),
-                    this}));
+                    new Object[]{controller.getWindowManager().getWindow(
+                            parent.getParent()), this}));
         }
     }
 
@@ -101,28 +104,28 @@ public class WebWindow implements Window, IRCDocumentListener, FrameInfoListener
         for (int i = 0; i < getContainer().getDocument().getNumLines(); i++) {
             messages.add(style(getContainer().getDocument().getStyledLine(i)));
         }
-        
+
         return messages;
     }
 
     /** {@inheritDoc} */
     @Override
     @Deprecated
-    public void addLine(String messageType, Object... args) {
+    public void addLine(final String messageType, final Object... args) {
         parent.addLine(messageType, args);
     }
 
     /** {@inheritDoc} */
     @Override
     @Deprecated
-    public void addLine(StringBuffer messageType, Object... args) {
+    public void addLine(final StringBuffer messageType, final Object... args) {
         parent.addLine(messageType, args);
     }
 
     /** {@inheritDoc} */
     @Override
     @Deprecated
-    public void addLine(String line, boolean timestamp) {
+    public void addLine(final String line, final boolean timestamp) {
         parent.addLine(line, timestamp);
     }
 
@@ -156,7 +159,7 @@ public class WebWindow implements Window, IRCDocumentListener, FrameInfoListener
     /** {@inheritDoc} */
     @Override
     @Deprecated
-    public void setVisible(boolean isVisible) {
+    public void setVisible(final boolean isVisible) {
         // Do nothing
     }
 
@@ -177,14 +180,14 @@ public class WebWindow implements Window, IRCDocumentListener, FrameInfoListener
         return true;
     }
 
-    public void setMaximum(boolean b) throws PropertyVetoException {
+    public void setMaximum(final boolean b) throws PropertyVetoException {
         // Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
     @Deprecated
-    public void setTitle(String title) {
+    public void setTitle(final String title) {
         this.title = title;
     }
 
@@ -242,7 +245,8 @@ public class WebWindow implements Window, IRCDocumentListener, FrameInfoListener
         return builder.toString();
     }
 
-    protected static void style(final Map<AttributedCharacterIterator.Attribute, Object> map,
+    protected static void style(
+            final Map<AttributedCharacterIterator.Attribute, Object> map,
             final StringBuilder builder) {
         if (builder.length() > 0) {
             builder.append("</span>");
@@ -252,7 +256,8 @@ public class WebWindow implements Window, IRCDocumentListener, FrameInfoListener
 
         builder.append("<span style=\"");
 
-        for (Map.Entry<AttributedCharacterIterator.Attribute, Object> entry : map.entrySet()) {
+        for (Map.Entry<AttributedCharacterIterator.Attribute, Object> entry
+                : map.entrySet()) {
 
             if (entry.getKey().equals(TextAttribute.FOREGROUND)) {
                 builder.append("color: ");
@@ -273,20 +278,22 @@ public class WebWindow implements Window, IRCDocumentListener, FrameInfoListener
             } else if (entry.getKey().equals(IRCTextAttribute.HYPERLINK)) {
                 builder.append("cursor: pointer; ");
                 link = "link_hyperlink('"
-                        + StringEscapeUtils.escapeHtml(
-                        StringEscapeUtils.escapeJavaScript((String) entry.getValue()))
+                        + StringEscapeUtils.escapeHtml(StringEscapeUtils
+                        .escapeJavaScript((String) entry.getValue()))
                         + "');";
             } else if (entry.getKey().equals(IRCTextAttribute.CHANNEL)) {
                 builder.append("cursor: pointer; ");
                 link = "link_channel('"
                         + StringEscapeUtils.escapeHtml(
-                        StringEscapeUtils.escapeJavaScript((String) entry.getValue()))
+                        StringEscapeUtils.escapeJavaScript(
+                        (String) entry.getValue()))
                         + "');";
             } else if (entry.getKey().equals(IRCTextAttribute.NICKNAME)) {
                 builder.append("cursor: pointer; ");
                 link = "link_query('"
                         + StringEscapeUtils.escapeHtml(
-                        StringEscapeUtils.escapeJavaScript((String) entry.getValue()))
+                        StringEscapeUtils.escapeJavaScript(
+                        (String) entry.getValue()))
                         + "');";
             }
         }
@@ -351,20 +358,20 @@ public class WebWindow implements Window, IRCDocumentListener, FrameInfoListener
     }
 
     @Override
-    public void lineAdded(int line, int size) {
-        DynamicRequestHandler.addEvent(new Event("lineadded",
-                new Message(style(parent.getDocument().getStyledLine(line)), this)));
+    public void lineAdded(final int line, final int size) {
+        DynamicRequestHandler.addEvent(new Event("lineadded", new Message(
+                style(parent.getDocument().getStyledLine(line)), this)));
     }
 
     @Override
-    public void linesAdded(int line, int length, int size) {
+    public void linesAdded(final int line, final int length, final int size) {
         for (int i = 0; i < length; i++) {
             lineAdded(line + i, size);
         }
     }
 
     @Override
-    public void trimmed(int newSize, int numTrimmed) {
+    public void trimmed(final int newSize, final int numTrimmed) {
         //TODO FIXME
     }
 
@@ -379,17 +386,18 @@ public class WebWindow implements Window, IRCDocumentListener, FrameInfoListener
     }
 
     @Override
-    public void iconChanged(FrameContainer<?> window, String icon) {
+    public void iconChanged(final FrameContainer<?> window, final String icon) {
         //TODO FIXME
     }
 
     @Override
-    public void nameChanged(FrameContainer<?> window, String name) {
+    public void nameChanged(final FrameContainer<?> window, final String name) {
         //TODO FIXME
     }
 
     @Override
-    public void titleChanged(FrameContainer<?> window, String title) {
+    public void titleChanged(final FrameContainer<?> window,
+            final String title) {
         this.title = title;
     }