Core style fixes

Change-Id: Id071eef525d7cbf9e08f8bbf975277b6ca7e4f1d
Reviewed-on: http://gerrit.dmdirc.com/1317
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/Channel.java

@@ -58,7 +58,7 @@ import java.util.Map;
 public class Channel extends MessageTarget<ChannelWindow> implements ConfigChangeListener {
 
     /** The parser's pChannel class. */
-    private transient ChannelInfo channelInfo;
+    private ChannelInfo channelInfo;
 
     /** The server this channel is on. */
     private Server server;
@@ -151,7 +151,7 @@ public class Channel extends MessageTarget<ChannelWindow> implements ConfigChang
         }
 
         final ClientInfo me = server.getParser().getLocalClient();
-        final String[] details = getDetails(channelInfo.getChannelClient(me), showColours);
+        final String[] details = getDetails(channelInfo.getChannelClient(me));
 
         for (String part : splitLine(getTranscoder().encode(line))) {
             if (!part.isEmpty()) {
@@ -186,7 +186,7 @@ public class Channel extends MessageTarget<ChannelWindow> implements ConfigChang
         }
 
         final ClientInfo me = server.getParser().getLocalClient();
-        final String[] details = getDetails(channelInfo.getChannelClient(me), showColours);
+        final String[] details = getDetails(channelInfo.getChannelClient(me));
 
         if (server.getParser().getMaxLength("PRIVMSG", getChannelInfo().getName())
                 <= action.length()) {
@@ -275,7 +275,7 @@ public class Channel extends MessageTarget<ChannelWindow> implements ConfigChang
         String temp = Styliser.stipControlCodes(channelInfo.getName());
 
         if (!channelInfo.getTopic().isEmpty()) {
-            temp = temp + " - " + Styliser.stipControlCodes(channelInfo.getTopic());
+            temp += " - " + Styliser.stipControlCodes(channelInfo.getTopic());
         }
 
         setTitle(temp);
@@ -480,11 +480,9 @@ public class Channel extends MessageTarget<ChannelWindow> implements ConfigChang
      * client.
      *
      * @param client The channel client to check
-     * @param showColours Whether or not to show colours
      * @return A string[] containing displayable components
      */
-    private String[] getDetails(final ChannelClientInfo client,
-            final boolean showColours) {
+    private String[] getDetails(final ChannelClientInfo client) {
         if (client == null) {
             // WTF?
             throw new UnsupportedOperationException("getDetails called with"
@@ -500,10 +498,9 @@ public class Channel extends MessageTarget<ChannelWindow> implements ConfigChang
         if (showColours) {
             final Map<?,?> map = client.getMap();
             String prefix = null;
-            Color colour;
 
             if (map.containsKey(ChannelClientProperty.TEXT_FOREGROUND)) {
-                colour = (Color) map.get(ChannelClientProperty.TEXT_FOREGROUND);
+                Color colour = (Color) map.get(ChannelClientProperty.TEXT_FOREGROUND);
                 prefix = Styliser.CODE_HEXCOLOUR + ColourManager.getHex(colour);
                 if (map.containsKey(ChannelClientProperty.TEXT_BACKGROUND)) {
                     colour = (Color) map.get(ChannelClientProperty.TEXT_BACKGROUND);
@@ -535,7 +532,7 @@ public class Channel extends MessageTarget<ChannelWindow> implements ConfigChang
             // Format ChannelClientInfos
 
             final ChannelClientInfo clientInfo = (ChannelClientInfo) arg;
-            args.addAll(Arrays.asList(getDetails(clientInfo, showColours)));
+            args.addAll(Arrays.asList(getDetails(clientInfo)));
 
             return true;
         } else if (arg instanceof Topic) {

src/com/dmdirc/ChannelEventHandler.java

@@ -25,12 +25,13 @@ package com.dmdirc;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.parser.common.AwayState;
+import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.interfaces.callbacks.*;
+
 import java.util.Date;
 
 /**
@@ -38,7 +39,7 @@ import java.util.Date;
  *
  * @author chris
  */
-public final class ChannelEventHandler extends EventHandler implements
+public class ChannelEventHandler extends EventHandler implements
         ChannelMessageListener, ChannelNamesListener, ChannelTopicListener,
         ChannelJoinListener, ChannelPartListener, ChannelKickListener,
         ChannelQuitListener, ChannelActionListener, ChannelNickChangeListener,

src/com/dmdirc/EventHandler.java

@@ -24,9 +24,9 @@ package com.dmdirc;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.common.CallbackNotFoundException;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
 
 /**
@@ -40,7 +40,6 @@ public abstract class EventHandler implements CallbackInterface {
      * Registers all callbacks that this event handler implements with the
      * owner's parser.
      */
-    @SuppressWarnings("unchecked")
     public void registerCallbacks() {
         final CallbackManager<?> cbm = getServer().getParser().getCallbackManager();
         
@@ -73,7 +72,6 @@ public abstract class EventHandler implements CallbackInterface {
      * @param type The type of the callback to be added
      * @throws CallbackNotFoundException if the specified callback isn't found
      */
-    @SuppressWarnings("unchecked")
     protected abstract <T extends CallbackInterface> void addCallback(
             final CallbackManager<?> cbm, final Class<T> type) throws CallbackNotFoundException;
     

src/com/dmdirc/FrameContainer.java

@@ -55,10 +55,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
  */
 public abstract class FrameContainer<T extends Window> {
 
-    /** Logger to use. */
-    private static final java.util.logging.Logger LOGGER = java.util.logging
-            .Logger.getLogger(FrameContainer.class.getName());
-
     /** The colour of our frame's notifications. */
     protected Color notification = Color.BLACK;
 
@@ -113,7 +109,7 @@ public abstract class FrameContainer<T extends Window> {
      * @param config The config manager for this container
      * @since 0.6.4
      */
-    public FrameContainer(final String icon, final String name,
+    protected FrameContainer(final String icon, final String name,
             final String title, final Class<T> windowClass, final ConfigManager config) {
         this.config = config;
         this.name = name;

src/com/dmdirc/FrameContainerComparator.java

@@ -40,13 +40,6 @@ public final class FrameContainerComparator implements Comparator<FrameContainer
      */
     private static final long serialVersionUID = 1;
 
-    /**
-     * Creates a new instance of FrameContainerComparator.
-     */
-    public FrameContainerComparator() {
-        super();
-    }
-
     /**
      * Compares two frame containers names.
      *
@@ -91,7 +84,7 @@ public final class FrameContainerComparator implements Comparator<FrameContainer
      * @param item2 The existing container to test against
      * @return True iff the new container should be before the old container
      */
-    private boolean sortBefore(final FrameContainer<?> item1,
+    private static boolean sortBefore(final FrameContainer<?> item1,
             final FrameContainer<?> item2) {
 
         return getPosition(item1) < getPosition(item2);
@@ -104,7 +97,7 @@ public final class FrameContainerComparator implements Comparator<FrameContainer
      * @param item2 The existing container to test against
      * @return True iff the new container should be after the old container
      */
-    private boolean sortAfter(final FrameContainer<?> item1,
+    private static boolean sortAfter(final FrameContainer<?> item1,
             final FrameContainer<?> item2) {
         return getPosition(item1) > getPosition(item2);
     }
@@ -116,7 +109,7 @@ public final class FrameContainerComparator implements Comparator<FrameContainer
      * @param item The frame container to be tested
      * @return Position of the frame container
      */
-    private int getPosition(final FrameContainer<?> item) {
+    private static int getPosition(final FrameContainer<?> item) {
         if (item instanceof GlobalWindow) {
             return 0;
         } else if (item instanceof Server) {

src/com/dmdirc/GlobalWindow.java

@@ -125,6 +125,10 @@ public class GlobalWindow extends WritableFrameContainer<InputWindow> {
         updateWindowState();
     }
 
+    /**
+     * Updates the state of the global window in line with the
+     * general.showglobalwindow config setting.
+     */
     protected static void updateWindowState() {
         synchronized (GlobalWindow.class) {
             if (IdentityManager.getGlobalConfig().getOptionBool("general", "showglobalwindow")) {

src/com/dmdirc/Invite.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc;
 
-import com.dmdirc.parser.common.ChannelJoinRequest;
 import java.util.Date;
 
 /**

src/com/dmdirc/Main.java

@@ -35,8 +35,8 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
-import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.ui.interfaces.UIController;
+import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.ui.WarningDialog;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.Version;
@@ -59,7 +59,7 @@ import java.util.logging.Level;
  *
  * @author chris
  */
-public final class Main {
+public class Main {
 
     /** Feedback nag delay. */
     private static final int FEEDBACK_DELAY = 30 * 60 * 1000;

src/com/dmdirc/Query.java

@@ -29,10 +29,10 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.QueryCommandParser;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.common.CallbackNotFoundException;
+import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateActionListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;

src/com/dmdirc/Raw.java

@@ -25,13 +25,14 @@ package com.dmdirc;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.common.CallbackNotFoundException;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DataInListener;
 import com.dmdirc.parser.interfaces.callbacks.DataOutListener;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
+
 import java.util.Date;
 
 /**

src/com/dmdirc/Server.java

@@ -39,14 +39,14 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.parser.common.DefaultStringConverter;
 import com.dmdirc.parser.common.IgnoreList;
+import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.interfaces.ProtocolDescription;
 import com.dmdirc.parser.interfaces.SecureParser;
 import com.dmdirc.parser.interfaces.StringConverter;
-import com.dmdirc.parser.common.MyInfo;
-import com.dmdirc.parser.interfaces.ProtocolDescription;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -102,9 +102,9 @@ public class Server extends WritableFrameContainer<ServerWindow> implements Conf
     private final Map<String, Query> queries = new HashMap<String, Query>();
 
     /** The Parser instance handling this server. */
-    private transient Parser parser;
+    private Parser parser;
     /** The Parser instance that used to be handling this server. */
-    private transient Parser oldParser;
+    private Parser oldParser;
     /** The parser-supplied protocol description object. */
     private ProtocolDescription protocolDescription;
 
@@ -120,7 +120,7 @@ public class Server extends WritableFrameContainer<ServerWindow> implements Conf
     private final ReadWriteLock parserLock = new ReentrantReadWriteLock();
 
     /** The Parser Thread. */
-    private transient Thread parserThread;
+    private Thread parserThread;
 
     /** The raw frame used for this server instance. */
     private Raw raw;
@@ -129,7 +129,7 @@ public class Server extends WritableFrameContainer<ServerWindow> implements Conf
     private URI address;
 
     /** The profile we're using. */
-    private transient Identity profile;
+    private Identity profile;
 
     /** Object used to synchronise access to myState. */
     private final Object myStateLock = new Object();
@@ -1402,7 +1402,7 @@ public class Server extends WritableFrameContainer<ServerWindow> implements Conf
         synchronized (myStateLock) {
             if (myState.getState() == ServerState.CLOSING
                     || myState.getState() == ServerState.DISCONNECTED) {
-                // This has been triggered via .disconect()
+                // This has been triggered via .disconnect()
                 return;
             }
 
@@ -1572,7 +1572,7 @@ public class Server extends WritableFrameContainer<ServerWindow> implements Conf
     }
 
     /**
-     * Checks that we have the neccessary mode aliases for this server.
+     * Checks that we have the necessary mode aliases for this server.
      */
     private void checkModeAliases() {
         // Check we have mode aliases

src/com/dmdirc/ServerEventHandler.java

@@ -27,14 +27,15 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.common.AwayState;
+import com.dmdirc.parser.common.CallbackManager;
+import com.dmdirc.parser.common.CallbackNotFoundException;
+import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.common.ParserError;
-import com.dmdirc.parser.common.CallbackManager;
-import com.dmdirc.parser.common.CallbackNotFoundException;
 import com.dmdirc.parser.interfaces.callbacks.*;
 import com.dmdirc.parser.irc.IRCParser;
+
 import java.util.Date;
 
 /**

src/com/dmdirc/commandline/CommandLineParser.java

@@ -128,9 +128,9 @@ public class CommandLineParser {
     private boolean checkArgument(final char argument) {
         boolean needsArg = false;
         
-        for (int i = 0; i < ARGUMENTS.length; i++) {
-            if (argument == ARGUMENTS[i][0]) {
-                needsArg = (Boolean) ARGUMENTS[i][3];
+        for (Object[] target : ARGUMENTS) {
+            if ((Character) argument == target[0]) {
+                needsArg = (Boolean) target[3];
                 break;
             }
         }
@@ -151,9 +151,9 @@ public class CommandLineParser {
      * @return The short form of the corresponding argument
      */
     private char processLongArg(final String arg) {
-        for (int i = 0; i < ARGUMENTS.length; i++) {
-            if (arg.equalsIgnoreCase((String) ARGUMENTS[i][1])) {
-                return (Character) ARGUMENTS[i][0];
+        for (Object[] target : ARGUMENTS) {
+            if (arg.equalsIgnoreCase((String) target[1])) {
+                return (Character) target[0];
             }
         }
         
@@ -170,9 +170,9 @@ public class CommandLineParser {
      * @return The short form of the corresponding argument
      */
     private char processShortArg(final String arg) {
-        for (int i = 0; i < ARGUMENTS.length; i++) {
-            if (arg.equals(String.valueOf(ARGUMENTS[i][0]))) {
-                return (Character) ARGUMENTS[i][0];
+        for (Object[] target : ARGUMENTS) {
+            if (arg.equals(String.valueOf(target[0]))) {
+                return (Character) target[0];
             }
         }
         
@@ -183,7 +183,7 @@ public class CommandLineParser {
     }
     
     /**
-     * Processes the sepcified command-line argument.
+     * Processes the specified command-line argument.
      *
      * @param arg The short form of the argument used
      * @param param The (optional) string parameter for the option
@@ -232,7 +232,7 @@ public class CommandLineParser {
      *
      * @param message The message about the unknown argument to be displayed
      */
-    private void doUnknownArg(final String message) {
+    private static void doUnknownArg(final String message) {
         System.out.println(message);
         System.out.println();
         doHelp();
@@ -241,7 +241,7 @@ public class CommandLineParser {
     /**
      * Exits DMDirc.
      */
-    private void exit() {
+    private static void exit() {
         System.exit(0);
     }
     
@@ -275,7 +275,7 @@ public class CommandLineParser {
     /**
      * Handles the --check argument.
      */
-    private void doExistingCheck() {
+    private static void doExistingCheck() {
         if (RemoteServer.getServer() == null) {
             System.out.println("Existing instance not found.");
             System.exit(1);
@@ -290,7 +290,7 @@ public class CommandLineParser {
      *
      * @param dir The new config directory
      */
-    private void doDirectory(final String dir) {
+    private static void doDirectory(final String dir) {
         if (dir.endsWith(File.separator)) {
             Main.setConfigDir(dir);
         } else {
@@ -301,7 +301,7 @@ public class CommandLineParser {
     /**
      * Prints out the client version and exits.
      */
-    private void doVersion() {
+    private static void doVersion() {
         System.out.println("DMDirc - a cross-platform, open-source IRC client.");
         System.out.println();
         System.out.println("        Version: "
@@ -314,7 +314,7 @@ public class CommandLineParser {
     /**
      * Prints out client help and exits.
      */
-    private void doHelp() {
+    private static void doHelp() {
         System.out.println("Usage: java -jar DMDirc.jar [options]");
         System.out.println();
         System.out.println("Valid options:");

src/com/dmdirc/commandline/RemoteServer.java

@@ -48,13 +48,6 @@ public class RemoteServer implements RemoteInterface {
     /** The interface we're exposing. */
     private static final RemoteServer SERVER = new RemoteServer();
     
-    /**
-     * Creates a new instance of RemoteServer.
-     */
-    public RemoteServer() {
-        super();
-    }
-    
     /** {@inheritDoc} */
     @Override
     public void connect(final List<URI> addresses) throws RemoteException {

src/com/dmdirc/commandparser/CommandManager.java

@@ -32,8 +32,8 @@ import com.dmdirc.commandparser.commands.global.*;
 //import com.dmdirc.commandparser.commands.query.*;
 import com.dmdirc.commandparser.commands.server.*;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.util.MapList;
@@ -151,11 +151,12 @@ public final class CommandManager {
     }
     
     /**
-     * Registers the specified command with all of the specified parsers.
+     * Registers or unregisters the specified command with all of the specified parsers.
      *
      * @param info The command information object
-     * @param command The command to be reigstered
-     * @param parsers The parsers to register the command with
+     * @param command The command to be registered
+     * @param myParsers The parsers to register the command with
+     * @param register Whether to register or unregister the commands
      * @since 0.6.3m1
      */
     private static void registerCommand(final CommandInfo info, final Command command,

src/com/dmdirc/commandparser/commands/Command.java

@@ -88,8 +88,8 @@ public abstract class Command {
         for (int i = 0; i < headers.length; i++) {
             maxsizes[i] = headers[i].length() + 3;
             
-            for (int j = 0; j < data.length; j++) {
-                maxsizes[i] = Math.max(maxsizes[i], data[j][i].length() + 3);
+            for (String[] row : data) {
+                maxsizes[i] = Math.max(maxsizes[i], row[i].length() + 3);
             }
             
             doPadding(res, headers[i], maxsizes[i]);

src/com/dmdirc/commandparser/commands/IntelligentCommand.java

@@ -39,7 +39,7 @@ public interface IntelligentCommand {
      *
      * @since 0.6.4
      */
-    public static class IntelligentCommandContext {
+    class IntelligentCommandContext {
 
         /** The window the command is being entered in. */
         private final InputWindow window;

src/com/dmdirc/commandparser/commands/channel/Cycle.java

@@ -26,8 +26,8 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;

src/com/dmdirc/commandparser/commands/channel/Invite.java

@@ -27,8 +27,8 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -27,8 +27,8 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;

src/com/dmdirc/commandparser/commands/channel/SetNickColour.java

@@ -56,7 +56,6 @@ public final class SetNickColour extends Command implements IntelligentCommand,
     }
     
     /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
     @Override
     public void execute(final FrameContainer<?> origin,
             final CommandArguments args, final CommandContext context) {

src/com/dmdirc/commandparser/commands/global/AliasCommand.java

@@ -105,7 +105,7 @@ public final class AliasCommand extends Command implements
      * @param name The name of the alias to remove
      * @return True if the alias was deleted, false otherwise
      */
-    private boolean doRemove(final String name) {
+    private static boolean doRemove(final String name) {
         for (Action alias : AliasWrapper.getAliasWrapper()) {
             if (AliasWrapper.getCommandName(alias).substring(1).equalsIgnoreCase(
                     name)) {

src/com/dmdirc/commandparser/commands/global/Debug.java

@@ -47,9 +47,9 @@ import com.dmdirc.updater.UpdateChecker;
 import java.io.Serializable;
 import java.util.Comparator;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.Map.Entry;
 
 /**
  * Provides various handy ways to test or debug the client.
@@ -116,7 +116,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
      *
      * @param args The arguments that were passed to the command
      */
-    private void doError(final String ... args) {
+    private static void doError(final String ... args) {
         ErrorLevel el = ErrorLevel.HIGH;
         if (args.length > 2) {
             final String level = args[2];
@@ -258,7 +258,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
      *
      * @return Sorted set of config options and usages
      */
-    private SortedSet<Entry<String, Integer>> getSortedStats() {
+    private static SortedSet<Entry<String, Integer>> getSortedStats() {
         final SortedSet<Entry<String, Integer>> sortedStats =
                 new TreeSet<Entry<String, Integer>>(new ValueComparator());
         sortedStats.addAll(ConfigManager.getStats().entrySet());
@@ -414,7 +414,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
      * 
      * @param origin The window this command was executed in
      */
-    private void doBenchmark(final FrameContainer<?> origin) {
+    private static void doBenchmark(final FrameContainer<?> origin) {
         long[] results = new long[10];
         
         for (int i = 0; i < results.length; i++) {
@@ -534,11 +534,6 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
          */
         private static final long serialVersionUID = 1;
         
-        /** Instantiates a new ValueComparator. */
-        public ValueComparator() {
-            super();
-        }
-        
         /** {@inheritDoc} */
         @Override
         public int compare(final Entry<String, Integer> o1,

src/com/dmdirc/commandparser/commands/global/Ifplugin.java

@@ -29,9 +29,9 @@ import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
-import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -116,7 +116,7 @@ public final class Ifplugin extends Command implements IntelligentCommand,
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
-        AdditionalTabTargets res;
+        final AdditionalTabTargets res;
         
         if (arg == 0) {
             res = new AdditionalTabTargets().excludeAll();

src/com/dmdirc/commandparser/commands/global/NewServer.java

@@ -69,7 +69,6 @@ public final class NewServer extends Command implements IntelligentCommand,
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "newserver",
                     "<host[:[+]port]> [password]");
-            address = null;
             return;
         } else if (args.getArguments().length == 1
                 && args.getArgumentsAsString().contains("://")) {

src/com/dmdirc/commandparser/commands/global/OpenWindow.java

@@ -73,7 +73,7 @@ public class OpenWindow extends Command implements IntelligentCommand, CommandIn
             showUsage(origin, args.isSilent(), "openwindow",
                     "[--server|--child] <name> [title]");
         } else {
-            FrameContainer<?> window;
+            final FrameContainer<?> window;
             
             if (parent == null) {
                 window = WindowManager.findCustomWindow(args.getArguments()[start]);

src/com/dmdirc/commandparser/commands/global/Set.java

@@ -94,6 +94,7 @@ public final class Set extends Command implements IntelligentCommand, CommandInf
                 doSetOption(origin, args.isSilent(), identity, args.getArguments()[i],
                         args.getArguments()[1 + i], args.getArgumentsAsString(2 + i));
             }
+            break;
         }
     }
 

src/com/dmdirc/commandparser/commands/server/ChangeServer.java

@@ -60,7 +60,6 @@ public final class ChangeServer extends Command implements CommandInfo {
         URI address = null;
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "server", "<host[:[+]port]> [password]");
-            address = null;
             return;
         } else if (args.getArguments().length == 1
                 && args.getArgumentsAsString().contains("://")) {

src/com/dmdirc/commandparser/commands/server/Disconnect.java

@@ -52,7 +52,7 @@ public final class Disconnect extends Command implements CommandInfo {
     public void execute(final FrameContainer<?> origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
-        String line;
+        final String line;
         
         if (args.getArguments().length == 0) {
             line = origin.getConfigManager().getOption("general", "quitmessage");

src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java

@@ -50,7 +50,7 @@ import java.util.List;
  * @since 0.6.3m1
  * @author chris
  */
-public final class JoinChannelCommand extends Command implements
+public class JoinChannelCommand extends Command implements
         ActionListener, IntelligentCommand, CommandInfo {
 
     /** A map of channel name mentions. */
@@ -146,7 +146,7 @@ public final class JoinChannelCommand extends Command implements
         final AdditionalTabTargets targets = new AdditionalTabTargets().excludeAll();
 
         final String prefix;
-        int index;
+        final int index;
         if ((index = context.getPartial().lastIndexOf(',')) > -1) {
             // If they are tab completing something containing a comma, we
             // add our results after the comma instead of returning them as-is.

src/com/dmdirc/commandparser/commands/server/Reconnect.java

@@ -52,7 +52,7 @@ public final class Reconnect extends Command implements CommandInfo {
     public void execute(final FrameContainer<?> origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
-        String line;
+        final String line;
         
         if (args.getArguments().length == 0) {
             line = origin.getConfigManager().getOption("general", "reconnectmessage");

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -71,7 +71,7 @@ public abstract class CommandParser implements Serializable {
     private final RollingList<PreviousCommand> history;
 
     /** Creates a new instance of CommandParser. */
-    public CommandParser() {
+    protected CommandParser() {
         commands = new Hashtable<String, CommandInfoPair>();
         history = new RollingList<PreviousCommand>(
                 IdentityManager.getGlobalConfig().getOptionInt("general",

src/com/dmdirc/commandparser/parsers/GlobalCommandParser.java

@@ -51,13 +51,6 @@ public class GlobalCommandParser extends CommandParser {
      */
     private static GlobalCommandParser me;
     
-    /**
-     * Creates a new instance of the GlobalCommandParser.
-     */
-    public GlobalCommandParser() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void setOwner(final FrameContainer<?> owner) {

src/com/dmdirc/commandparser/parsers/ServerCommandParser.java

@@ -52,13 +52,6 @@ public class ServerCommandParser extends GlobalCommandParser {
      */
     private Server server;
     
-    /**
-     * Creates a new instance of ServerCommandParser.
-     */
-    public ServerCommandParser() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void setOwner(final FrameContainer<?> owner) {