Style fixes

git-svn-id: http://svn.dmdirc.com/trunk@515 00569f92-eb28-0410-84fd-f71c24880f

src/uk/org/ownage/dmdirc/commandparser/ChannelCommand.java

@@ -26,22 +26,22 @@ import uk.org.ownage.dmdirc.Channel;
 import uk.org.ownage.dmdirc.Server;
 
 /**
- * Represents a command which can be performed only in the context of a channel
+ * Represents a command which can be performed only in the context of a channel.
  * @author chris
  */
 public abstract class ChannelCommand extends Command {
     
-    /** Creates a new instance of ChannelCommand */
+    /** Creates a new instance of ChannelCommand. */
     public ChannelCommand() {
         super();
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The window in which the command was typed
      * @param server The server instance that this command is being executed on
      * @param channel The channel instance that this command is being executed on
      * @param args Arguments passed to this command
      */
     public abstract void execute(CommandWindow origin, Server server, Channel channel, String... args);
-}
+}

src/uk/org/ownage/dmdirc/commandparser/ChannelCommandParser.java

@@ -30,30 +30,30 @@ import uk.org.ownage.dmdirc.Server;
  * both channel and server commands.
  * @author chris
  */
-public class ChannelCommandParser extends CommandParser {
+public final class ChannelCommandParser extends CommandParser {
     
     /**
-     * The server instance that this parser is attached to
+     * The server instance that this parser is attached to.
      */
     private Server server;
     /**
-     * The channel instance that this parser is attached to
+     * The channel instance that this parser is attached to.
      */
     private Channel channel;
     
     /**
-     * Creates a new instance of ChannelCommandParser
-     * @param server The server instance that this parser is attached to
-     * @param channel The channel instance that this parser is attached to
+     * Creates a new instance of ChannelCommandParser.
+     * @param newServer The server instance that this parser is attached to
+     * @param newChannel The channel instance that this parser is attached to
      */
-    public ChannelCommandParser(Server server, Channel channel) {
+    public ChannelCommandParser(final Server newServer, final Channel newChannel) {
         super();
         
-        this.server = server;
-        this.channel = channel;
+        this.server = newServer;
+        this.channel = newChannel;
     }
     
-    /** Loads the relevant commands into the parser */
+    /** Loads the relevant commands into the parser. */
     protected void loadCommands() {
         CommandManager.loadChannelCommands(this);
         CommandManager.loadServerCommands(this);
@@ -65,7 +65,8 @@ public class ChannelCommandParser extends CommandParser {
      * @param command The command to be executed
      * @param args The arguments to the command
      */
-    protected void executeCommand(CommandWindow origin, Command command, String... args) {
+    protected void executeCommand(final CommandWindow origin,
+            final Command command, final String... args) {
         if (command instanceof ChannelCommand) {
             ((ChannelCommand) command).execute(origin, server, channel, args);
         } else {
@@ -81,8 +82,9 @@ public class ChannelCommandParser extends CommandParser {
      * @param command The command the user tried to execute
      * @param args The arguments passed to the command
      */
-    protected void handleInvalidCommand(CommandWindow origin, String command, String... args) {
-        origin.addLine("Unknown command: "+command+"/"+args.length);
+    protected void handleInvalidCommand(final CommandWindow origin,
+            final String command, final String... args) {
+        origin.addLine("Unknown command: " + command + "/" + args.length);
     }
     
     /**
@@ -91,7 +93,7 @@ public class ChannelCommandParser extends CommandParser {
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
-    protected void handleNonCommand(CommandWindow origin, String line) {
+    protected void handleNonCommand(final CommandWindow origin, final String line) {
         channel.sendLine(line);
     }
     

src/uk/org/ownage/dmdirc/commandparser/Command.java

@@ -23,38 +23,38 @@
 package uk.org.ownage.dmdirc.commandparser;
 
 /**
- * Represents a generic command
+ * Represents a generic command.
  * @author chris
  */
 public abstract class Command {
     
     /**
-     * The name of this command (i.e., the string used by the user to execute it)
+     * The name of this command (i.e., the string used by the user to execute it).
      */
     protected String name;
     /**
-     * The arity of this command
+     * The arity of this command.
      */
-    protected int arity = 0;
+    protected int arity;
     /**
-     * Whether this command is polyadic or not
+     * Whether this command is polyadic or not.
      */
     protected boolean polyadic;
     /**
-     * Whether this command should be shown in help output
+     * Whether this command should be shown in help output.
      */
     protected boolean show = true;
     /**
-     * A textual description of this command's arguments
+     * A textual description of this command's arguments.
      */
     protected String arguments = "<unknown>";
     /**
-     * A description of this command
+     * A description of this command.
      */
     protected String description = "unknown";
     
     /**
-     * Creates a new instance of Command
+     * Creates a new instance of Command.
      */
     public Command() {
     }
@@ -69,12 +69,12 @@ public abstract class Command {
         if (polyadic) {
             return name;
         } else {
-            return name+"/"+arity;
+            return name + "/" + arity;
         }
     }
     
     /**
-     * Returns whether or not this command should be shown in help messages
+     * Returns whether or not this command should be shown in help messages.
      * @return True iff the command should be shown, false otherwise
      */
     public boolean showInHelp() {
@@ -82,32 +82,32 @@ public abstract class Command {
     }
     
     /**
-     * Returns a string representing the help message for this command
+     * Returns a string representing the help message for this command.
      * @return the help message for this command
      */
     public String getHelp() {
-        return name+" "+arguments+" - "+description;
+        return name + " " + arguments + " - " + description;
     }
     
     /**
-     * Implodes the given list of arguments
+     * Implodes the given list of arguments.
      * @param args The arguments to implode
      * @return A string containing each argument seperated by a space
      */
-    protected String implodeArgs(String... args) {
+    protected String implodeArgs(final String... args) {
         String res = "";
         for (int i = 0; i < args.length; i++) {
             if (res.equals("")) {
                 res = args[i];
             } else {
-                res = res.concat(" "+args[i]);
+                res = res.concat(" " + args[i]);
             }
         }
         return res;
     }
     
     /**
-     * Returns this command's name
+     * Returns this command's name.
      * @return The name of this command
      */
     public String getName() {

src/uk/org/ownage/dmdirc/commandparser/CommandManager.java

@@ -24,37 +24,60 @@ package uk.org.ownage.dmdirc.commandparser;
 
 import java.util.ArrayList;
 import java.util.Vector;
+
 import uk.org.ownage.dmdirc.Config;
-import uk.org.ownage.dmdirc.commandparser.commands.*;
-import uk.org.ownage.dmdirc.commandparser.commands.server.*;
-import uk.org.ownage.dmdirc.commandparser.commands.channel.*;
-import uk.org.ownage.dmdirc.commandparser.commands.query.*;
+import uk.org.ownage.dmdirc.commandparser.commands.Test;
+import uk.org.ownage.dmdirc.commandparser.commands.channel.ChannelSettings;
+import uk.org.ownage.dmdirc.commandparser.commands.channel.Cycle;
+import uk.org.ownage.dmdirc.commandparser.commands.channel.Me;
+import uk.org.ownage.dmdirc.commandparser.commands.channel.MeEmpty;
+import uk.org.ownage.dmdirc.commandparser.commands.channel.Part;
+import uk.org.ownage.dmdirc.commandparser.commands.channel.PartDefault;
+import uk.org.ownage.dmdirc.commandparser.commands.query.QueryMe;
+import uk.org.ownage.dmdirc.commandparser.commands.query.QueryMeEmpty;
+import uk.org.ownage.dmdirc.commandparser.commands.server.Help;
+import uk.org.ownage.dmdirc.commandparser.commands.server.Join;
+import uk.org.ownage.dmdirc.commandparser.commands.server.LoadFormatter;
+import uk.org.ownage.dmdirc.commandparser.commands.server.Nick;
+import uk.org.ownage.dmdirc.commandparser.commands.server.Quit;
+import uk.org.ownage.dmdirc.commandparser.commands.server.QuitDefault;
+import uk.org.ownage.dmdirc.commandparser.commands.server.Raw;
+import uk.org.ownage.dmdirc.commandparser.commands.server.ReloadFormatter;
+import uk.org.ownage.dmdirc.commandparser.commands.server.SaveFormatter;
+
 
 /**
  * The command manager creates and manages a single instance of all commands,
- * and provides methods to load each group of commands into a parser instance
+ * and provides methods to load each group of commands into a parser instance.
  * @author chris
  */
-public class CommandManager {
+public final class CommandManager {
     
     /**
-     * The server commands that have been instansiated
+     * The server commands that have been instansiated.
      */
     private static Vector<Command> serverCommands;
     /**
-     * The channel commands that have been instansiated
+     * The channel commands that have been instansiated.
      */
     private static Vector<Command> channelCommands;
     /**
-     * The query commands that have been instansiated
+     * The query commands that have been instansiated.
      */
     private static Vector<Command> queryCommands;
     
     /**
-     * Initialises the command manager's various command lists
+     * Prevents creation of a new command manager.
+     */
+    private CommandManager() {
+        //do nothing
+    }
+    
+    /**
+     * Initialises the command manager's various command lists.
      */
     private static void initLists() {
-        channelCommands = new Vector<Command>(0,1);
+        channelCommands = new Vector<Command>(0, 1);
         
         channelCommands.add(new Cycle());
         channelCommands.add(new Me());
@@ -63,7 +86,7 @@ public class CommandManager {
         channelCommands.add(new PartDefault());
         channelCommands.add(new ChannelSettings());
         
-        serverCommands = new Vector<Command>(0,1);
+        serverCommands = new Vector<Command>(0, 1);
         
         serverCommands.add(new Help());
         serverCommands.add(new Join());
@@ -76,17 +99,17 @@ public class CommandManager {
         serverCommands.add(new QuitDefault());
         serverCommands.add(new Raw());
         
-        queryCommands = new Vector<Command>(0,1);
+        queryCommands = new Vector<Command>(0, 1);
         
         queryCommands.add(new QueryMe());
         queryCommands.add(new QueryMeEmpty());
     }
     
     /**
-     * Loads all channel commands into the specified parser
+     * Loads all channel commands into the specified parser.
      * @param parser The parser to load commands into
      */
-    public static void loadChannelCommands(CommandParser parser) {
+    public static void loadChannelCommands(final CommandParser parser) {
         if (channelCommands == null) {
             CommandManager.initLists();
         }
@@ -97,10 +120,10 @@ public class CommandManager {
     }
     
     /**
-     * Loads all server commands into the specified parser
+     * Loads all server commands into the specified parser.
      * @param parser The parser to load commands into
      */
-    public static void loadServerCommands(CommandParser parser) {
+    public static void loadServerCommands(final CommandParser parser) {
         if (serverCommands == null) {
             CommandManager.initLists();
         }
@@ -111,10 +134,10 @@ public class CommandManager {
     }
     
     /**
-     * Loads all query commands into the specified parser
+     * Loads all query commands into the specified parser.
      * @param parser The parser to load commands into
      */
-    static void loadQueryCommands(QueryCommandParser parser) {
+    static void loadQueryCommands(final QueryCommandParser parser) {
         if (queryCommands == null)    {
             CommandManager.initLists();
         }
@@ -125,12 +148,12 @@ public class CommandManager {
     }
     
     /**
-     * Retrieves the server command identified by the specified signature
+     * Retrieves the server command identified by the specified signature.
      * @param signature The signature to look for
      * @return A server command with a matching signature, or null if none
      * were found.
      */
-    public static ServerCommand getServerCommad(String signature) {
+    public static ServerCommand getServerCommad(final String signature) {
         if (serverCommands == null) {
             CommandManager.initLists();
         }
@@ -145,12 +168,12 @@ public class CommandManager {
     }
     
     /**
-     * Retrieves the channel command identified by the specified signature
+     * Retrieves the channel command identified by the specified signature.
      * @param signature The signature to look for
      * @return A channel command with a matching signature, or null if none
      * were found.
      */
-    public static ChannelCommand getChannelCommand(String signature) {
+    public static ChannelCommand getChannelCommand(final String signature) {
         if (channelCommands == null) {
             CommandManager.initLists();
         }
@@ -166,7 +189,7 @@ public class CommandManager {
     
     /**
      * Returns a Vector containing the server commands that have been initialised
-     * by this command manager
+     * by this command manager.
      * @return A Vector of server commands, or null if none have been loaded
      */
     public static Vector<Command> getServerCommands() {
@@ -175,7 +198,7 @@ public class CommandManager {
     
     /**
      * Returns a Vector containing the channel commands that have been initialised
-     * by this command manager
+     * by this command manager.
      * @return A Vector of channel commands, or null if none have been loaded
      */
     public static Vector<Command> getChannelCommands() {
@@ -184,7 +207,7 @@ public class CommandManager {
     
     /**
      * Returns a Vector containing the query commands that have been initialised
-     * by this command manager
+     * by this command manager.
      * @return A Vector of query commands, or null if none have been loaded
      */
     public static Vector<Command> getQueryCommands() {
@@ -193,7 +216,7 @@ public class CommandManager {
     
     /**
      * Returns the names (including command char) of all registered server
-     * commands
+     * commands.
      * @return An ArrayList<String> containing all registered server command
      * names
      */
@@ -207,7 +230,7 @@ public class CommandManager {
     
     /**
      * Returns the names (including command char) of all registered channel
-     * commands
+     * commands.
      * @return An ArrayList<String> containing all registered server command
      * names
      */
@@ -221,7 +244,7 @@ public class CommandManager {
     
     /**
      * Returns the names (including command char) of all registered channel
-     * commands
+     * commands.
      * @return An ArrayList<String> containing all registered server command
      * names
      */
@@ -239,13 +262,13 @@ public class CommandManager {
      * @param source The source vector to iterate over
      * @return A list of all commands in the source
      */
-    private static ArrayList<String> getCommandNames(Vector<Command> source) {
+    private static ArrayList<String> getCommandNames(final Vector<Command> source) {
         if (source == null) {
             return null;
         }
         
-        ArrayList<String> res = new ArrayList<String>();
-        String commandChar = Config.getOption("general","commandchar");
+        final ArrayList<String> res = new ArrayList<String>();
+        final String commandChar = Config.getOption("general", "commandchar");
         
         for (Command command : source) {
             res.add(commandChar + command.getName());

src/uk/org/ownage/dmdirc/commandparser/CommandParser.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc.commandparser;
 
 import java.util.Hashtable;
+
 import uk.org.ownage.dmdirc.Config;
 
 /**
@@ -31,56 +32,56 @@ import uk.org.ownage.dmdirc.Config;
  * on the character at the start of the string), and handles it appropriately.
  * @author chris
  */
-abstract public class CommandParser {
+public abstract class CommandParser {
     
     /**
-     * Commands that are associated with this parser
+     * Commands that are associated with this parser.
      */
-    private Hashtable<String,Command> commands;
+    private Hashtable<String, Command> commands;
     
-    /** Creates a new instance of CommandParser */
+    /** Creates a new instance of CommandParser. */
     public CommandParser() {
-        commands = new Hashtable<String,Command>();
+        commands = new Hashtable<String, Command>();
         loadCommands();
     }
     
-    /** Loads the relevant commands into the parser */
+    /** Loads the relevant commands into the parser. */
     protected abstract void loadCommands();
     
     /**
-     * Registers the specified command with this parser
+     * Registers the specified command with this parser.
      * @param command Command to be registered
      */
-    public void registerCommand(Command command) {
+    public void registerCommand(final Command command) {
         commands.put(command.getSignature(), command);
     }
     
     /**
-     * Parses the specified string as a command
+     * Parses the specified string as a command.
      * @param origin The window in which the command was typed
      * @param line The line to be parsed
      */
-    public void parseCommand(CommandWindow origin, String line) {
+    public void parseCommand(final CommandWindow origin, final String line) {
         if (line.equals("")) {
             return;
         }
         
-        if (line.charAt(0) == Config.getOption("general","commandchar").charAt(0)) {
-            String[] args = line.split(" ");
+        if (line.charAt(0) == Config.getOption("general", "commandchar").charAt(0)) {
+            final String[] args = line.split(" ");
             String[] comargs;
             String command;
             
-            assert(args.length > 0);
+            assert args.length > 0;
             
             command = args[0].substring(1);
             
-            comargs = new String[args.length-1];
+            comargs = new String[args.length - 1];
             
             for (int i = 1; i < args.length; i++) {
-                comargs[i-1] = args[i];
+                comargs[i - 1] = args[i];
             }
             
-            String signature = command+"/"+(comargs.length);
+            final String signature = command + "/" + (comargs.length);
             
             // Check the specific signature first, so that polyadic commands can
             // have error handlers if there are too few arguments (e.g., msg/0 and
@@ -99,12 +100,13 @@ abstract public class CommandParser {
     
     /**
      * Parses the specified string as a command, taking the indicated status
-     * of the control key into account
+     * of the control key into account.
      * @param origin The window in which the command was typed
      * @param line The line to be parsed
      * @param usedCtrl Whether the user used the control key or not
      */
-    public void parseCommand(CommandWindow origin, String line, boolean usedCtrl) {
+    public void parseCommand(final CommandWindow origin, final String line, 
+            final boolean usedCtrl) {
         if (usedCtrl) {
             handleNonCommand(origin, line);
         } else {
@@ -118,7 +120,8 @@ abstract public class CommandParser {
      * @param command The command to be executed
      * @param args The arguments to the command
      */
-    abstract protected void executeCommand(CommandWindow origin, Command command, String... args);
+    protected abstract void executeCommand(final CommandWindow origin, 
+            final Command command, final String... args);
     
     /**
      * Called when the user attempted to issue a command (i.e., used the command
@@ -128,7 +131,8 @@ abstract public class CommandParser {
      * @param command The command the user tried to execute
      * @param args The arguments passed to the command
      */
-    abstract protected void handleInvalidCommand(CommandWindow origin, String command, String... args);
+    protected abstract void handleInvalidCommand(final CommandWindow origin, 
+            final String command, final String... args);
     
     /**
      * Called when the input was a line of text that was not a command. This normally
@@ -136,5 +140,6 @@ abstract public class CommandParser {
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
-    abstract protected void handleNonCommand(CommandWindow origin, String line);
+    protected abstract void handleNonCommand(final CommandWindow origin, 
+            final String line);
 }

src/uk/org/ownage/dmdirc/commandparser/CommandWindow.java

@@ -34,7 +34,7 @@ public interface CommandWindow {
      * Adds a line of text to the main text area of the window.
      * @param line The line to be added
      */
-    public void addLine(String line);
+    void addLine(String line);
     
     /**
      * Formats the arguments using the Formatter, then adds the result to the
@@ -42,11 +42,13 @@ public interface CommandWindow {
      * @param messageType The type of this message
      * @param args The arguments for the message
      */
-    public void addLine(String messageType, Object... args);
+    void addLine(String messageType, Object... args);
     
     /**
      * Determines if the current frame is visible.
+     *
+     * @return boolean visibility
      */
-    public boolean isVisible();
+    boolean isVisible();
     
 }

src/uk/org/ownage/dmdirc/commandparser/QueryCommand.java

@@ -26,22 +26,22 @@ import uk.org.ownage.dmdirc.Query;
 import uk.org.ownage.dmdirc.Server;
 
 /**
- * Represents a command which can be performed only in the context of a query
+ * Represents a command which can be performed only in the context of a query.
  * @author chris
  */
 public abstract class QueryCommand extends Command {
     
-    /** Creates a new instance of ChannelCommand */
+    /** Creates a new instance of ChannelCommand. */
     public QueryCommand() {
         super();
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The window in which the command was typed
      * @param server The server instance that this command is being executed on
      * @param query The query object that the commadparser is associated with
      * @param args Arguments passed to this command
      */
     public abstract void execute(CommandWindow origin, Server server, Query query, String... args);
-}
+}

src/uk/org/ownage/dmdirc/commandparser/QueryCommandParser.java

@@ -33,27 +33,27 @@ import uk.org.ownage.dmdirc.Server;
 public class QueryCommandParser extends CommandParser {
     
     /**
-     * The server instance that this parser is attached to
+     * The server instance that this parser is attached to.
      */
     private Server server;
     /**
-     * The query instance that this parser is attached to
+     * The query instance that this parser is attached to.
      */
     private Query query;
     
     /**
-     * Creates a new instance of QueryCommandParser
-     * @param server The server instance that this parser is attached to
-     * @param query The query instance that this parser is attached to
+     * Creates a new instance of QueryCommandParser.
+     * @param newServer The server instance that this parser is attached to
+     * @param newQuery The query instance that this parser is attached to
      */
-    public QueryCommandParser(Server server, Query query) {
+    public QueryCommandParser(final Server newServer, final Query newQuery) {
         super();
         
         this.server = server;
         this.query = query;
     }
     
-    /** Loads the relevant commands into the parser */
+    /** Loads the relevant commands into the parser. */
     protected void loadCommands() {
         CommandManager.loadQueryCommands(this);
         CommandManager.loadServerCommands(this);
@@ -65,7 +65,8 @@ public class QueryCommandParser extends CommandParser {
      * @param command The command to be executed
      * @param args The arguments to the command
      */
-    protected void executeCommand(CommandWindow origin, Command command, String... args) {
+    protected void executeCommand(final CommandWindow origin, 
+            final Command command, final String... args) {
         if (command instanceof QueryCommand) {
             ((QueryCommand) command).execute(origin, server, query, args);
         } else {
@@ -81,8 +82,9 @@ public class QueryCommandParser extends CommandParser {
      * @param command The command the user tried to execute
      * @param args The arguments passed to the command
      */
-    protected void handleInvalidCommand(CommandWindow origin, String command, String... args) {
-        origin.addLine("Unknown command: "+command+"/"+args.length);
+    protected void handleInvalidCommand(final CommandWindow origin, 
+            final String command, final String... args) {
+        origin.addLine("Unknown command: " + command + "/" + args.length);
     }
     
     /**
@@ -91,7 +93,7 @@ public class QueryCommandParser extends CommandParser {
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
-    protected void handleNonCommand(CommandWindow origin, String line) {
+    protected void handleNonCommand(final CommandWindow origin, final String line) {
         query.sendLine(line);
     }
     

src/uk/org/ownage/dmdirc/commandparser/ServerCommand.java

@@ -31,16 +31,16 @@ import uk.org.ownage.dmdirc.Server;
  */
 public abstract class ServerCommand extends Command {
     
-    /** Creates a new instance of ChannelCommand */
+    /** Creates a new instance of ChannelCommand. */
     public ServerCommand() {
         super();
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The window in which the command was typed
      * @param server The server instance that this command is being executed on
      * @param args Arguments passed to this command
      */
     public abstract void execute(CommandWindow origin, Server server, String... args);
-}
+}

src/uk/org/ownage/dmdirc/commandparser/ServerCommandParser.java

@@ -25,27 +25,27 @@ package uk.org.ownage.dmdirc.commandparser;
 import uk.org.ownage.dmdirc.Server;
 
 /**
- * A command parser used in the context of a server
+ * A command parser used in the context of a server.
  * @author chris
  */
 public class ServerCommandParser extends CommandParser {
     
     /**
-     * The server instance that this parser is attached to
+     * The server instance that this parser is attached to.
      */
     private Server server;
     
     /**
-     * Creates a new instance of ServerCommandParser
-     * @param server The server instance that this parser is attached to
+     * Creates a new instance of ServerCommandParser.
+     * @param newServer The server instance that this parser is attached to
      */
-    public ServerCommandParser(Server server) {
+    public ServerCommandParser(final Server newServer) {
         super();
         
-        this.server = server;
+        this.server = newServer;
     }
     
-    /** Loads the relevant commands into the parser */
+    /** Loads the relevant commands into the parser. */
     protected void loadCommands() {
         CommandManager.loadServerCommands(this);
     }
@@ -56,8 +56,9 @@ public class ServerCommandParser extends CommandParser {
      * @param command The command to be executed
      * @param args The arguments to the command
      */
-    protected void executeCommand(CommandWindow origin, Command command, String... args) {
-        ((ServerCommand)command).execute(origin, server, args);
+    protected void executeCommand(final CommandWindow origin, 
+            final Command command, final String... args) {
+        ((ServerCommand) command).execute(origin, server, args);
     }
     
     /**
@@ -68,8 +69,9 @@ public class ServerCommandParser extends CommandParser {
      * @param command The command the user tried to execute
      * @param args The arguments passed to the command
      */
-    protected void handleInvalidCommand(CommandWindow origin, String command, String... args) {
-        origin.addLine("Unknown command: "+command+"/"+args.length);
+    protected void handleInvalidCommand(final CommandWindow origin, 
+            final String command, final String... args) {
+        origin.addLine("Unknown command: " + command + "/" + args.length);
     }
     
     /**
@@ -78,7 +80,7 @@ public class ServerCommandParser extends CommandParser {
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
-    protected void handleNonCommand(CommandWindow origin, String line) {
+    protected void handleNonCommand(final CommandWindow origin, final String line) {
         server.getParser().sendLine(line);
     }
     

src/uk/org/ownage/dmdirc/commandparser/commands/Test.java

@@ -23,7 +23,6 @@
 package uk.org.ownage.dmdirc.commandparser.commands;
 
 import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.Command;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 
@@ -34,7 +33,7 @@ import uk.org.ownage.dmdirc.commandparser.ServerCommand;
  */
 public class Test extends ServerCommand {
     
-    /** Creates a new instance of Test */
+    /** Creates a new instance of Test. */
     public Test() {
         description = "a test command";
         arguments = "";
@@ -45,12 +44,13 @@ public class Test extends ServerCommand {
     }
 
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The window in which the command was typed
      * @param server The server instance that this command is being executed on
      * @param args Arguments passed to this command
      */
-    public void execute(CommandWindow origin, Server server, String... args) {
+    public void execute(final CommandWindow origin, final Server server, 
+            final String... args) {
         origin.addLine(server.getParser().getSvnInfo());
     }
     

src/uk/org/ownage/dmdirc/commandparser/commands/channel/ChannelSettings.java

@@ -29,12 +29,12 @@ import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.ui.ChannelSettingsDialog;
 
 /**
- * Opens the channel settings window for the channel
+ * Opens the channel settings window for the channel.
  * @author chris
  */
 public class ChannelSettings extends ChannelCommand {
     
-    /** Creates a new instance of ChannelSettings */
+    /** Creates a new instance of ChannelSettings. */
     public ChannelSettings() {
         description = "opens the channel settings window";
         arguments = "";
@@ -45,13 +45,14 @@ public class ChannelSettings extends ChannelCommand {
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(CommandWindow origin, Server server, Channel channel, String... args) {
+    public void execute(final CommandWindow origin, final Server server, 
+            final Channel channel, final String... args) {
         new ChannelSettingsDialog(channel).setVisible(true);
     }
     

src/uk/org/ownage/dmdirc/commandparser/commands/channel/Cycle.java

@@ -26,7 +26,6 @@ import uk.org.ownage.dmdirc.Channel;
 import uk.org.ownage.dmdirc.Config;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 
 /**
@@ -35,7 +34,7 @@ import uk.org.ownage.dmdirc.commandparser.CommandWindow;
  */
 public class Cycle extends ChannelCommand {
     
-    /** Creates a new instance of Cycle */
+    /** Creates a new instance of Cycle. */
     public Cycle() {
         description = "parts and rejoins the current channel";
         arguments = "";
@@ -46,15 +45,16 @@ public class Cycle extends ChannelCommand {
     }
 
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(CommandWindow origin, Server server, Channel channel, String... args) {
-        channel.part(Config.getOption("general","cyclemessage"));
+    public void execute(final CommandWindow origin, final Server server, 
+            final Channel channel, final String... args) {
+        channel.part(Config.getOption("general", "cyclemessage"));
         channel.join();
     }
     
-}
+}

src/uk/org/ownage/dmdirc/commandparser/commands/channel/Me.java

@@ -28,12 +28,12 @@ import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 
 /**
- * The me command sends a CTCP action to the current channel
+ * The me command sends a CTCP action to the current channel.
  * @author chris
  */
 public class Me extends ChannelCommand {
     
-    /** Creates a new instance of Me */
+    /** Creates a new instance of Me. */
     public Me() {
         description = "sends an action to the current channel";
         arguments = "<action>";
@@ -44,13 +44,14 @@ public class Me extends ChannelCommand {
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(CommandWindow origin, Server server, Channel channel, String... args) {
+    public void execute(final CommandWindow origin, final Server server, 
+            final Channel channel, final String... args) {
         channel.sendAction(implodeArgs(args));
     }
     

src/uk/org/ownage/dmdirc/commandparser/commands/channel/MeEmpty.java

@@ -35,7 +35,7 @@ import uk.org.ownage.dmdirc.commandparser.CommandWindow;
  */
 public class MeEmpty extends ChannelCommand {
     
-    /** Creates a new instance of MeEmpty */
+    /** Creates a new instance of MeEmpty. */
     public MeEmpty() {
         description = "informs the user of the correct usage of the me command";
         arguments = "";
@@ -46,14 +46,15 @@ public class MeEmpty extends ChannelCommand {
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(CommandWindow origin, Server server, Channel channel, String... args) {
-        origin.addLine("Usage: "+Config.getOption("general","commandchar")+"me <action>");
+    public void execute(final CommandWindow origin, final Server server, 
+            final Channel channel, final String... args) {
+        origin.addLine("Usage: " + Config.getOption("general", "commandchar") + "me <action>");
     }
     
 }

src/uk/org/ownage/dmdirc/commandparser/commands/channel/Part.java

@@ -23,10 +23,8 @@
 package uk.org.ownage.dmdirc.commandparser.commands.channel;
 
 import uk.org.ownage.dmdirc.Channel;
-import uk.org.ownage.dmdirc.Config;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.ChannelCommand;
-import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 
 /**
@@ -35,7 +33,7 @@ import uk.org.ownage.dmdirc.commandparser.CommandWindow;
  */
 public class Part extends ChannelCommand {
     
-    /** Creates a new instance of Part */
+    /** Creates a new instance of Part. */
     public Part() {
         description = "parts the channel with the specified reason";
         arguments = "<reason>";
@@ -46,15 +44,15 @@ public class Part extends ChannelCommand {
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(CommandWindow origin, Server server, Channel channel, String... args) {
+    public void execute(final CommandWindow origin, final Server server, 
+            final Channel channel, final String... args) {
         channel.part(implodeArgs(args));
         channel.close();
     }
-    
-}
+}

src/uk/org/ownage/dmdirc/commandparser/commands/channel/PartDefault.java

@@ -37,7 +37,7 @@ import uk.org.ownage.dmdirc.commandparser.CommandWindow;
  */
 public class PartDefault extends ChannelCommand {
     
-    /** Creates a new instance of PartDefault */
+    /** Creates a new instance of PartDefault. */
     public PartDefault() {
         description = "parts the channel with the default reason";
         arguments = "";
@@ -48,15 +48,16 @@ public class PartDefault extends ChannelCommand {
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param channel The channel object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(CommandWindow origin, Server server, Channel channel, String... args) {
-        ChannelCommand com = CommandManager.getChannelCommand("part");
-        com.execute(origin, server, channel, Config.getOption("general","partmessage"));
+    public void execute(final CommandWindow origin, final Server server, 
+            final Channel channel, final String... args) {
+        final ChannelCommand com = CommandManager.getChannelCommand("part");
+        com.execute(origin, server, channel, Config.getOption("general", "partmessage"));
     }
     
 }

src/uk/org/ownage/dmdirc/commandparser/commands/query/QueryMe.java

@@ -24,8 +24,8 @@ package uk.org.ownage.dmdirc.commandparser.commands.query;
 
 import uk.org.ownage.dmdirc.Query;
 import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.QueryCommand;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+import uk.org.ownage.dmdirc.commandparser.QueryCommand;
 
 /**
  * Represents the /me command used in a query window.
@@ -33,7 +33,7 @@ import uk.org.ownage.dmdirc.commandparser.CommandWindow;
  */
 public class QueryMe extends QueryCommand {
     
-    /** Creates a new instance of QueryMe */
+    /** Creates a new instance of QueryMe. */
     public QueryMe() {
         description = "sends an action to the query receipient";
         arguments = "<action>";
@@ -44,13 +44,14 @@ public class QueryMe extends QueryCommand {
     }
 
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param query The query object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(CommandWindow origin, Server server, Query query, String... args) {
+    public void execute(final CommandWindow origin, final Server server, 
+            final Query query, final String... args) {
         query.sendAction(implodeArgs(args));
     }
     

src/uk/org/ownage/dmdirc/commandparser/commands/query/QueryMeEmpty.java

@@ -22,11 +22,11 @@
 
 package uk.org.ownage.dmdirc.commandparser.commands.query;
 
-import uk.org.ownage.dmdirc.Query;
 import uk.org.ownage.dmdirc.Config;
+import uk.org.ownage.dmdirc.Query;
 import uk.org.ownage.dmdirc.Server;
-import uk.org.ownage.dmdirc.commandparser.QueryCommand;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
+import uk.org.ownage.dmdirc.commandparser.QueryCommand;
 
 /**
  * Represents the /me command used in a query window, with no parameters.
@@ -35,7 +35,7 @@ import uk.org.ownage.dmdirc.commandparser.CommandWindow;
  */
 public class QueryMeEmpty extends QueryCommand {
     
-    /** Creates a new instance of QueryMeEmpty */
+    /** Creates a new instance of QueryMeEmpty. */
     public QueryMeEmpty() {
         description = "informs the user of the correct usage of the me command";
         arguments = "";
@@ -46,14 +46,15 @@ public class QueryMeEmpty extends QueryCommand {
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param query The query object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(CommandWindow origin, Server server, Query query, String... args) {
-        origin.addLine("Usage: "+Config.getOption("general","commandchar")+"me <action>");
+    public void execute(final CommandWindow origin, final Server server, 
+            final Query query, final String... args) {
+        origin.addLine("Usage: " + Config.getOption("general", "commandchar") + "me <action>");
     }
     
 }

src/uk/org/ownage/dmdirc/commandparser/commands/server/Help.java

@@ -22,7 +22,6 @@
 
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Config;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.Command;
 import uk.org.ownage.dmdirc.commandparser.CommandManager;
@@ -40,7 +39,7 @@ import uk.org.ownage.dmdirc.ui.QueryFrame;
 public class Help extends ServerCommand {
     
     /**
-     * Creates a new instance of Help
+     * Creates a new instance of Help.
      */
     public Help() {
         description = "Displays usage information for all implemented commands";
@@ -52,12 +51,13 @@ public class Help extends ServerCommand {
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */    
-    public void execute(CommandWindow origin, Server server, String... args) {
+    public void execute(final CommandWindow origin, final Server server, 
+            final String... args) {
         origin.addLine("-- Server commands ----------------------------------");
         for (Command com : CommandManager.getServerCommands()) {
             if (com.showInHelp()) {
@@ -83,4 +83,4 @@ public class Help extends ServerCommand {
         origin.addLine("-----------------------------------------------------");
     }
     
-}
+}

src/uk/org/ownage/dmdirc/commandparser/commands/server/Join.java

@@ -22,7 +22,6 @@
 
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Config;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
@@ -35,9 +34,9 @@ import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 public class Join extends ServerCommand {
     
     /**
-     * Creates a new instance of Join
+     * Creates a new instance of Join.
      */
-    public Join () {
+    public Join() {
         description = "Joins the specified channel. Multiple channels may be seperated by commas.";
         arguments = "<channel(s)>";
         polyadic = false;
@@ -47,13 +46,14 @@ public class Join extends ServerCommand {
     }
 
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */    
-    public void execute(CommandWindow origin, Server server, String... args) {
+    public void execute(final CommandWindow origin, final Server server, 
+            final String... args) {
         server.getParser().joinChannel(args[0]);
     }
     
-}
+}

src/uk/org/ownage/dmdirc/commandparser/commands/server/LoadFormatter.java

@@ -22,20 +22,19 @@
 
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Config;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 import uk.org.ownage.dmdirc.ui.messages.Formatter;
 
 /**
- * Allows the user to load a message formatter from a file
+ * Allows the user to load a message formatter from a file.
  * @author chris
  */
 public class LoadFormatter extends ServerCommand {
     
     /**
-     * Creates a new instance of LoadFormatter
+     * Creates a new instance of LoadFormatter.
      */
     public LoadFormatter() {
         description = "Loads a message formatter from a file";
@@ -47,12 +46,13 @@ public class LoadFormatter extends ServerCommand {
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(CommandWindow origin, Server server, String... args) {
+    public void execute(final CommandWindow origin, final Server server, 
+            final String... args) {
         if (Formatter.loadFile(args[0])) {
             origin.addLine("Formatter loaded.");
         } else {
@@ -60,4 +60,4 @@ public class LoadFormatter extends ServerCommand {
         }
     }
     
-}
+}

src/uk/org/ownage/dmdirc/commandparser/commands/server/Nick.java

@@ -22,21 +22,20 @@
 
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Config;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 
 /**
- * Allows the user to change nickname
+ * Allows the user to change nickname.
  * @author chris
  */
 public class Nick extends ServerCommand {
     
     /**
-     * Creates a new instance of Join
+     * Creates a new instance of Join.
      */
-    public Nick () {
+    public Nick() {
         description = "Changes your nickname";
         arguments = "<new nickname>";
         polyadic = false;
@@ -46,13 +45,14 @@ public class Nick extends ServerCommand {
     }
 
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */    
-    public void execute(CommandWindow origin, Server server, String... args) {
+    public void execute(final CommandWindow origin, final Server server, 
+            final String... args) {
         server.getParser().setNickname(args[0]);
     }
     
-}
+}

src/uk/org/ownage/dmdirc/commandparser/commands/server/Quit.java

@@ -37,7 +37,7 @@ import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 public class Quit extends ServerCommand {
     
     /**
-     * Creates a new instance of Quit
+     * Creates a new instance of Quit.
      */
     public Quit() {
         description = "Quits DMDirc, sending the specified quit message to all servers";
@@ -49,12 +49,13 @@ public class Quit extends ServerCommand {
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */    
-    public void execute(CommandWindow origin, Server server, String... args) {
+    public void execute(final CommandWindow origin, final Server server, 
+            final String... args) {
         ServerManager.getServerManager().disconnectAll(implodeArgs(args));
         Config.save();
         System.exit(0);

src/uk/org/ownage/dmdirc/commandparser/commands/server/QuitDefault.java

@@ -37,7 +37,7 @@ import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 public class QuitDefault extends ServerCommand {
     
     /**
-     * Creates a new instance of QuitDefault
+     * Creates a new instance of QuitDefault.
      */
     public QuitDefault() {
         description = "Quits DMDirc, sending a default quit message to all servers";
@@ -49,13 +49,14 @@ public class QuitDefault extends ServerCommand {
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(CommandWindow origin, Server server, String... args) {
-        String def = Config.getOption("general","quitmessage");
+    public void execute(final CommandWindow origin, final Server server, 
+            final String... args) {
+        final String def = Config.getOption("general", "quitmessage");
         CommandManager.getServerCommad("quit").execute(origin, server, def);
     }
     

src/uk/org/ownage/dmdirc/commandparser/commands/server/Raw.java

@@ -35,7 +35,7 @@ import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 public class Raw extends ServerCommand {
     
     /**
-     * Creates a new instance of Quit
+     * Creates a new instance of Quit.
      */
     public Raw() {
         description = "Sends a line of text directly to the IRC sServer";
@@ -47,12 +47,13 @@ public class Raw extends ServerCommand {
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */    
-    public void execute(CommandWindow origin, Server server, String... args) {
+    public void execute(final CommandWindow origin, final Server server, 
+            final String... args) {
         final String line = implodeArgs(args);
         
         server.getParser().sendLine(line);

src/uk/org/ownage/dmdirc/commandparser/commands/server/ReloadFormatter.java

@@ -22,22 +22,21 @@
 
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Config;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 import uk.org.ownage.dmdirc.ui.messages.Formatter;
 
 /**
- * Allows the user to reload the message formatter
+ * Allows the user to reload the message formatter.
  * @author chris
  */
 public class ReloadFormatter extends ServerCommand {
     
     /**
-     * Creates a new instance of ReloadFormatter
+     * Creates a new instance of ReloadFormatter.
      */
-    public ReloadFormatter () {
+    public ReloadFormatter() {
         description = "Reloads the message formatter";
         arguments = "";
         polyadic = false;
@@ -47,14 +46,15 @@ public class ReloadFormatter extends ServerCommand {
     }
 
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */    
-    public void execute(CommandWindow origin, Server server, String... args) {
+    public void execute(final CommandWindow origin, final Server server, 
+            final String... args) {
         Formatter.reload();
         origin.addLine("Formatter reloaded.");
     }
     
-}
+}

src/uk/org/ownage/dmdirc/commandparser/commands/server/SaveFormatter.java

@@ -22,20 +22,19 @@
 
 package uk.org.ownage.dmdirc.commandparser.commands.server;
 
-import uk.org.ownage.dmdirc.Config;
 import uk.org.ownage.dmdirc.Server;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.commandparser.ServerCommand;
 import uk.org.ownage.dmdirc.ui.messages.Formatter;
 
 /**
- * Allows the user to save the message formatter to a file
+ * Allows the user to save the message formatter to a file.
  * @author chris
  */
 public class SaveFormatter extends ServerCommand {
     
     /**
-     * Creates a new instance of SaveFormatter
+     * Creates a new instance of SaveFormatter.
      */
     public SaveFormatter() {
         description = "Saves the message formatter to a file";
@@ -47,12 +46,13 @@ public class SaveFormatter extends ServerCommand {
     }
     
     /**
-     * Executes this command
+     * Executes this command.
      * @param origin The frame in which this command was issued
      * @param server The server object that this command is associated with
      * @param args The user supplied arguments
      */
-    public void execute(CommandWindow origin, Server server, String... args) {
+    public void execute(final CommandWindow origin, final Server server, 
+            final String... args) {
         if (Formatter.saveAs(args[0])) {
             origin.addLine("Formatter saved.");
         } else {
@@ -60,4 +60,4 @@ public class SaveFormatter extends ServerCommand {
         }
     }
     
-}
+}

src/uk/org/ownage/dmdirc/logger/LogLevel.java

@@ -29,6 +29,6 @@ public enum LogLevel {
     /**
      * log levels recognised by the logger.
      */
-    CORE, COMMAND, PARSER,PLUGIN, UI,
+    CORE, COMMAND, PARSER, PLUGIN, UI,
 }