Style fixes

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

src/com/dmdirc/CertificateManager.java

@@ -103,7 +103,7 @@ public class CertificateManager implements X509TrustManager {
 
     /** Used to synchronise the manager with the certificate dialog. */
     private final Semaphore actionSem = new Semaphore(0);
-    
+
     /** The action to perform. */
     private CertificateAction action;
 
@@ -288,7 +288,7 @@ public class CertificateManager implements X509TrustManager {
 
         for (X509Certificate cert : chain) {
             TrustResult trustResult = isTrusted(cert);
-            
+
             if (checkDate) {
                 // Check that the certificate is in-date
                 try {
@@ -323,7 +323,7 @@ public class CertificateManager implements X509TrustManager {
             } catch (InterruptedException ie) {
               throw new CertificateException("Thread aborted, ");
             }
-            
+
             switch (action) {
                 case DISCONNECT:
                     throw new CertificateException("Not trusted");
@@ -348,7 +348,7 @@ public class CertificateManager implements X509TrustManager {
      */
     public void setAction(final CertificateAction action) {
         this.action = action;
-        
+
         actionSem.release();
     }
 

src/com/dmdirc/ChannelClientProperty.java

@@ -31,13 +31,13 @@ public enum ChannelClientProperty {
 
     /** Nicklist client foreground colour. */
     NICKLIST_FOREGROUND,
-    
+
     /** Nicklist client background colour. */
     NICKLIST_BACKGROUND,
-    
+
     /** Textpane client foreground colour. */
     TEXT_FOREGROUND,
-    
+
     /** Textpane client background colour. */
     TEXT_BACKGROUND;
 

src/com/dmdirc/EventHandler.java

@@ -31,18 +31,18 @@ import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
 
 /**
  * Abstracts some behaviour used by Event Handlers.
- * 
+ *
  * @author chris
  */
 public abstract class EventHandler implements CallbackInterface {
-    
+
     /**
      * Registers all callbacks that this event handler implements with the
      * owner's parser.
      */
     public void registerCallbacks() {
         final CallbackManager<?> cbm = getServer().getParser().getCallbackManager();
-        
+
         try {
             for (Class<?> iface : this.getClass().getInterfaces()) {
                 if (CallbackInterface.class.isAssignableFrom(iface)) {
@@ -54,7 +54,7 @@ public abstract class EventHandler implements CallbackInterface {
                     exception);
         }
     }
-    
+
     /**
      * Unregisters all callbacks that have been registered by this event handler.
      */
@@ -63,10 +63,10 @@ public abstract class EventHandler implements CallbackInterface {
             getServer().getParser().getCallbackManager().delAllCallback(this);
         }
     }
-    
+
     /**
      * Adds a callback to this event handler.
-     * 
+     *
      * @param <T> The type of callback to be added
      * @param cbm The callback manager to use
      * @param type The type of the callback to be added
@@ -74,7 +74,7 @@ public abstract class EventHandler implements CallbackInterface {
      */
     protected abstract <T extends CallbackInterface> void addCallback(
             final CallbackManager<?> cbm, final Class<T> type) throws CallbackNotFoundException;
-    
+
     /**
      * Retrieves the server belonging to this EventHandler's owner.
      *
@@ -82,12 +82,12 @@ public abstract class EventHandler implements CallbackInterface {
      * @return This EventHandler's expected server
      */
     protected abstract Server getServer();
-    
+
     /**
      * Checks that the specified parser is the same as the one the server is
      * currently claiming to be using. If it isn't, we raise an exception to
      * prevent further (erroneous) processing.
-     * 
+     *
      * @param parser The parser to check
      */
     protected void checkParser(final Parser parser) {
@@ -97,6 +97,6 @@ public abstract class EventHandler implements CallbackInterface {
                     + getServer().getStatus().getParserID(parser)
                     + ").\n\n " + getServer().getStatus().getTransitionHistory());
         }
-    }    
+    }
 
 }

src/com/dmdirc/GlobalWindow.java

@@ -108,7 +108,7 @@ public class GlobalWindow extends WritableFrameContainer<InputWindow> {
     public TabCompleter getTabCompleter() {
         return tabCompleter;
     }
-    
+
     /**
      * Initialises the global window if it's enabled in the config.
      */

src/com/dmdirc/Main.java

@@ -88,10 +88,10 @@ public class Main {
             Logger.appError(ErrorLevel.FATAL, "Exception while initialising", ex);
         }
     }
-    
+
     /**
      * Initialises the client.
-     * 
+     *
      * @param args The command line arguments
      */
     private static void init(final String[] args) {
@@ -116,7 +116,7 @@ public class Main {
 
         final PluginManager pm = PluginManager.getPluginManager();
         checkBundledPlugins(pm, IdentityManager.getGlobalConfig());
-        
+
         ThemeManager.loadThemes();
 
         clp.applySettings();
@@ -168,7 +168,7 @@ public class Main {
                 ServerManager.getServerManager().disconnectAll("Unexpected shutdown");
                 IdentityManager.save();
             }
-        }, "Shutdown thread"));        
+        }, "Shutdown thread"));
     }
 
     /**
@@ -323,7 +323,7 @@ public class Main {
         // Can't find any
         throw new IllegalStateException("No UIs could be loaded");
     }
-    
+
     /**
      * Executes the first run or migration wizards as required.
      */
@@ -348,15 +348,15 @@ public class Main {
     public static void quit() {
         quit(0);
     }
-    
+
     /**
      * Quits the client nicely, with the default closing message.
-     * 
-     * @param exitCode This is the exit code that will be returned to the 
+     *
+     * @param exitCode This is the exit code that will be returned to the
      *                  operating system when the client exits
      */
     public static void quit(final int exitCode) {
-        quit(IdentityManager.getGlobalConfig().getOption("general", 
+        quit(IdentityManager.getGlobalConfig().getOption("general",
                 "closemessage"), exitCode);
     }
 
@@ -368,12 +368,12 @@ public class Main {
     public static void quit(final String reason) {
         quit(reason, 0);
     }
-    
+
     /**
      * Quits the client nicely.
      *
      * @param reason The quit reason to send
-     * @param exitCode This is the exit code that will be returned to the 
+     * @param exitCode This is the exit code that will be returned to the
      *                  operating system when the client exits
      */
     public static void quit(final String reason, final int exitCode) {
@@ -440,9 +440,9 @@ public class Main {
             final File testFile = new File(configdir);
             if (!testFile.exists()) {
                 final String configHome = System.getenv("XDG_CONFIG_HOME");
-                configdir = (configHome == null || configHome.isEmpty()) ?
-                    System.getProperty("user.home") + fs + ".config" + fs :
-                    configHome;
+                configdir = (configHome == null || configHome.isEmpty())
+                        ? System.getProperty("user.home") + fs + ".config" + fs
+                        : configHome;
                 configdir += fs + "DMDirc" + fs;
             }
         }

src/com/dmdirc/Server.java

@@ -307,7 +307,7 @@ public class Server extends WritableFrameContainer<ServerWindow> implements Conf
 
             updateAwayState(null);
             removeInvites();
-            
+
             try {
                 parserThread = new Thread(parser, "Parser thread");
                 parserThread.start();
@@ -1223,8 +1223,8 @@ public class Server extends WritableFrameContainer<ServerWindow> implements Conf
      */
     public void sendCTCPReply(final String source, final String type, final String args) {
         if (type.equalsIgnoreCase("VERSION")) {
-            parser.sendCTCPReply(source, "VERSION", "DMDirc " +
-                    getConfigManager().getOption("version", "version")
+            parser.sendCTCPReply(source, "VERSION", "DMDirc "
+                    + getConfigManager().getOption("version", "version")
                     + " - http://www.dmdirc.com/");
         } else if (type.equalsIgnoreCase("PING")) {
             parser.sendCTCPReply(source, "PING", args);

src/com/dmdirc/WritableFrameContainer.java

@@ -45,10 +45,10 @@ import java.util.List;
  * @author chris
  */
 public abstract class WritableFrameContainer<T extends InputWindow> extends FrameContainer<T> {
-    
+
     /** The name of the server notification target. */
     protected static final String NOTIFICATION_SERVER = "server".intern();
-    
+
     /** The name of the channel notification target. */
     protected static final String NOTIFICATION_CHANNEL = "channel".intern();
 
@@ -57,7 +57,7 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
 
     /**
      * Creates a new WritableFrameContainer.
-     * 
+     *
      * @param icon The icon to use for this container
      * @param name The name of this container
      * @param title The title of this container
@@ -74,7 +74,7 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
         this.commandParser = parser;
         parser.setOwner(this);
     }
-    
+
     /**
      * Sends a line of text to this container's source.
      *
@@ -84,7 +84,7 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
 
     /**
      * Retrieves the command parser to be used for this container.
-     * 
+     *
      * @return This container's command parser
      */
     public CommandParser getCommandParser() {
@@ -97,7 +97,7 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
      * @return This container's tab completer
      */
     public abstract TabCompleter getTabCompleter();
-    
+
     /**
      * Returns the maximum length that a line passed to sendLine() should be,
      * in order to prevent it being truncated or causing protocol violations.
@@ -140,7 +140,7 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
 
         return result;
     }
-    
+
     /**
      * Returns the number of lines that the specified string would be sent as.
      *
@@ -150,7 +150,7 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
     public final int getNumLines(final String line) {
         final String[] splitLines = line.split("(\n|\r\n|\r)", Integer.MAX_VALUE);
         int lines = 0;
-        
+
         for (String splitLine : splitLines) {
             if (getMaxLineLength() <= 0) {
                 lines++;
@@ -159,7 +159,7 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
                         / (double) getMaxLineLength());
             }
         }
-        
+
         return lines;
     }
 
@@ -175,7 +175,7 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
             final ActionType actionType, final Object... args) {
         return doNotification(new Date(), messageType, actionType, args);
     }
-    
+
     /**
      * Processes and displays a notification.
      *
@@ -200,7 +200,7 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
                 messageArgs.add(arg);
             }
         }
-        
+
         modifyNotificationArgs(actionArgs, messageArgs);
 
         final boolean res = ActionManager.processEvent(actionType, buffer, actionArgs.toArray());
@@ -208,11 +208,11 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
         handleNotification(date, buffer.toString(), messageArgs.toArray());
 
         return res;
-    } 
-    
+    }
+
     /**
      * Allows subclasses to modify the lists of arguments for notifications.
-     * 
+     *
      * @param actionArgs The list of arguments to be passed to the actions system
      * @param messageArgs The list of arguments to be passed to the formatter
      */
@@ -220,10 +220,10 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
             final List<Object> messageArgs) {
         // Do nothing
     }
-    
+
     /**
      * Allows subclasses to process specific types of notification arguments.
-     * 
+     *
      * @param arg The argument to be processed
      * @param args The list of arguments that any data should be appended to
      * @return True if the arg has been processed, false otherwise
@@ -243,7 +243,7 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
     public void handleNotification(final String messageType, final Object... args) {
         handleNotification(new Date(), messageType, args);
     }
-    
+
     /**
      * Handles general server notifications (i.e., ones not tied to a
      * specific window). The user can select where the notifications should
@@ -258,10 +258,10 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
                 messageType) ? getConfigManager().getOption("notifications", messageType)
                 : "self", args);
     }
-    
+
     /**
      * Despatches a notification of the specified type to the specified target.
-     * 
+     *
      * @param date The date/time at which the event occured
      * @param messageType The type of the message that is being sent
      * @param messageTarget The target of the message
@@ -269,10 +269,10 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
      */
     protected void despatchNotification(final Date date, final String messageType,
             final String messageTarget, final Object... args) {
-        
+
         String target = messageTarget;
         String format = messageType;
-        
+
         if (target.startsWith("format:")) {
             format = target.substring(7);
             format = format.substring(0, format.indexOf(':'));
@@ -284,12 +284,12 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
                     ? getConfigManager().getOption("notifications", target.substring(6))
                     : "self";
         }
-        
+
         if (target.startsWith("fork:")) {
             for (String newtarget : target.substring(5).split("\\|")) {
                 despatchNotification(date, format, newtarget, args);
             }
-            
+
             return;
         }
 
@@ -324,7 +324,7 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
             long besttime = 0;
 
             final List<FrameContainer<?>> containers = new ArrayList<FrameContainer<?>>();
-            
+
             containers.add(getServer());
             containers.addAll(getServer().getChildren());
 
@@ -390,6 +390,6 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
             Logger.userError(ErrorLevel.MEDIUM,
                     "Invalid notification target for type " + messageType + ": " + target);
         }
-    }          
-    
+    }
+
 }

src/com/dmdirc/actions/Action.java

@@ -144,11 +144,11 @@ public class Action extends ActionModel implements ConfigChangeListener {
         location = dir + name.replaceAll("[^A-Za-z0-9\\-_]", "_");
 
         new File(dir).mkdirs();
-        
+
         ActionManager.processEvent(CoreActionType.ACTION_CREATED, null, this);
 
         save();
-        
+
         ActionManager.registerAction(this);
     }
 
@@ -178,8 +178,8 @@ public class Action extends ActionModel implements ConfigChangeListener {
         }
 
         if (config.isFlatDomain(DOMAIN_FORMAT)) {
-            newFormat = config.getFlatDomain(DOMAIN_FORMAT).size() == 0 ? "" :
-                config.getFlatDomain(DOMAIN_FORMAT).get(0);
+            newFormat = config.getFlatDomain(DOMAIN_FORMAT).size() == 0 ? ""
+                    : config.getFlatDomain(DOMAIN_FORMAT).get(0);
         }
 
         for (int cond = 0; config.isKeyDomain("condition " + cond); cond++) {
@@ -237,11 +237,11 @@ public class Action extends ActionModel implements ConfigChangeListener {
             if (data.containsKey("author")) {
                 myGroup.setAuthor(data.get("author"));
             }
-            
+
             if (data.containsKey("version")) {
                 myGroup.setVersion(new Version(data.get("version")));
             }
-            
+
             if (data.containsKey("component")) {
                 try {
                     myGroup.setComponent(Integer.parseInt(data.get("component")));
@@ -254,7 +254,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
         for (int i = 0; config.isKeyDomain("setting " + i); i++) {
             final ActionGroup myGroup = ActionManager.getGroup(group);
             final Map<String, String> data = config.getKeyDomain("setting " + i);
-            
+
             if (data.containsKey("type") && data.containsKey("setting")
                     && data.containsKey("title") && data.containsKey("default")
                     && data.containsKey("tooltip")) {
@@ -268,7 +268,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
 
     /**
      * Loads a list of triggers with the specified names.
-     * 
+     *
      * @param newTriggers A list of trigger names
      * @return True if all triggers are valid and compatible, false otherwise.
      */
@@ -297,7 +297,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
         if (!isModified()) {
             return;
         }
-        
+
         final ConfigFile newConfig = new ConfigFile(location);
 
         final List<String> triggerNames = new ArrayList<String>();
@@ -346,13 +346,13 @@ public class Action extends ActionModel implements ConfigChangeListener {
             final Map<String, String> data = new HashMap<String, String>();
 
             data.put("argument", String.valueOf(condition.getArg()));
-            
+
             if (condition.getArg() == -1) {
                 data.put("starget", condition.getStarget());
             } else {
                 data.put("component", condition.getComponent().toString());
             }
-            
+
             data.put("comparison", condition.getComparison().toString());
             data.put("target", condition.getTarget());
 
@@ -384,7 +384,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
 
     /**
      * Reads a condition from the specified configuration section.
-     * 
+     *
      * @param data The relevant section of the action configuration
      * @return True if the condition is valid, false otherwise
      */
@@ -413,7 +413,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
 
         if (arg == -1) {
             starget = data.get("starget");
-            
+
             if (starget == null) {
                 error("No starget specified");
                 return false;
@@ -422,7 +422,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
             component = readComponent(data, arg);
             if (component == null) {
                 return false;
-            }            
+            }
         }
 
         // ------ Read the comparison
@@ -433,7 +433,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
             return false;
         }
 
-        if ((arg != -1 && !comparison.appliesTo().equals(component.getType())) 
+        if ((arg != -1 && !comparison.appliesTo().equals(component.getType()))
             || (arg == -1 && !comparison.appliesTo().equals(String.class))) {
             error("Comparison cannot be applied to specified component: " + data.get("comparison"));
             return false;
@@ -453,13 +453,13 @@ public class Action extends ActionModel implements ConfigChangeListener {
         } else {
             conditions.add(new ActionCondition(arg, component, comparison, target));
         }
-        
+
         return true;
     }
 
     /**
      * Reads a component from the specified data section for the specified argument.
-     * 
+     *
      * @param data The relevant section of the action configuration
      * @param arg The argument number that the component should apply to
      * @return The corresponding ActionComponent, or null if the specified
@@ -509,7 +509,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
     public void setName(final String newName) {
         super.setName(newName);
 
-        new File(location).delete();        
+        new File(location).delete();
         location = ActionManager.getDirectory() + group + File.separator + newName;
 
         save();
@@ -525,7 +525,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
         final String dir = ActionManager.getDirectory() + group + File.separator;
         location = dir + name;
 
-        new File(dir).mkdirs();        
+        new File(dir).mkdirs();
 
         save();
     }

src/com/dmdirc/actions/ActionComponentChain.java

@@ -36,12 +36,12 @@ import java.util.List;
  * @author chris
  */
 public class ActionComponentChain implements ActionComponent {
-    
+
     /**
      * A list of components in this chain.
      */
     private final List<ActionComponent> components = new ArrayList<ActionComponent>();
-    
+
     /**
      * Creates a new component chain from the specified text representation.
      * Chains are separated with full stops (.).
@@ -51,10 +51,10 @@ public class ActionComponentChain implements ActionComponent {
      */
     public ActionComponentChain(final Class<?> source, final String chain) {
         Class<?> current = source;
-        
+
         for (String componentName : chain.split("\\.")) {
             final ActionComponent component = ActionManager.getActionComponent(componentName);
-            
+
             if (component == null) {
                 throw new IllegalArgumentException("Component " + componentName
                         + " not found");
@@ -66,72 +66,72 @@ public class ActionComponentChain implements ActionComponent {
                         + " cannot be applied to " + current.getName());
             }
         }
-        
+
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public Object get(final Object argument) {
         Object res = argument;
-        
+
         for (ActionComponent component : components) {
             if (res == null) {
                 return null;
             }
-            
+
             res = component.get(res);
         }
-        
+
         return res;
     }
-    
+
     /** {@inheritDoc} */
     @Precondition("This component chain has one or more components")
     @Override
     public Class<?> appliesTo() {
         Logger.assertTrue(!components.isEmpty());
-        
+
         return components.get(0).appliesTo();
     }
-    
+
     /** {@inheritDoc} */
     @Precondition("This component chain has one or more components")
     @Override
     public Class<?> getType() {
         Logger.assertTrue(!components.isEmpty());
-        
+
         return components.get(components.size() - 1).getType();
     }
-    
+
     /** {@inheritDoc} */
     @Precondition("This component chain has one or more components")
     @Override
     public String getName() {
         Logger.assertTrue(!components.isEmpty());
-        
+
         final StringBuilder name = new StringBuilder();
-        
+
         for (ActionComponent component : components) {
             name.append("'s ");
             name.append(component.getName());
         }
-        
+
         return name.substring(3);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     @Precondition("This component chain has one or more components")
     public String toString() {
         Logger.assertTrue(!components.isEmpty());
-        
+
         final StringBuilder name = new StringBuilder();
-        
+
         for (ActionComponent component : components) {
             name.append('.');
             name.append(component.toString());
         }
-        
+
         return name.substring(1);
     }
 
@@ -165,5 +165,5 @@ public class ActionComponentChain implements ActionComponent {
 
         return res;
     }
-    
+
 }

src/com/dmdirc/actions/ActionCondition.java

@@ -30,26 +30,26 @@ import com.dmdirc.actions.interfaces.ActionComponent;
  * @author chris
  */
 public class ActionCondition {
-    
+
     /** The argument number that this action condition applies to. */
     private int arg;
-    
+
     /** The component that this action condition applies to. */
     private ActionComponent component;
-    
+
     /** The comparison that should be used for this condition. */
     private ActionComparison comparison;
-    
+
     /** The target of the comparison for this condition. */
     private String target = "";
-    
+
     /** The source target for this comparison. */
     private String starget = "";
-    
+
     /**
      * Creates a new instance of ActionCondition that compares the output of
      * a component to a string.
-     * 
+     *
      * @param arg The argument number to be tested
      * @param component The component to be tested
      * @param comparison The comparison to be used
@@ -58,16 +58,16 @@ public class ActionCondition {
     public ActionCondition(final int arg, final ActionComponent component,
             final ActionComparison comparison, final String target) {
         super();
-        
+
         this.arg = arg;
         this.component = component;
         this.comparison = comparison;
         this.target = target;
     }
-    
+
     /**
      * Creates a new instance of ActionCondition that compares two strings.
-     * 
+     *
      * @param starget The first target for comparison.
      * @param comparison The comparison to be used
      * @param target The second target for the comparison
@@ -75,31 +75,31 @@ public class ActionCondition {
     public ActionCondition(final String starget, final ActionComparison comparison,
             final String target) {
         super();
-        
+
         this.arg = -1;
         this.starget = starget;
         this.comparison = comparison;
         this.target = target;
     }
-    
+
     /**
      * Tests to see if this condition holds.
-     * 
+     *
      * @param sub The substitutor to use for this
      * @param args The event arguments to be tested
      * @return True if the condition holds, false otherwise
      */
     public boolean test(final ActionSubstitutor sub, final Object ... args) {
         final String thisTarget = sub.doSubstitution(getTarget(), args);
-        
-        if (arg == -1) { 
+
+        if (arg == -1) {
             final String thisStarget = sub.doSubstitution(starget, args);
             return getComparison().test(thisStarget, thisTarget);
         } else {
             return getComparison().test(getComponent().get(args[getArg()]), thisTarget);
         }
     }
-    
+
     /**
      * Returns the argument number this condition applies to.
      *
@@ -108,7 +108,7 @@ public class ActionCondition {
     public int getArg() {
         return arg;
     }
-    
+
     /**
      * Returns the component this condition applies to.
      *
@@ -117,7 +117,7 @@ public class ActionCondition {
     public ActionComponent getComponent() {
         return component;
     }
-    
+
     /**
      * Returns the comparison this condition applies to.
      *
@@ -126,7 +126,7 @@ public class ActionCondition {
     public ActionComparison getComparison() {
         return comparison;
     }
-    
+
     /**
      * Returns the target of the comparison for this condition.
      *
@@ -135,7 +135,7 @@ public class ActionCondition {
     public String getTarget() {
         return target;
     }
-    
+
     /**
      * Sets the argument number this condition applies to.
      *
@@ -144,7 +144,7 @@ public class ActionCondition {
     public void setArg(final int arg) {
         this.arg = arg;
     }
-    
+
     /**
      * Sets the component this condition applies to.
      *
@@ -153,7 +153,7 @@ public class ActionCondition {
     public void setComponent(final ActionComponent component) {
         this.component = component;
     }
-    
+
     /**
      * Sets the comparison this condition applies to.
      *
@@ -162,7 +162,7 @@ public class ActionCondition {
     public void setComparison(final ActionComparison comparison) {
         this.comparison = comparison;
     }
-    
+
     /**
      * Sets the target of the comparison for this condition.
      * @param target Target for comparison
@@ -173,7 +173,7 @@ public class ActionCondition {
 
     /**
      * Retrieves the starget of this condition.
-     * 
+     *
      * @return This condition's starget, or null if none was set.
      */
     public String getStarget() {
@@ -182,17 +182,17 @@ public class ActionCondition {
 
     /**
      * Sets the starget for this condition.
-     * 
+     *
      * @param starget The new starget for this condition.
      */
     public void setStarget(final String starget) {
         this.starget = starget;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String toString() {
-        return "[ arg=" + arg + ", component=" + component + ", comparison=" 
+        return "[ arg=" + arg + ", component=" + component + ", comparison="
                 + comparison + ", target=" + target + ", starget=" + starget + " ]";
     }
 
@@ -202,19 +202,19 @@ public class ActionCondition {
         if (!(obj instanceof ActionCondition)) {
             return false;
         }
-        
+
         final ActionCondition o = (ActionCondition) obj;
-        
+
         return arg == o.getArg() && component == o.getComponent()
                 && comparison == o.getComparison() && target.equals(o.getTarget())
                 && starget.equals(o.getStarget());
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public int hashCode() {
         return arg + 100 * (arg == -1 ? starget.hashCode() : component.hashCode())
                 + 10000 * comparison.hashCode() + 100000 * target.hashCode();
     }
-    
+
 }

src/com/dmdirc/actions/ActionGroup.java

@@ -35,54 +35,54 @@ import java.util.Map;
 
 /**
  * Represents a group of actions, along with their meta-data.
- * 
+ *
  * @author chris
  */
 public class ActionGroup implements Iterable<Action> {
-    
+
     /**
      * 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;    
-    
+    private static final long serialVersionUID = 1;
+
     /** The actions in this group. */
     private final List<Action> actions = new ArrayList<Action>();
-    
+
     /** The name of this action group. */
     private final String name;
-    
+
     /** The description of this action group. */
     private String description = null;
-    
+
     /** The author of this action group. */
     private String author = null;
-    
+
     /** The component number of this action group (for updating). */
     private int component = -1;
-    
+
     /** The version of this action group. */
     private Version version = null;
-    
+
     /** A list of settings used by this action group. */
     private final Map<String, PreferencesSetting> settings
             = new HashMap<String, PreferencesSetting>();
 
     /**
      * Creates a new instance of ActionGroup.
-     * 
+     *
      * @param name The name of this action group
      */
     public ActionGroup(final String name) {
         super();
-        
+
         this.name = name;
     }
 
     /**
      * Retrieves the author of this ActionGroup.
-     * 
+     *
      * @return This action group's author, or null if the author isn't specified
      */
     public String getAuthor() {
@@ -91,7 +91,7 @@ public class ActionGroup implements Iterable<Action> {
 
     /**
      * Sets the author of this ActionGroup.
-     * 
+     *
      * @param author The new author for this action group
      */
     public void setAuthor(final String author) {
@@ -100,7 +100,7 @@ public class ActionGroup implements Iterable<Action> {
 
     /**
      * Retrieves the description of this action group.
-     * 
+     *
      * @return This action group's description, or null if none is specified
      */
     public String getDescription() {
@@ -109,7 +109,7 @@ public class ActionGroup implements Iterable<Action> {
 
     /**
      * Sets the description for this action group.
-     * 
+     *
      * @param description The new description for this action group
      */
     public void setDescription(final String description) {
@@ -118,7 +118,7 @@ public class ActionGroup implements Iterable<Action> {
 
     /**
      * Retrieves the name of this action group.
-     * 
+     *
      * @return This action group's name
      */
     public String getName() {
@@ -127,7 +127,7 @@ public class ActionGroup implements Iterable<Action> {
 
     /**
      * Retrieves a map settings used by this action group.
-     * 
+     *
      * @return A map of setting names to values
      */
     public Map<String, PreferencesSetting> getSettings() {
@@ -136,7 +136,7 @@ public class ActionGroup implements Iterable<Action> {
 
     /**
      * Retrieves the version number of this action group.
-     * 
+     *
      * @return This action group's version number, or null if none is specified.
      * @since 0.6.4
      */
@@ -146,7 +146,7 @@ public class ActionGroup implements Iterable<Action> {
 
     /**
      * Sets the version of this action group.
-     * 
+     *
      * @param version This action group's new version.
      * @since 0.6.4
      */
@@ -156,7 +156,7 @@ public class ActionGroup implements Iterable<Action> {
 
     /**
      * Retrieves the addon site component number for this action group.
-     * 
+     *
      * @return The component number for this action group, or -1 if none is
      * specified.
      */
@@ -166,16 +166,16 @@ public class ActionGroup implements Iterable<Action> {
 
     /**
      * Sets the addon site component number for this action group.
-     * 
+     *
      * @param component The component number for this action group
      */
     public void setComponent(final int component) {
         this.component = component;
     }
-    
+
     /**
      * Determines the size of this group.
-     * 
+     *
      * @return The size of this group
      */
     public int size() {
@@ -184,7 +184,7 @@ public class ActionGroup implements Iterable<Action> {
 
     /**
      * Removes the specified action from this group.
-     * 
+     *
      * @param action The action to be removed
      */
     public void remove(final Action action) {
@@ -199,7 +199,7 @@ public class ActionGroup implements Iterable<Action> {
 
     /**
      * Retrieves the action at the specified index.
-     * 
+     *
      * @param index The index of the action to return
      * @return The action at the specified index
      */
@@ -209,7 +209,7 @@ public class ActionGroup implements Iterable<Action> {
 
     /**
      * Determines if this group contains the specified action.
-     * 
+     *
      * @param action The action to search for
      * @return True if the action is contained in this list, false otherwise
      */
@@ -224,7 +224,7 @@ public class ActionGroup implements Iterable<Action> {
         for (Action action : new ArrayList<Action>(actions)) {
             remove(action);
         }
-        
+
         settings.clear();
         description = null;
         author = null;
@@ -234,16 +234,16 @@ public class ActionGroup implements Iterable<Action> {
 
     /**
      * Adds the specified action to this group.
-     * 
+     *
      * @param action The action to be added
      */
     public void add(final Action action) {
         actions.add(action);
     }
-    
+
     /**
      * Retrieves a copy of the list of all actions in this group.
-     * 
+     *
      * @return A list of actions in this group
      */
     public List<Action> getActions() {
@@ -267,14 +267,14 @@ public class ActionGroup implements Iterable<Action> {
 
         ActionManager.deleteAction(action);
     }
-    
+
     /**
      * Determines if this action group is delible or not.
-     * 
+     *
      * @return True if the group may be deleted, false if it may not.
      */
     public boolean isDelible() {
         return true;
     }
-    
+
 }

src/com/dmdirc/actions/ActionManager.java

@@ -380,8 +380,8 @@ public final class ActionManager {
         boolean res = false;
 
         if (LISTENERS.containsKey(type)) {
-            for (ActionListener listener :
-                new ArrayList<ActionListener>(LISTENERS.get(type))) {
+            for (ActionListener listener
+                    : new ArrayList<ActionListener>(LISTENERS.get(type))) {
                 try {
                     listener.processEvent(type, format, arguments);
                 } catch (Exception e) {

src/com/dmdirc/actions/ActionModel.java

@@ -61,10 +61,10 @@ public class ActionModel {
 
     /** The conditions for this action. */
     protected List<ActionCondition> conditions = new ArrayList<ActionCondition>();
-    
+
     /** The condition tree used for evaluating conditions. */
     protected ConditionTree conditionTree;
-    
+
     /** Whether this action has been modified or not. */
     protected boolean modified;
 
@@ -73,7 +73,7 @@ public class ActionModel {
 
     /** The concurrency group this action belongs to, if any. */
     protected String concurrencyGroup;
-    
+
     /**
      * Creates a new instance of ActionModel with the specified properties.
      *
@@ -83,8 +83,8 @@ public class ActionModel {
     public ActionModel(final String group, final String name) {
         this.group = group;
         this.name = name;
-    }    
-    
+    }
+
     /**
      * Creates a new instance of ActionModel with the specified properties.
      *
@@ -125,9 +125,9 @@ public class ActionModel {
     public boolean trigger(final StringBuffer format, final Object... arguments) {
         assert(triggers.length > 0);
         assert(triggers[0] != null);
-        
+
         final ActionSubstitutor sub = new ActionSubstitutor(triggers[0]);
-        
+
         if (!test(sub, arguments)) {
             return true;
         }
@@ -168,22 +168,22 @@ public class ActionModel {
 
         return stop;
     }
-    
+
     /**
      * Tests to see if this action should be triggered or not.
-     * 
+     *
      * @param sub The ActionsSubstitutor to use to substitute args
      * @param arguments The arguments for the action event
      * @return True if the action should be executed, false otherwise
      */
     public boolean test(final ActionSubstitutor sub, final Object ... arguments) {
         final boolean[] results = new boolean[conditions.size()];
-        
+
         int i = 0;
         for (ActionCondition condition : conditions) {
             results[i++] = condition.test(sub, arguments);
         }
-        
+
         return getRealConditionTree().evaluate(results);
     }
 
@@ -271,7 +271,7 @@ public class ActionModel {
     public String getGroup() {
         return group;
     }
-    
+
     /**
      * Sets the group of this action.
      *
@@ -290,7 +290,7 @@ public class ActionModel {
     public String getName() {
         return name;
     }
-    
+
     /**
      * Sets the name of this action.
      *
@@ -304,18 +304,18 @@ public class ActionModel {
     /**
      * Retrieves the condition tree used for this action. Condition trees may
      * be null, in which case the arguments are conjoined together.
-     * 
+     *
      * @return This action's condition tree
      */
     public ConditionTree getConditionTree() {
         return conditionTree;
     }
-    
+
     /**
      * Retrieves a concrete condition tree used for this action. If there is
      * no condition tree defined for this action, returns a conjunction tree
      * for the arguments.
-     * 
+     *
      * @since 0.6
      * @return A {@link ConditionTree} object for this action
      */
@@ -326,7 +326,7 @@ public class ActionModel {
 
     /**
      * Sets the condition tree used for this action.
-     * 
+     *
      * @param conditionTree The new condition tree to be used
      */
     public void setConditionTree(final ConditionTree conditionTree) {
@@ -336,7 +336,7 @@ public class ActionModel {
 
     /**
      * Retrieves the concurrency group of this action.
-     * 
+     *
      * @return This action's concurrency group
      * @since 0.6.3
      */
@@ -358,7 +358,7 @@ public class ActionModel {
     /**
      * Determines whether or not this action will stop the event execution
      * if it is triggered.
-     * 
+     *
      * @return The stopping preference of this action
      * @see #setStopping(boolean)
      * @since 0.6.4
@@ -380,17 +380,17 @@ public class ActionModel {
     public void setStopping(boolean stop) {
         this.stop = stop;
     }
-    
+
     /**
      * Determine if this model has been modified since it was constructed or
      * its modified status was reset.
-     * 
+     *
      * @return True if this model has been modified, false otherwise
      */
     public boolean isModified() {
         return modified;
     }
-    
+
     /**
      * Resets the modified status of this model. After a call to
      * resetModified(), this model will report that it has not been modified,
@@ -399,7 +399,7 @@ public class ActionModel {
     public void resetModified() {
         this.modified = false;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String toString() {
@@ -407,5 +407,5 @@ public class ActionModel {
                 + Arrays.toString(triggers) + ", response="
                 + Arrays.toString(response) + ", "
                 + conditions + ", format='" + newFormat + "']";
-    }    
+    }
 }

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -71,10 +71,10 @@ public class ActionSubstitutor {
     private static final Pattern COMP_PATTERN = Pattern.compile("([0-9]+)\\.([A-Z_]+(\\.[A-Z_]+)*)");
     /** Pattern to determine if a substitution is a server component type. */
     private static final Pattern SERVER_PATTERN = Pattern.compile("[A-Z_]+(\\.[A-Z_]+)*");
-    
+
     /** The action type this substitutor is for. */
     private final ActionType type;
-    
+
     /**
      * Creates a new substitutor for the specified action type.
      *
@@ -83,7 +83,7 @@ public class ActionSubstitutor {
     public ActionSubstitutor(final ActionType type) {
         this.type = type;
     }
-    
+
     /**
      * Retrieves a list of global config variables that will be substituted.
      * Note: does not include initial $.
@@ -93,7 +93,7 @@ public class ActionSubstitutor {
     public Set<String> getConfigSubstitutions() {
         return IdentityManager.getGlobalConfig().getOptions("actions").keySet();
     }
-    
+
     /**
      * Retrieves a list of substitutions derived from argument and component
      * combinations, along with a corresponding friendly name for them.
@@ -103,22 +103,22 @@ public class ActionSubstitutor {
      */
     public Map<String, String> getComponentSubstitutions() {
         final Map<String, String> res = new HashMap<String, String>();
-        
+
         int i = 0;
         for (Class<?> myClass : type.getType().getArgTypes()) {
             for (ActionComponent comp : ActionManager.getCompatibleComponents(myClass)) {
                 final String key = "{" + i + "." + comp.toString() + "}";
                 final String desc = type.getType().getArgNames()[i] + "'s " + comp.getName();
-                
+
                 res.put(key, desc);
             }
-            
+
             i++;
         }
-        
+
         return res;
     }
-    
+
     /**
      * Retrieves a list of server substitutions, if this action type supports
      * them.
@@ -128,19 +128,19 @@ public class ActionSubstitutor {
      */
     public Map<String, String> getServerSubstitutions() {
         final Map<String, String> res = new HashMap<String, String>();
-        
+
         if (hasFrameContainer()) {
             for (ActionComponent comp : ActionManager.getCompatibleComponents(Server.class)) {
                 final String key = "{" + comp.toString() + "}";
                 final String desc = "The connection's " + comp.getName();
-                
+
                 res.put(key, desc);
             }
         }
-        
+
         return res;
     }
-    
+
     /**
      * Returns true if this action type's first argument is a frame container,
      * or descendent of one.
@@ -149,18 +149,18 @@ public class ActionSubstitutor {
      */
     private boolean hasFrameContainer() {
         Class<?> target = null;
-        
+
         if (type.getType().getArgTypes().length > 0) {
             target = type.getType().getArgTypes()[0];
-            
+
             while (target != null && target != FrameContainer.class) {
                 target = target.getSuperclass();
             }
         }
-        
+
         return target == FrameContainer.class;
     }
-    
+
     /**
      * Determines whether or not word substitutions will work for this action
      * type. Word substitutions take the form $1, $1-5, $6-, etc.
@@ -172,7 +172,7 @@ public class ActionSubstitutor {
                 && (type.getType().getArgTypes()[2] == String[].class
                 || type.getType().getArgTypes()[2] == String.class);
     }
-    
+
     /**
      * Performs all applicable substitutions on the specified string, with the
      * specified arguments.
@@ -181,8 +181,8 @@ public class ActionSubstitutor {
      * @param args The arguments for the action type
      * @return The substituted string
      */
-    @Precondition("Number of arguments given equals the number of arguments " +
-    "required by this substitutor's type")
+    @Precondition("Number of arguments given equals the number of arguments "
+    + "required by this substitutor's type")
     public String doSubstitution(final String target, final Object ... args) {
         if (type.getType().getArity() != args.length) {
             throw new IllegalArgumentException("Invalid number of arguments "
@@ -205,7 +205,7 @@ public class ActionSubstitutor {
 
             res.delete(start, end);
             res.insert(start, getSubstitution(doSubstitution(group, args), args));
-            
+
             bracesMatcher = BRACES_PATTERN.matcher(res);
             otherMatcher = OTHER_PATTERN.matcher(res);
         }
@@ -226,9 +226,9 @@ public class ActionSubstitutor {
         final Matcher serverMatcher = SERVER_PATTERN.matcher(substitution);
 
         if (usesWordSubstitutions() && numberMatcher.matches()) {
-            final CommandArguments words = args[2] instanceof String ?
-                new CommandArguments((String) args[2]) :
-                new CommandArguments(Arrays.asList((String[]) args[2]));
+            final CommandArguments words = args[2] instanceof String
+                    ? new CommandArguments((String) args[2])
+                    : new CommandArguments(Arrays.asList((String[]) args[2]));
 
             int start, end;
 
@@ -308,7 +308,7 @@ public class ActionSubstitutor {
      * specified set of arguments. If any of the arguments is an instance of
      * {@link FrameContainer} or {@link Window}, the config manager is
      * requested from them. Otherwise, the global config is returned.
-     * 
+     *
      * @param args The arguments to be tested
      * @return The best config manager to use for those arguments
      * @since 0.6.3m2
@@ -337,5 +337,5 @@ public class ActionSubstitutor {
     protected static String escape(final String input) {
         return input.replace("\\", "\\\\").replace("$", "\\$");
     }
-    
+
 }

src/com/dmdirc/actions/ActionTypeComparator.java

@@ -29,7 +29,7 @@ import java.util.Comparator;
 
 /**
  * Implements a comparator for action types that compares their names.
- * 
+ *
  * @author Chris
  */
 public final class ActionTypeComparator implements Comparator<ActionType>, Serializable {
@@ -39,7 +39,7 @@ public final class ActionTypeComparator implements Comparator<ActionType>, Seria
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
-    private static final long serialVersionUID = 1;        
+    private static final long serialVersionUID = 1;
 
     /** {@inheritDoc} */
     @Override

src/com/dmdirc/actions/ConditionTreeFactory.java

@@ -25,27 +25,27 @@ package com.dmdirc.actions;
 /**
  * Provides methods to automatically generated condition tree for a specified
  * number of arguments.
- * 
+ *
  * @since 0.6
  * @author chris
  */
 public abstract class ConditionTreeFactory {
-        
+
     /**
      * Retrieves a condition tree for the specified number of arguments.
-     * 
+     *
      * @param args The number of arguments in the {@link Action}
      * @return A ConditionTree for the specified number of args
      */
     public abstract ConditionTree getConditionTree(final int args);
-    
+
     /**
      * Retrieves the type this of factory.
-     * 
+     *
      * @return This factory's type
      */
     public abstract ConditionTreeFactoryType getType();
-    
+
     /**
      * The possible types of ConditionTreeFactories
      */
@@ -57,7 +57,7 @@ public abstract class ConditionTreeFactory {
         /** Factories that produce custom trees. */
         CUSTOM,
     }
-    
+
     /**
      * Creates condition trees where the arguments are conjoined together.
      */
@@ -74,7 +74,7 @@ public abstract class ConditionTreeFactory {
         public ConditionTreeFactoryType getType() {
             return ConditionTreeFactoryType.CONJUNCTION;
         }
-        
+
     }
 
     /**
@@ -87,26 +87,26 @@ public abstract class ConditionTreeFactory {
         public ConditionTree getConditionTree(final int args) {
             return ConditionTree.createDisjunction(args);
         }
-        
+
         /** {@inheritDoc} */
         @Override
         public ConditionTreeFactoryType getType() {
             return ConditionTreeFactoryType.DISJUNCTION;
         }
-        
+
     }
-    
+
     /**
      * Creates condition trees with a custom structure.
      */
     public static class CustomFactory extends ConditionTreeFactory {
-        
+
         /** The condition tree to use. */
         protected final ConditionTree tree;
 
         /**
          * Creates a new CustomFactory for the specified tree.
-         * 
+         *
          * @param tree The tree to use
          */
         public CustomFactory(final ConditionTree tree) {
@@ -118,19 +118,19 @@ public abstract class ConditionTreeFactory {
         public ConditionTree getConditionTree(final int args) {
             return tree;
         }
-        
+
         /** {@inheritDoc} */
         @Override
         public ConditionTreeFactoryType getType() {
             return ConditionTreeFactoryType.CUSTOM;
         }
-        
+
     }
-    
+
     /**
      * Retrieves a factory that will extrapolate the specified
      * {@link ConditionTree} for different number of arguments, if applicable.
-     * 
+     *
      * @param tree The {@link ConditionTree} that's in use
      * @param args The number of conditions currently in use
      * @return A {@link ConditionTreeFactory} that will create relevant

src/com/dmdirc/actions/CoreActionComparison.java

@@ -34,7 +34,7 @@ import java.util.regex.PatternSyntaxException;
  * @author chris
  */
 public enum CoreActionComparison implements ActionComparison {
-    
+
     /** Compares a string to another using a regular expression. */
     STRING_REGEX {
         /** {@inheritDoc} */
@@ -53,7 +53,7 @@ public enum CoreActionComparison implements ActionComparison {
         @Override
         public String getName() { return "matches regex"; }
     },
-    
+
     /** Compares if two strings content are the same, case insensitive. */
     STRING_EQUALS {
         /** {@inheritDoc} */
@@ -68,7 +68,7 @@ public enum CoreActionComparison implements ActionComparison {
         @Override
         public String getName() { return "equals"; }
     },
-    
+
     /** Compares if two strings content aren't the same, case insensitive. */
     STRING_NEQUALS {
         /** {@inheritDoc} */
@@ -83,7 +83,7 @@ public enum CoreActionComparison implements ActionComparison {
         @Override
         public String getName() { return "does not equal"; }
     },
-    
+
     /** Checks if the string starts with another strings. */
     STRING_STARTSWITH {
         /** {@inheritDoc} */
@@ -98,7 +98,7 @@ public enum CoreActionComparison implements ActionComparison {
         @Override
         public String getName() { return "starts with"; }
     },
-    
+
     /** Checks if the string containts another string. */
     STRING_CONTAINS {
         /** {@inheritDoc} */
@@ -128,7 +128,7 @@ public enum CoreActionComparison implements ActionComparison {
         @Override
         public String getName() { return "doesn't contain"; }
     },
-    
+
     /** Checks if two boolean values are equal. */
     BOOL_IS {
         /** {@inheritDoc} */
@@ -143,7 +143,7 @@ public enum CoreActionComparison implements ActionComparison {
         @Override
         public String getName() { return "is"; }
     },
-    
+
     /** Checks if the colour is the same as another colour. */
     COLOUR_EQUALS {
         /** {@inheritDoc} */
@@ -158,7 +158,7 @@ public enum CoreActionComparison implements ActionComparison {
         @Override
         public String getName() { return "equals"; }
     },
-    
+
     /** Checks if the colour is not the same as another colour. */
     COLOUR_NEQUALS {
         /** {@inheritDoc} */
@@ -173,7 +173,7 @@ public enum CoreActionComparison implements ActionComparison {
         @Override
         public String getName() { return "does not equal"; }
     },
-    
+
     /** Checks if the int is equals to another int. */
     INT_EQUALS {
         /** {@inheritDoc} */
@@ -192,7 +192,7 @@ public enum CoreActionComparison implements ActionComparison {
         @Override
         public String getName() { return "equals"; }
     },
-    
+
     /** Checks if the int is larger than another int. */
     INT_GREATER {
         /** {@inheritDoc} */
@@ -211,7 +211,7 @@ public enum CoreActionComparison implements ActionComparison {
         @Override
         public String getName() { return "is greater than"; }
     },
-    
+
     /** Checks if the int is smaller than another int. */
     INT_LESS {
         /** {@inheritDoc} */
@@ -230,5 +230,5 @@ public enum CoreActionComparison implements ActionComparison {
         @Override
         public String getName() { return "is less than"; }
     };
-    
+
 }

src/com/dmdirc/actions/CoreActionComponent.java

@@ -48,7 +48,7 @@ import javax.swing.KeyStroke;
  * @author chris
  */
 public enum CoreActionComponent implements ActionComponent {
-    
+
     /** Returns the name of the server. */
     SERVER_NAME {
         /** {@inheritDoc} */
@@ -64,7 +64,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "name"; }
     },
-    
+
     /** Returns the network of the server. */
     SERVER_NETWORK {
         /** {@inheritDoc} */
@@ -101,7 +101,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "protocol"; }
     },
-    
+
     /** Returns the away reason for the server. */
     SERVER_MYAWAYREASON {
         /** {@inheritDoc} */
@@ -117,7 +117,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "away reason"; }
     },
-    
+
     /** Returns the channel umodes for the server. */
     SERVER_CHANNELUMODES {
         /** {@inheritDoc} */
@@ -133,8 +133,8 @@ public enum CoreActionComponent implements ActionComponent {
         /** {@inheritDoc} */
         @Override
         public String getName() { return "list of channel usermodes"; }
-    },    
-    
+    },
+
     /** Returns the nickname for the server. */
     SERVER_MYNICKNAME {
         /** {@inheritDoc} */
@@ -142,14 +142,14 @@ public enum CoreActionComponent implements ActionComponent {
         @ComponentOptions(requireConnected=true)
         public Object get(final Object argument) {
             final Server server = (Server) argument;
-            
+
             if (server == null || server.getParser() == null) {
                 Logger.appError(ErrorLevel.LOW, "SERVER_MYNICKNAME.get() called with null element",
                         new UnsupportedOperationException(
                         server == null ? "Server was null" :
                             server.getParser() == null ? "Parser was null" : "Unknown"
                         ));
-                
+
                 return "null";
             } else {
                 return server.getParser().getLocalClient().getNickname();
@@ -181,7 +181,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "profile"; }
     },
-    
+
     /** Returns the name of the channel. */
     CHANNEL_NAME {
         /** {@inheritDoc} */
@@ -197,7 +197,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "name"; }
     },
-    
+
     /** Returns the notification colour of the channel. */
     CHANNEL_COLOUR {
         /** {@inheritDoc} */
@@ -213,7 +213,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "notification colour"; }
     },
-    
+
     /** Returns the name of a client. */
     CLIENT_NAME {
         /** {@inheritDoc} */
@@ -229,7 +229,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "nickname"; }
     },
-    
+
     /** Returns the host of a client. */
     CLIENT_HOST {
         /** {@inheritDoc} */
@@ -245,7 +245,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "host"; }
     },
-    
+
     /** Returns the name of a client. */
     USER_NAME {
         /** {@inheritDoc} */
@@ -261,7 +261,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "nickname"; }
     },
-    
+
     /** Returns the modes of a client. */
     USER_MODES {
         /** {@inheritDoc} */
@@ -277,7 +277,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "modes"; }
     },
-    
+
     /** Returns the host of a client. */
     USER_HOST {
         /** {@inheritDoc} */
@@ -293,7 +293,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "host"; }
     },
-    
+
     /** Returns the number of common channels the client is on. */
     USER_COMCHANS {
         /** {@inheritDoc} */
@@ -309,7 +309,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "number of common channels"; }
     },
-    
+
     /** Returns the content of a string. */
     STRING_STRING {
         /** {@inheritDoc} */
@@ -325,7 +325,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "content"; }
     },
-    
+
     /** Returns the content of a string, stripped of formatting. */
     STRING_STRIPPED {
         /** {@inheritDoc} */
@@ -340,8 +340,8 @@ public enum CoreActionComponent implements ActionComponent {
         /** {@inheritDoc} */
         @Override
         public String getName() { return "content (without formatting)"; }
-    },    
-    
+    },
+
     /** Returns the length of a string. */
     STRING_LENGTH {
         /** {@inheritDoc} */
@@ -357,7 +357,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "length"; }
     },
-    
+
     /** Returns the size of a string array. */
     STRINGARRAY_LENGTH {
         /** {@inheritDoc} */
@@ -373,7 +373,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "size"; }
     },
-    
+
     /** Returns the readable representation of a date. */
     CALENDAR_FULLSTRING {
         /** {@inheritDoc} */
@@ -389,7 +389,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "full date"; }
     },
-    
+
     /** Returns the name of the key that was pressed. */
     KEYEVENT_KEYNAME {
         /** {@inheritDoc} */
@@ -405,7 +405,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "key name"; }
     },
-    
+
     /** Returns the state of the control key for a key press event. */
     KEYEVENT_CTRLSTATE {
         /** {@inheritDoc} */
@@ -423,7 +423,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "control key state"; }
     },
-    
+
     /** Returns the state of the shift key for a key press event. */
     KEYEVENT_SHIFTSTATE {
         /** {@inheritDoc} */
@@ -441,7 +441,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "shift key state"; }
     },
-    
+
     /** Returns the state of the shift key for a key press event. */
     KEYEVENT_ALTSTATE {
         /** {@inheritDoc} */
@@ -459,7 +459,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "alt key state"; }
     },
-    
+
     /** Returns the host of the query. */
     QUERY_HOST {
         /** {@inheritDoc} */
@@ -475,7 +475,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "host"; }
     },
-    
+
     /** Returns the host of the query. */
     QUERY_NICK {
         /** {@inheritDoc} */
@@ -491,7 +491,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "nick"; }
     },
-    
+
     /** Returns the notification colour of the query. */
     QUERY_COLOUR {
         /** {@inheritDoc} */
@@ -523,7 +523,7 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "name"; }
     },
-    
+
     /** Returns the notification colour of the window. */
     WINDOW_COLOUR {
         /** {@inheritDoc} */
@@ -542,7 +542,7 @@ public enum CoreActionComponent implements ActionComponent {
 
     /**
      * Returns the server of the window.
-     * 
+     *
      * @since 0.6.4
      */
     WINDOW_SERVER {
@@ -592,5 +592,5 @@ public enum CoreActionComponent implements ActionComponent {
         @Override
         public String getName() { return "value"; }
     };
-        
+
 }

src/com/dmdirc/actions/CoreActionType.java

@@ -37,7 +37,7 @@ import com.dmdirc.actions.metatypes.ServerEvents;
  * @author chris
  */
 public enum CoreActionType implements ActionType {
-    
+
     /** Client opened. */
     CLIENT_OPENED(ClientEvents.CLIENT_EVENT, "Client opened"),
     /** Client closed. */
@@ -52,10 +52,10 @@ public enum CoreActionType implements ActionType {
     CLIENT_FOCUS_LOST(ClientEvents.CLIENT_EVENT, "Client lost focus"),
     /** Client gained focus. */
     CLIENT_FOCUS_GAINED(ClientEvents.CLIENT_EVENT, "Client gained focus"),
-    
+
     /** Function key pressed. */
     CLIENT_KEY_PRESSED(ClientEvents.CLIENT_EVENT_WITH_KEY, "Function key pressed"),
-    
+
     /** Frame changed. */
     CLIENT_FRAME_CHANGED(ClientEvents.WINDOW_EVENT, "Frame changed"),
     /** User input. */
@@ -71,10 +71,10 @@ public enum CoreActionType implements ActionType {
     CLIENT_PREFS_OPENED(ClientEvents.CLIENT_EVENT_WITH_PREFS, "Preferences dialog opened"),
     /** Prefs dialog closed. */
     CLIENT_PREFS_CLOSED(ClientEvents.CLIENT_EVENT, "Preferences dialog opened"),
-    
+
     /** Unknown command. */
     UNKNOWN_COMMAND(ClientEvents.UNKNOWN_COMMAND, "Unknown command entered"),
-    
+
     /** Server numeric received. */
     SERVER_NUMERIC(ServerEvents.SERVER_NUMERIC, "Numeric event received"),
     /** Server connected. */
@@ -82,7 +82,7 @@ public enum CoreActionType implements ActionType {
     /** Server connecting. */
     SERVER_CONNECTING(ServerEvents.SERVER_EVENT, "Server connecting"),
     /** Server connection error. */
-    SERVER_CONNECTERROR(ServerEvents.SERVER_EVENT_WITH_ARG, "Server connection error"),    
+    SERVER_CONNECTERROR(ServerEvents.SERVER_EVENT_WITH_ARG, "Server connection error"),
     /** Server disconnected. */
     SERVER_DISCONNECTED(ServerEvents.SERVER_EVENT, "Server disconnected"),
     /** Marked as away. */
@@ -91,7 +91,7 @@ public enum CoreActionType implements ActionType {
     SERVER_AWAY(ServerEvents.SERVER_EVENT_WITH_ARG, "Marked as 'away'"),
     /** Error. */
     SERVER_ERROR(ServerEvents.SERVER_EVENT_WITH_ARG, "Server error"),
-    
+
     /** Auth notice received. */
     SERVER_AUTHNOTICE(ServerEvents.SERVER_EVENT_WITH_ARG, "Received auth notice"),
     /** Unknown action received. */
@@ -100,47 +100,47 @@ public enum CoreActionType implements ActionType {
     SERVER_UNKNOWNNOTICE(ServerEvents.SERVER_UNKNOWN_EVENT, "Received unknown notice"),
     /** Unknown message received. */
     SERVER_UNKNOWNMESSAGE(ServerEvents.SERVER_UNKNOWN_EVENT, "Received unknown message"),
-    
+
     /** User modes changed. */
     SERVER_USERMODES(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "User modes changed"),
-    
+
     /** Private CTCP received. */
     SERVER_CTCP(ServerEvents.SERVER_CTCP_EVENT, "CTCP received"),
     /** Private CTCPR received. */
     SERVER_CTCPR(ServerEvents.SERVER_CTCP_EVENT, "CTCP reply received"),
-    
+
     /** Private notice received. */
     SERVER_NOTICE(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Notice received"),
     /** Private server notice received. */
     SERVER_SERVERNOTICE(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Server notice received"),
-    
+
     /** MOTD starting. */
     SERVER_MOTDSTART(ServerEvents.SERVER_EVENT_WITH_ARG, "Start of MOTD received"),
     /** MOTD ended. */
     SERVER_MOTDEND(ServerEvents.SERVER_EVENT_WITH_ARG, "End of MOTD received"),
     /** MOTD line. */
     SERVER_MOTDLINE(ServerEvents.SERVER_EVENT_WITH_ARG, "MOTD line received"),
-    
+
     /** Ping reply received. */
     SERVER_GOTPING(ServerEvents.SERVER_PING, "Received server ping reply"),
     /** Missed server ping reply. */
     SERVER_NOPING(ServerEvents.SERVER_PING, "Missed server ping reply"),
     /** Ping sent. */
     SERVER_PINGSENT(ServerEvents.SERVER_EVENT, "Ping request sent"),
-    
+
     /** Invite received. */
     SERVER_INVITERECEIVED(ServerEvents.SERVER_INVITE, "Invite received"),
-    
+
     /** Wallops. */
     SERVER_WALLOPS(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Wallop received"),
     /** Wallusers. */
-    SERVER_WALLUSERS(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Walluser received"),    
+    SERVER_WALLUSERS(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Walluser received"),
     /** Walldesync. */
-    SERVER_WALLDESYNC(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Walldesync received"),        
-    
+    SERVER_WALLDESYNC(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Walldesync received"),
+
     /** Nick change. */
     SERVER_NICKCHANGE(ServerEvents.SERVER_NICKCHANGE, "My nickname changed"),
-    
+
     /** Channel window opened. */
     CHANNEL_OPENED(ChannelEvents.CHANNEL_EVENT, "Channel window opened"),
     /** Channel window closed. */
@@ -151,12 +151,12 @@ public enum CoreActionType implements ActionType {
     CHANNEL_NOTOPIC(ChannelEvents.CHANNEL_EVENT, "Channel topic is not set"),
     /** Channel topic received. */
     CHANNEL_GOTTOPIC(ChannelEvents.CHANNEL_TOPICEVENT, "Channel topic received"),
-    
+
     /** Channel message sent. */
     CHANNEL_SELF_MESSAGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Channel message sent"),
     /** Channel action sent. */
     CHANNEL_SELF_ACTION(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Channel action sent"),
-    
+
     /** Channel message received. */
     CHANNEL_MESSAGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Channel message received"),
     /** Channel actions received. */
@@ -165,10 +165,10 @@ public enum CoreActionType implements ActionType {
     CHANNEL_NOTICE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Channel notice received"),
     /** Channel mode notice received. @since 0.6.3m2 */
     CHANNEL_MODE_NOTICE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_CHARARG, "Channel mode notice received"),
-    
+
     /** Channel CTCP received. */
     CHANNEL_CTCP(ChannelEvents.CHANNEL_CTCP, "Channel CTCP received"),
-    
+
     /** Someone joined a channel. */
     CHANNEL_JOIN(ChannelEvents.CHANNEL_SOURCED_EVENT, "Someone joined a channel"),
     /** Someone left a channel. */
@@ -177,7 +177,7 @@ public enum CoreActionType implements ActionType {
     CHANNEL_QUIT(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Someone quit IRC"),
     /** Someone was kicked. */
     CHANNEL_KICK(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_VICTIM, "Someone kicked someone"),
-    
+
     /** Someone marked as away. */
     CHANNEL_USERAWAY(ChannelEvents.CHANNEL_SOURCED_EVENT, "Someone is marked as 'away'"),
     /** Someone marked as back. */
@@ -191,13 +191,13 @@ public enum CoreActionType implements ActionType {
     CHANNEL_MODECHANGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Someone changed channel modes"),
     /** Someone changed someone else's user modes. */
     CHANNEL_USERMODECHANGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_VICTIM, "Someone changed someone else's modes"),
-    
+
     /** Someone changed nickname. */
     CHANNEL_NICKCHANGE(ChannelEvents.CHANNEL_NICKEVENT, "Someone changed nicknames"),
-    
+
     /** Someone changed a topic. */
     CHANNEL_TOPICCHANGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Someone changed channel topic"),
-    
+
     /** Query opened. */
     QUERY_OPENED(QueryEvents.QUERY_EVENT, "Query window opened"),
     /** Query closed. */
@@ -214,12 +214,12 @@ public enum CoreActionType implements ActionType {
     QUERY_QUIT(QueryEvents.QUERY_EVENT_WITH_ARG, "Query: user quit"),
     /** Query nick change. */
     QUERY_NICKCHANGE(QueryEvents.QUERY_EVENT_WITH_ARG, "Query: user changed nicks"),
-    
+
     /** Plugin loaded. */
     PLUGIN_LOADED(PluginEvents.PLUGIN_EVENT, "Plugin loaded"),
     /** Plugin unloaded. */
     PLUGIN_UNLOADED(PluginEvents.PLUGIN_EVENT, "Plugin unloaded"),
-    
+
     /** Action created. */
     ACTION_CREATED(ActionEvents.ACTION_EVENT, "Action created"),
     /** Action updated. */
@@ -233,13 +233,13 @@ public enum CoreActionType implements ActionType {
     LINK_NICKNAME_CLICKED(LinkEvents.NICKNAME_CLICKED, "A nickname link was clicked"),
     /** Link clicked. */
     LINK_URL_CLICKED(LinkEvents.LINK_CLICKED, "A Link was clicked");
-    
+
     /** The type of this action. */
     private final ActionMetaType type;
-    
+
     /** The name of this action. */
     private final String name;
-    
+
     /**
      * Constructs a new core action.
      * @param type The type of this action
@@ -249,13 +249,13 @@ public enum CoreActionType implements ActionType {
         this.type = type;
         this.name = name;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public ActionMetaType getType() {
         return type;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getName() {

src/com/dmdirc/actions/interfaces/ActionComparison.java

@@ -29,7 +29,7 @@ package com.dmdirc.actions.interfaces;
  * @author chris
  */
 public interface ActionComparison {
-    
+
     /**
      * Tests the specified arguments against each other.
      * @param arg1 The first argument
@@ -38,13 +38,13 @@ public interface ActionComparison {
      * otherwise
      */
     boolean test(final Object arg1, final Object arg2);
-    
+
     /**
      * Returns the class that this comparison deals with.
      * @return The Class that this comparison can compare
      */
     Class<?> appliesTo();
-    
+
     /**
      * Returns a friendly name for this comparison.
      *
@@ -59,5 +59,5 @@ public interface ActionComparison {
      * @return This comparison's internal name
      */
     String name();
-    
+
 }

src/com/dmdirc/actions/interfaces/ActionComponent.java

@@ -31,7 +31,7 @@ import java.lang.annotation.Target;
  * The ActionComponent interface describes the methods that action components
  * are required to implement. Components are objects that allow the user to
  * pull a specific piece of information from a certain type of argument.
- * 
+ *
  * @author chris
  */
 public interface ActionComponent {
@@ -51,28 +51,28 @@ public interface ActionComponent {
         boolean requireConnected() default false;
 
     }
-    
+
     /**
      * Retrieves the component of the specified argument that this component
      * represents.
-     * 
+     *
      * @param argument The object to retrieve the component from
      * @return The relevant component of the object
-     */    
+     */
     Object get(Object argument);
-    
+
     /**
      * Retrieves the type of class that this component applies to.
      * @return The Class that this component can be applied to
      */
     Class<?> appliesTo();
-    
+
     /**
      * Retrieves the type of this component.
      * @return The Class of this component.
      */
     Class<?> getType();
-    
+
     /**
      * Retrives a friendly name for this component.
      *
@@ -87,5 +87,5 @@ public interface ActionComponent {
      * @return The internal name of this component
      */
     String name();
-    
+
 }

src/com/dmdirc/actions/interfaces/ActionMetaType.java

@@ -27,31 +27,31 @@ package com.dmdirc.actions.interfaces;
  * @author chris
  */
 public interface ActionMetaType {
-    
+
     /**
      * Retrieves the arity of this type.
      * @return The arity of this action type
      */
     int getArity();
-    
+
     /**
      * Retrieves the type of arguments that actions of this type should expect.
      * @return The type of arguments expected
      */
     Class[] getArgTypes();
-    
+
     /**
      * Retrieves the names of the arguments that actions of this type should
      * expect.
      * @return The names of the expected arguments
      */
     String[] getArgNames();
-    
+
     /**
      * Retrieves the name of a logical group for this meta-type to be put into.
-     * 
+     *
      * @return The meta-type's group name
      */
     String getGroup();
-    
+
 }

src/com/dmdirc/actions/metatypes/LinkEvents.java

@@ -33,7 +33,7 @@ import com.dmdirc.ui.interfaces.Window;
 public enum LinkEvents implements ActionMetaType {
 
     /** URL Link clicked. */
-    LINK_CLICKED(new String[]{"Window","URL"}, Window.class, String.class),
+    LINK_CLICKED(new String[]{"Window", "URL"}, Window.class, String.class),
     /** Channel link clicked. */
     CHANNEL_CLICKED(new String[]{"Window", "Channel"}, Window.class, String.class),
     /** Nickname link clicked. */

src/com/dmdirc/actions/metatypes/PluginEvents.java

@@ -31,15 +31,15 @@ import com.dmdirc.plugins.PluginInfo;
  * @author Chris
  */
 public enum PluginEvents implements ActionMetaType {
-    
+
     /** Plugin event type. */
     PLUGIN_EVENT(new String[]{"plugin"}, PluginInfo.class);
-    
+
     /** The names of the arguments for this meta type. */
     private String[] argNames;
     /** The classes of the arguments for this meta type. */
     private Class[] argTypes;
-    
+
     /**
      * Creates a new instance of this meta-type.
      *
@@ -50,29 +50,29 @@ public enum PluginEvents implements ActionMetaType {
         this.argNames = argNames;
         this.argTypes = argTypes;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public int getArity() {
         return argNames.length;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public Class[] getArgTypes() {
         return argTypes;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String[] getArgNames() {
         return argNames;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getGroup() {
         return "Plugin Events";
-    }    
-    
+    }
+
 }

src/com/dmdirc/actions/metatypes/ServerEvents.java

@@ -32,7 +32,7 @@ import com.dmdirc.parser.interfaces.ClientInfo;
  * @author Chris
  */
 public enum ServerEvents implements ActionMetaType {
-    
+
     /** Server ping event type. */
     SERVER_PING(new String[]{"server", "ping"}, Server.class, Long.class),
     /** Server numeric event type. */
@@ -51,12 +51,12 @@ public enum ServerEvents implements ActionMetaType {
     SERVER_INVITE(new String[]{"server", "source", "channel"}, Server.class, ClientInfo.class, String.class),
     /** Server event type. */
     SERVER_EVENT(new String[]{"server"}, Server.class);
-    
+
     /** The names of the arguments for this meta type. */
     private String[] argNames;
     /** The classes of the arguments for this meta type. */
     private Class[] argTypes;
-    
+
     /**
      * Creates a new instance of this meta-type.
      *
@@ -67,29 +67,29 @@ public enum ServerEvents implements ActionMetaType {
         this.argNames = argNames;
         this.argTypes = argTypes;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public int getArity() {
         return argNames.length;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public Class[] getArgTypes() {
         return argTypes;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String[] getArgNames() {
         return argNames;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getGroup() {
         return "Server/Private Events";
-    }    
-    
+    }
+
 }

src/com/dmdirc/actions/wrappers/Alias.java

@@ -38,23 +38,23 @@ import java.util.List;
  * Actions alias wrapper.
  */
 public final class Alias implements Serializable {
-    
+
     /**
      * 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;
-    
+
     /** Alias command. */
     private String command;
-    
+
     /** Alias arguments. */
     private List<ActionCondition> arguments;
-    
+
     /** Alias response. */
     private String[] response;
-    
+
     /**
      * Creates a new Alias wrapper.
      *
@@ -67,7 +67,7 @@ public final class Alias implements Serializable {
                 CoreActionComparison.STRING_EQUALS, command));
         this.response = new String[]{"", };
     }
-    
+
     /**
      * Wraps an existing Action in an Alias.
      *
@@ -81,7 +81,7 @@ public final class Alias implements Serializable {
         this.arguments = new ArrayList<ActionCondition>(arguments);
         this.response = response.clone();
     }
-    
+
     /**
      * Returns the aliases command.
      *
@@ -90,7 +90,7 @@ public final class Alias implements Serializable {
     public String getCommand() {
         return command;
     }
-    
+
     /**
      * Sets the aliases command.
      *
@@ -99,17 +99,17 @@ public final class Alias implements Serializable {
     public void setCommand(final String command) {
         if (!this.command.equals(command)) {
             this.command = command;
-            
+
             ActionCondition argument = arguments.get(0);
-            
+
             if (argument.getComparison() != CoreActionComparison.STRING_EQUALS) {
                 argument = arguments.get(1);
             }
-            
+
             argument.setTarget(command);
         }
     }
-    
+
     /**
      * Returns the aliases name.
      *
@@ -133,7 +133,7 @@ public final class Alias implements Serializable {
             return command + "-" + comparison + "-" + condition.getTarget();
         }
     }
-    
+
     /**
      * Gets the aliases arguments.
      *
@@ -142,7 +142,7 @@ public final class Alias implements Serializable {
     public List<ActionCondition> getArguments() {
         return new ArrayList<ActionCondition>(arguments);
     }
-    
+
     /**
      * Gets the aliases number of arguments argument.
      *
@@ -150,7 +150,7 @@ public final class Alias implements Serializable {
      */
     public ActionCondition getArgsArgument() {
         ActionCondition argument = arguments.get(0);
-        
+
         if (argument.getComparison() == CoreActionComparison.STRING_EQUALS) {
             if (arguments.size() > 1) {
                 argument = arguments.get(1);
@@ -158,10 +158,10 @@ public final class Alias implements Serializable {
                 argument = null;
             }
         }
-        
+
         return argument;
     }
-    
+
     /**
      * Sets the aliases arguments.
      *
@@ -172,7 +172,7 @@ public final class Alias implements Serializable {
             this.arguments = new ArrayList<ActionCondition>(arguments);
         }
     }
-    
+
     /**
      * Gets the aliases response.
      *
@@ -181,7 +181,7 @@ public final class Alias implements Serializable {
     public String[] getResponse() {
         return response.clone();
     }
-    
+
     /**
      * Sets the aliases response.
      *
@@ -192,7 +192,7 @@ public final class Alias implements Serializable {
             this.response = response.clone();
         }
     }
-    
+
     /**
      * Updates this alias with the details of another alias.
      *
@@ -203,7 +203,7 @@ public final class Alias implements Serializable {
         setCommand(alias.getCommand());
         setResponse(alias.getResponse());
     }
-    
+
     /**
      * Checks if the specified alias matches this one
      *
@@ -212,13 +212,13 @@ public final class Alias implements Serializable {
      * @return true iif the alias matches this one
      */
     public boolean matches(final Alias alias) {
-        return alias.getCommand().equalsIgnoreCase(command) 
+        return alias.getCommand().equalsIgnoreCase(command)
                 && alias.getArguments().equals(arguments);
     }
-    
+
     /**
      * Creates an action corresponding to this alias.
-     * 
+     *
      * @return A new action for this alias.
      */
     public Action createAction() {
@@ -230,7 +230,7 @@ public final class Alias implements Serializable {
                 getArguments(),
                 "");
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String toString() {

src/com/dmdirc/actions/wrappers/AliasWrapper.java

@@ -43,20 +43,20 @@ import java.util.List;
  * @author chris
  */
 public final class AliasWrapper extends ActionGroup {
-    
+
     /** Singleton instance of the alias wrapper. */
     private static AliasWrapper me;
-    
+
     /** A list of registered alias names. */
     private final List<String> aliases = new ArrayList<String>();
-    
+
     /**
      * Creates a new instance of AliasWrapper.
      */
     private AliasWrapper() {
         super("aliases");
     }
-    
+
     /**
      * Retrieves a singleton instance of this alias wrapper.
      *
@@ -66,24 +66,24 @@ public final class AliasWrapper extends ActionGroup {
         if (me == null) {
             me = new AliasWrapper();
         }
-        
+
         return me;
     }
-    
+
     /**
      * Retrieves a list of alias names registered with this wrapper.
-     * 
+     *
      * @return A list of alias names
      */
     public List<String> getAliases() {
         return new ArrayList<String>(aliases);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void add(final Action action) {
         if (action.getTriggers()[0].equals(CoreActionType.UNKNOWN_COMMAND)) {
-            
+
             final String commandName = getCommandName(action);
 
             if (commandName != null) {
@@ -107,23 +107,23 @@ public final class AliasWrapper extends ActionGroup {
                     + action.getName());
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void remove(final Action action) {
         if (action.getTriggers()[0].equals(CoreActionType.UNKNOWN_COMMAND)) {
             super.remove(action);
-            
+
             final String commandName = getCommandName(action);
-            
+
             aliases.remove(commandName);
-            
+
             for (Server server : ServerManager.getServerManager().getServers()) {
                 server.getTabCompleter().removeEntry(TabCompletionType.COMMAND, commandName);
             }
         }
     }
-    
+
     /**
      * Retrieves the command name of the specified alias action.
      *
@@ -137,7 +137,7 @@ public final class AliasWrapper extends ActionGroup {
                 return CommandManager.getCommandChar() + condition.getTarget();
             }
         }
-        
+
         // How can we have an alias without a command name?
         return null;
     }
@@ -155,5 +155,5 @@ public final class AliasWrapper extends ActionGroup {
                 + "more other commands. You can manage aliases using the \""
                 + "Alias Manager\", located in the Settings menu.";
     }
-    
+
 }

src/com/dmdirc/actions/wrappers/PerformWrapper.java

@@ -146,8 +146,8 @@ public class PerformWrapper extends ActionGroup {
                 return false;
             }
 
-            if ((this.profile == null) ? (other.profile != null) :
-                !this.profile.equals(other.profile)) {
+            if ((this.profile == null) ? (other.profile != null)
+                    : !this.profile.equals(other.profile)) {
                 return false;
             }
 
@@ -165,20 +165,20 @@ public class PerformWrapper extends ActionGroup {
         }
 
     }
-    
+
     /** A singleton instance of the Perform Wrapper. */
     private static final PerformWrapper ME = new PerformWrapper();
 
     /** The component name for per-profile perform conditions. */
     private static final String PP_COMP_NAME = "SERVER_PROFILE.IDENTITY_NAME";
-    
+
     /**
      * Creates a new instance of PerformWrapper.
      */
     private PerformWrapper() {
         super("performs");
     }
-    
+
     /**
      * Retrieves a singleton instance of this perform wrapper.
      *
@@ -187,7 +187,7 @@ public class PerformWrapper extends ActionGroup {
     public static PerformWrapper getPerformWrapper() {
         return ME;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void add(final Action action) {
@@ -233,9 +233,9 @@ public class PerformWrapper extends ActionGroup {
      */
     public void setPerform(final PerformDescription perform, final String[] content) {
         synchronized (this) {
-            Action action = getAction(perform.getType() == PerformType.NETWORK ?
-                CoreActionComponent.SERVER_NETWORK : CoreActionComponent.SERVER_NAME,
-                perform.getTarget(), perform.getProfile());
+            Action action = getAction(perform.getType() == PerformType.NETWORK
+                    ? CoreActionComponent.SERVER_NETWORK : CoreActionComponent.SERVER_NAME,
+                    perform.getTarget(), perform.getProfile());
 
             final boolean empty = isEmpty(content);
 
@@ -271,9 +271,9 @@ public class PerformWrapper extends ActionGroup {
      * @since 0.6.4
      */
     public String[] getPerform(final PerformDescription perform) {
-        final Action action = getAction(perform.getType() == PerformType.NETWORK ?
-            CoreActionComponent.SERVER_NETWORK : CoreActionComponent.SERVER_NAME,
-            perform.getTarget(), perform.getProfile());
+        final Action action = getAction(perform.getType() == PerformType.NETWORK
+                ? CoreActionComponent.SERVER_NETWORK : CoreActionComponent.SERVER_NAME,
+                perform.getTarget(), perform.getProfile());
 
         if (action == null || action.getResponse() == null) {
             return new String[0];
@@ -376,7 +376,7 @@ public class PerformWrapper extends ActionGroup {
     public Action getActionForServer(final String server) {
         return getActionForServer(server, null);
     }
-    
+
     /**
      * Retrieve the action that handles the perform for the specified server,
      * or null if no such action exists.
@@ -421,10 +421,10 @@ public class PerformWrapper extends ActionGroup {
     public Action getActionForNetwork(final String network, final String profile) {
         return getAction(CoreActionComponent.SERVER_NETWORK, network, profile);
     }
-    
+
     /**
      * Creates a new, empty, perform wrapper for the specified server.
-     * 
+     *
      * @param server The server to create the action for
      * @return The new perform wrapper action
      * @deprecated Actions shouldn't be used directly, use get/setPerform instead
@@ -451,7 +451,7 @@ public class PerformWrapper extends ActionGroup {
 
     /**
      * Creates a new, empty, perform wrapper for the specified network.
-     * 
+     *
      * @param network The network to create the action for
      * @return The new perform wrapper action
      * @deprecated Actions shouldn't be used directly, use get/setPerform instead
@@ -475,26 +475,26 @@ public class PerformWrapper extends ActionGroup {
     public Action createActionForNetwork(final String network, final String profile) {
         return createAction("", network, profile);
     }
-    
+
     /**
      * Creates a new, empty, perform wrapper for the specified server or
      * network. Note that both server and network must be specified, and
      * exactly one of them must be empty.
-     * 
+     *
      * @param server The server to create the action for
      * @param network The network to create the action for
      * @param profile The profile the action is for (or null if "global")
      * @since 0.6.3
      * @return The new perform wrapper action
-     */    
+     */
     private Action createAction(final String server, final String network,
             final String profile) {
         final List<ActionCondition> conditions = new ArrayList<ActionCondition>();
         final CoreActionComponent component =
                 server.isEmpty() ? CoreActionComponent.SERVER_NETWORK
                 : CoreActionComponent.SERVER_NAME;
-        
-        conditions.add(new ActionCondition(0, component, 
+
+        conditions.add(new ActionCondition(0, component,
                 CoreActionComparison.STRING_EQUALS, server + network));
 
         if (profile != null) {
@@ -502,13 +502,13 @@ public class PerformWrapper extends ActionGroup {
                     new ActionComponentChain(Server.class, PP_COMP_NAME),
                     CoreActionComparison.STRING_EQUALS, profile));
         }
-        
+
         return new Action(getName(), server + network
                 + (profile == null ? "" : " - " + profile),
                 new ActionType[]{CoreActionType.SERVER_CONNECTED},
                 new String[0], conditions, null);
     }
-    
+
     /**
      * Retrieve an action with a condition that checks the specified component,
      * and matches it against the specified target.
@@ -519,7 +519,7 @@ public class PerformWrapper extends ActionGroup {
      * null for a non-profile specific action
      * @since 0.6.3
      * @return The matching action if one exists, or null
-     */    
+     */
     private Action getAction(final ActionComponent component, final String target,
             final String profile) {
         for (Action action : this) {
@@ -540,16 +540,16 @@ public class PerformWrapper extends ActionGroup {
                 return action;
             }
         }
-        
+
         return null;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean isDelible() {
         return false;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getDescription() {
@@ -559,5 +559,5 @@ public class PerformWrapper extends ActionGroup {
                 + "\"Server Settings\" dialog, which can be accessed through "
                 + "the Settings menu.";
     }
-    
+
 }

src/com/dmdirc/commandline/CommandLineParser.java

@@ -44,7 +44,7 @@ import java.util.List;
  * @author Chris
  */
 public class CommandLineParser {
-    
+
     /**
      * The arguments that the client supports, in groups of four, in the
      * following order: short option, long option, description, whether or not
@@ -61,19 +61,19 @@ public class CommandLineParser {
         {'v', "version", "Display client version and exit", Boolean.FALSE},
         {'k', "check", "Check if an existing instance of DMDirc exists.", Boolean.FALSE},
     };
-    
+
     /** A list of addresses to autoconnect to. */
     private final List<URI> addresses = new ArrayList<URI>();
-    
+
     /** Whether to disable error reporting or not. */
     private boolean disablereporting;
-    
+
     /** The version string passed for the launcher. */
     private String launcherVersion = "";
-    
+
     /** The RMI server we're using. */
     private RemoteInterface server;
-    
+
     /**
      * Creates a new instance of CommandLineParser.
      *
@@ -82,7 +82,7 @@ public class CommandLineParser {
     public CommandLineParser(final String ... arguments) {
         boolean inArg = false;
         char previousArg = '.';
-        
+
         for (String arg : arguments) {
             if (inArg) {
                 processArgument(previousArg, arg);
@@ -99,11 +99,11 @@ public class CommandLineParser {
                 }
             }
         }
-        
+
         if (inArg) {
             doUnknownArg("Missing parameter for argument: " + previousArg);
         }
-        
+
         if (server != null) {
             try {
                 server.connect(addresses);
@@ -113,10 +113,10 @@ public class CommandLineParser {
                         "Unable to execute remote connection", ex);
             }
         }
-        
+
         RemoteServer.bind();
     }
-    
+
     /**
      * Checks whether the specified arg type takes an argument. If it does,
      * this method returns true. If it doesn't, the method processes the
@@ -127,23 +127,23 @@ public class CommandLineParser {
      */
     private boolean checkArgument(final char argument) {
         boolean needsArg = false;
-        
+
         for (Object[] target : ARGUMENTS) {
             if ((Character) argument == target[0]) {
                 needsArg = (Boolean) target[3];
                 break;
             }
         }
-        
+
         if (needsArg) {
             return true;
         } else {
             processArgument(argument, null);
-            
+
             return false;
         }
     }
-    
+
     /**
      * Processes the specified string as a single long argument.
      *
@@ -156,13 +156,13 @@ public class CommandLineParser {
                 return (Character) target[0];
             }
         }
-        
+
         doUnknownArg("Unknown argument: " + arg);
         exit();
-        
+
         return '.';
     }
-    
+
     /**
      * Processes the specified string as a single short argument.
      *
@@ -175,13 +175,13 @@ public class CommandLineParser {
                 return (Character) target[0];
             }
         }
-        
+
         doUnknownArg("Unknown argument: " + arg);
         exit();
-        
+
         return '.';
     }
-    
+
     /**
      * Processes the specified command-line argument.
      *
@@ -220,12 +220,12 @@ public class CommandLineParser {
         default:
             // This really shouldn't ever happen, but we'll handle it nicely
             // anyway.
-            
+
             doUnknownArg("Unknown argument: " + arg);
             break;
         }
     }
-    
+
     /**
      * Informs the user that they entered an unknown argument, prints the
      * client help, and exits.
@@ -237,14 +237,14 @@ public class CommandLineParser {
         System.out.println();
         doHelp();
     }
-    
+
     /**
      * Exits DMDirc.
      */
     private static void exit() {
         System.exit(0);
     }
-    
+
     /**
      * Handles the --connect argument.
      *
@@ -252,7 +252,7 @@ public class CommandLineParser {
      */
     private void doConnect(final String address) {
         URI myAddress = null;
-        
+
         try {
             myAddress = NewServer.getURI(address);
             addresses.add(myAddress);
@@ -260,18 +260,18 @@ public class CommandLineParser {
             doUnknownArg("Invalid address specified: " + ex.getMessage());
         }
     }
-    
+
     /**
      * Handles the --existing argument.
      */
     private void doExisting() {
         server = RemoteServer.getServer();
-        
+
         if (server == null) {
             System.err.println("Unable to connect to existing instance");
         }
     }
-    
+
     /**
      * Handles the --check argument.
      */
@@ -284,7 +284,7 @@ public class CommandLineParser {
             System.exit(0);
         }
     }
-    
+
     /**
      * Sets the config directory to the one specified.
      *
@@ -297,7 +297,7 @@ public class CommandLineParser {
             Main.setConfigDir(dir + File.separator);
         }
     }
-    
+
     /**
      * Prints out the client version and exits.
      */
@@ -310,7 +310,7 @@ public class CommandLineParser {
                 + IdentityManager.getGlobalConfig().getOption("updater", "channel"));
         exit();
     }
-    
+
     /**
      * Prints out client help and exits.
      */
@@ -319,35 +319,35 @@ public class CommandLineParser {
         System.out.println();
         System.out.println("Valid options:");
         System.out.println();
-        
+
         int maxLength = 0;
-        
+
         for (Object[] arg : ARGUMENTS) {
             final String needsArg = ((Boolean) arg[3]) ? " <argument>" : "";
-            
+
             if ((arg[1] + needsArg).length() > maxLength) {
                 maxLength = (arg[1] + needsArg).length();
             }
         }
-        
+
         for (Object[] arg : ARGUMENTS) {
             final String needsArg = ((Boolean) arg[3]) ? " <argument>" : "";
             final StringBuilder desc = new StringBuilder(maxLength + 1);
-            
+
             desc.append(arg[1]);
-            
+
             while (desc.length() < maxLength + 1) {
                 desc.append(' ');
             }
-            
+
             System.out.print("   -" + arg[0] + needsArg);
             System.out.println(" --" + desc + needsArg + " " + arg[2]);
             System.out.println();
         }
-        
+
         exit();
     }
-    
+
     /**
      * Applies any applicable settings to the config identity.
      */
@@ -355,12 +355,12 @@ public class CommandLineParser {
         if (disablereporting) {
             IdentityManager.getConfigIdentity().setOption("temp", "noerrorreporting", true);
         }
-        
+
         if (!launcherVersion.isEmpty()) {
             LauncherComponent.setLauncherInfo(launcherVersion);
         }
     }
-    
+
     /**
      * Processes arguments once the client has been loaded properly.
      * This allows us to auto-connect to servers, etc.
@@ -370,5 +370,5 @@ public class CommandLineParser {
             ServerManager.getServerManager().connectToAddress(address);
         }
     }
-    
+
 }

src/com/dmdirc/commandline/RemoteInterface.java

@@ -29,14 +29,14 @@ import java.util.List;
 
 /**
  * Defines the interface that is available using RMI.
- * 
+ *
  * @author chris
  */
 public interface RemoteInterface extends Remote {
-    
+
     /**
      * Connects to the specified list of addresses.
-     * 
+     *
      * @param addresses The addresses to connect to.
      * @throws java.rmi.RemoteException on problems communicating
      * @since 0.6.3

src/com/dmdirc/commandline/RemoteServer.java

@@ -36,40 +36,40 @@ import java.util.List;
 
 /**
  * An RMI server that allows other clients to interact with DMDirc.
- * 
+ *
  * @author chris
  */
 public class RemoteServer implements RemoteInterface {
-    
+
     /** The minimum port to use for RMI binding. */
     private static final int MINPORT = 3634;
     /** The maximum port to use for RMI binding. */
     private static final int MAXPORT = MINPORT + 5;
     /** The interface we're exposing. */
     private static final RemoteServer SERVER = new RemoteServer();
-    
+
     /** {@inheritDoc} */
     @Override
     public void connect(final List<URI> addresses) throws RemoteException {
         for (URI address : addresses) {
             ServerManager.getServerManager().connectToAddress(address);
         }
-    }    
-    
+    }
+
     /**
      * Binds to the RMI registry so that other clients may find this remote
      * server.
      */
     public static void bind() {
         RemoteInterface stub;
-        
+
         try {
             stub = (RemoteInterface) UnicastRemoteObject.exportObject(SERVER, 0);
         } catch (RemoteException ex) {
             Logger.appError(ErrorLevel.MEDIUM, "Unable to export remote interface", ex);
             return;
         }
-        
+
         for (int port = MINPORT; port < MAXPORT; port++) {
             try {
                 final Registry registry = LocateRegistry.createRegistry(port);
@@ -80,12 +80,12 @@ public class RemoteServer implements RemoteInterface {
             }
         }
     }
-    
+
     /**
      * Retrieves a reference to an existing RemoteServer, if there is one.
      * Note that this must be called before bind(), unless you want a reference
      * to our own client for some reason.
-     * 
+     *
      * @return The RemoteServer instance, or null if none was available
      */
     public static RemoteInterface getServer() {
@@ -93,7 +93,7 @@ public class RemoteServer implements RemoteInterface {
             try {
                 final Registry registry = LocateRegistry.getRegistry("localhost", port);
                 final RemoteInterface iface = (RemoteInterface) registry.lookup("DMDirc");
-                
+
                 if (iface == null) {
                     continue;
                 } else {
@@ -105,7 +105,7 @@ public class RemoteServer implements RemoteInterface {
                 continue;
             }
         }
-        
+
         // No RMI server found
         return null;
     }

src/com/dmdirc/commandparser/CommandArguments.java

@@ -109,7 +109,7 @@ public class CommandArguments {
      */
     public String[] getWords() {
         parse();
-        
+
         return words;
     }
 
@@ -133,7 +133,7 @@ public class CommandArguments {
      */
     public String getArgumentsAsString() {
         parse();
-        
+
         return getArgumentsAsString(0);
     }
 
@@ -160,7 +160,7 @@ public class CommandArguments {
      */
     public String getWordsAsString(final int start) {
         parse();
-        
+
         return getWordsAsString(start, words.length - 1);
     }
 
@@ -207,8 +207,8 @@ public class CommandArguments {
      * @return True if the input was a silenced command, false otherwise
      */
     public boolean isSilent() {
-        return isCommand() && line.length() >= 2 &&
-                line.charAt(1) == CommandManager.getSilenceChar();
+        return isCommand() && line.length() >= 2
+                && line.charAt(1) == CommandManager.getSilenceChar();
     }
 
     /**

src/com/dmdirc/commandparser/CommandManager.java

@@ -46,34 +46,34 @@ import java.util.Map;
 /**
  * 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.
- * 
+ *
  * @author chris
  */
 public final class CommandManager {
-    
+
     /** A list of commands that have been instansiated. */
     private static final Map<CommandInfo, Command> COMMANDS
             = new HashMap<CommandInfo, Command>();
-    
+
     /** A list of command parsers that have been instansiated. */
     private static final MapList<CommandType, CommandParser> PARSERS
             = new MapList<CommandType, CommandParser>();
-    
+
     /** The command char we're using. */
     private static char commandChar = IdentityManager.getGlobalConfig()
             .getOptionChar("general", "commandchar");
-    
+
     /** The silence char we're using. */
     private static char silenceChar = IdentityManager.getGlobalConfig()
             .getOptionChar("general", "silencechar");
-    
+
     /**
      * Prevents creation of a new command manager.
      */
     private CommandManager() {
         // Do nothing
     }
-    
+
     /**
      * Returns the current command character.
      *
@@ -82,7 +82,7 @@ public final class CommandManager {
     public static char getCommandChar() {
         return commandChar;
     }
-    
+
     /**
      * Returns the current silence character.
      *
@@ -91,10 +91,10 @@ public final class CommandManager {
     public static char getSilenceChar() {
         return silenceChar;
     }
-    
+
     /**
      * Registers a command with the command manager.
-     * 
+     *
      * @param command The command to be registered
      * @param info The information about the command
      * @since 0.6.3m1
@@ -115,17 +115,17 @@ public final class CommandManager {
     public static <T extends Command & CommandInfo> void registerCommand(final T command) {
         registerCommand(command, command);
     }
-    
+
     /**
      * Unregisters a command with the command manager.
-     * 
+     *
      * @param info The information object for the command that should be unregistered
      * @since 0.6.3m1
      */
     public static void unregisterCommand(final CommandInfo info) {
         registerCommand(info, COMMANDS.get(info), false);
     }
-    
+
     /**
      * Registers or unregisters a command.
      *
@@ -140,7 +140,7 @@ public final class CommandManager {
         if (PARSERS.containsKey(info.getType())) {
             registerCommand(info, command, PARSERS.get(info.getType()), register);
         }
-        
+
         if (register) {
             COMMANDS.put(info, command);
         } else {
@@ -149,7 +149,7 @@ public final class CommandManager {
 
         registerCommandName(info, register);
     }
-    
+
     /**
      * Registers or unregisters the specified command with all of the specified parsers.
      *
@@ -169,7 +169,7 @@ public final class CommandManager {
             }
         }
     }
-    
+
     /**
      * Registers or unregisters the specified command's name with the relevant
      * tab completers.
@@ -186,11 +186,11 @@ public final class CommandManager {
 
         // TODO: This logic is probably in two places. Abstract it.
         for (Server server : ServerManager.getServerManager().getServers()) {
-            if (command.getType() == CommandType.TYPE_SERVER ||
-                    command.getType() == CommandType.TYPE_GLOBAL) {
+            if (command.getType() == CommandType.TYPE_SERVER
+                    || command.getType() == CommandType.TYPE_GLOBAL) {
                 registerCommandName(server.getTabCompleter(), commandName, register);
             }
-            
+
             if (command.getType() == CommandType.TYPE_CHANNEL
                     || command.getType() == CommandType.TYPE_CHAT) {
                 for (String channelName : server.getChannels()) {
@@ -198,7 +198,7 @@ public final class CommandManager {
                             commandName, register);
                 }
             }
-            
+
             if (command.getType() == CommandType.TYPE_QUERY
                     || command.getType() == CommandType.TYPE_CHAT) {
                 for (Query query : server.getQueries()) {
@@ -208,7 +208,7 @@ public final class CommandManager {
             }
         }
     }
-    
+
     /**
      * Registers or unregisters the specified command with the specified tab-
      * completer.
@@ -226,14 +226,14 @@ public final class CommandManager {
             completer.removeEntry(TabCompletionType.COMMAND, name);
         }
     }
-        
+
     /**
      * Instansiates the default commands.
      */
     public static void initCommands() {
         // Chat commands
         new Me();
-        
+
         // Channel commands
         new Ban();
         new ChannelSettings();
@@ -245,7 +245,7 @@ public final class CommandManager {
         new Part();
         new SetNickColour();
         new ShowTopic();
-        
+
         // Server commands
         new AllChannels();
         new Away();
@@ -263,16 +263,16 @@ public final class CommandManager {
         new Reconnect();
         new ServerSettings();
         new Umode();
-        
+
         new RawServerCommand("lusers");
         new RawServerCommand("map");
         new RawServerCommand("motd");
         new RawServerCommand("oper");
         new RawServerCommand("whois");
         new RawServerCommand("who");
-        
+
         // Query commands
-        
+
         // Global commands
         new Active();
         new AliasCommand();
@@ -294,7 +294,7 @@ public final class CommandManager {
         new SaveConfig();
         new Set();
         new Input();
-        
+
         // Set up a listener for config changes
         final ConfigChangeListener listener = new ConfigChangeListener() {
             @Override
@@ -305,7 +305,7 @@ public final class CommandManager {
                         .getOptionChar("general", "silencechar");
             }
         };
-        
+
         IdentityManager.getGlobalConfig().addChangeListener("general", "commandchar", listener);
         IdentityManager.getGlobalConfig().addChangeListener("general", "silencechar", listener);
     }
@@ -330,7 +330,7 @@ public final class CommandManager {
             }
         }
     }
-    
+
     /**
      * Retrieves the command identified by the specified name, regardless of
      * type.
@@ -341,10 +341,10 @@ public final class CommandManager {
     public static Map.Entry<CommandInfo, Command> getCommand(final String name) {
         return getCommand(null, name);
     }
-    
+
     /**
      * Retrieves a command of the specified type with the specified name.
-     * 
+     *
      * @param type The type of the command to look for
      * @param name The name to look for
      * @return A command with a matching signature, or null if none were found
@@ -352,13 +352,13 @@ public final class CommandManager {
     public static Map.Entry<CommandInfo, Command> getCommand(final CommandType type,
             final String name) {
         final Map<CommandInfo, Command> res = getCommands(type, name);
-        
+
         return res.isEmpty() ? null : res.entrySet().iterator().next();
-    }    
-     
+    }
+
     /**
      * Determines if the specified command is a valid channel command.
-     * 
+     *
      * @param command The name of the command to test
      * @return True iff the command is a channel command, false otherwise
      */
@@ -366,56 +366,56 @@ public final class CommandManager {
         return getCommand(CommandType.TYPE_CHANNEL, command) != null
                 || getCommand(CommandType.TYPE_CHAT, command) != null;
     }
-       
+
     /**
      * Retrieves a list of the names of all commands of the specified type.
-     * 
+     *
      * @param type The type of command to list
      * @return A list of command names
      */
     public static List<String> getCommandNames(final CommandType type) {
         final List<String> res = new ArrayList<String>();
-        
+
         for (CommandInfo command : getCommands(type).keySet()) {
             res.add(getCommandChar() + command.getName());
         }
-        
+
         return res;
     }
-    
+
     /**
      * Retrieves a map of all {@link CommandInfo}s and their associated
      * {@link Command}s of the specified type.
-     * 
+     *
      * @param type The type of command to list
      * @return A map of commands
      * @since 0.6.3m1
-     */    
+     */
     public static Map<CommandInfo, Command> getCommands(final CommandType type) {
         return getCommands(type, null);
     }
-    
+
     /**
      * Retrieves a map of all commands of the specified type, with the
      * specified name.
-     * 
+     *
      * @param type The type of command to list, or null for all types
      * @param name The name of the command to look for, or null for any name
      * @return A map of {@link CommandInfo}s and their associated {@link Command}.
      * @since 0.6.3m1
-     */    
+     */
     private static Map<CommandInfo, Command> getCommands(final CommandType type,
             final String name) {
         final Map<CommandInfo, Command> res = new HashMap<CommandInfo, Command>();
-        
+
         for (Map.Entry<CommandInfo, Command> entry : COMMANDS.entrySet()) {
             if ((type == null || type.equals(entry.getKey().getType()))
                     && (name == null || name.equals(entry.getKey().getName()))) {
                 res.put(entry.getKey(), entry.getValue());
             }
         }
-        
+
         return res;
     }
-    
+
 }

src/com/dmdirc/commandparser/PopupManager.java

@@ -33,41 +33,41 @@ import com.dmdirc.config.ConfigManager;
  * @author Chris
  */
 public class PopupManager {
-    
+
     /**
      * Creates a new instance of PopupManager.
      */
     private PopupManager() {
         // Shouldn't be instansiated.
     }
-    
+
     /**
      * Returns the popup menu that should be used for the specified type.
      * Configuration data is read from the specified config manager.
-     * 
+     *
      * @param menuType The type of the menu that is needed
      * @param configManager The config manager to be used for the menu
      * @return The PopupMenu that should be displayed
      */
     public static PopupMenu getMenu(final PopupType menuType, final ConfigManager configManager) {
         final PopupMenu menu = getMenu(menuType.toString(), configManager);
-        
-        ActionManager.processEvent(CoreActionType.CLIENT_POPUP_GENERATED, 
+
+        ActionManager.processEvent(CoreActionType.CLIENT_POPUP_GENERATED,
                 null, menuType, menu, configManager);
-        
+
         return menu;
     }
-    
+
     /**
      * Retrieves the menu with the specified name.
-     * 
+     *
      * @param menuName The name of the menu to read
      * @param configManager The config manager to be used for the menu
      * @return The PopupMenu with the specified name
      */
     private static PopupMenu getMenu(final String menuName, final ConfigManager configManager) {
         final PopupMenu res = new PopupMenu();
-        
+
         for (String item : configManager.getOptionList("popups", menuName)) {
             if (item.length() > 0 && item.charAt(0) == '<') {
                 res.addAll(getMenu(item.substring(1), configManager).getItems());
@@ -75,41 +75,41 @@ public class PopupManager {
                 res.add(getItem(item, configManager));
             }
         }
-        
+
         return res;
     }
-    
+
     /**
      * Creates a PopupMenuItem for the specified item.
-     * 
+     *
      * @param item The item to be turned into a PopupMenuItem
      * @param configManager The config manager to beused for the menu
      * @return The corresponding PopupMenuItem
      */
     private static PopupMenuItem getItem(final String item, final ConfigManager configManager) {
         PopupMenuItem res;
-        
+
         if ("-".equals(item)) {
             res = new PopupMenuItem();
         } else {
             final int colon = item.indexOf(':');
-            
+
             if (colon == -1) {
                 throw new IllegalArgumentException("Invalid popup menu item: "
                         + item);
             }
-            
+
             final String name = item.substring(0, colon);
             final String command = item.substring(colon + 1);
-            
+
             if (command.length() > 0 && command.charAt(0) == '<') {
                 res = new PopupMenuItem(name, getMenu(command.substring(1), configManager));
             } else {
                 res = new PopupMenuItem(name, command);
             }
         }
-        
+
         return res;
     }
-    
+
 }

src/com/dmdirc/commandparser/PopupMenu.java

@@ -28,17 +28,17 @@ import java.util.List;
 
 /**
  * Represents an abstract, UI-independent popup menu.
- * 
+ *
  * @author chris
  */
 public class PopupMenu {
-    
+
     /** The items contained within this popup menu. */
     private final List<PopupMenuItem> items = new ArrayList<PopupMenuItem>();
-    
+
     /**
      * Retrieves a list of items contained within this popup menu.
-     * 
+     *
      * @return A list of this popup menu's items.
      */
     public List<PopupMenuItem> getItems() {
@@ -47,7 +47,7 @@ public class PopupMenu {
 
     /**
      * Adds the specified item to this popup menu.
-     * 
+     *
      * @param e The item to be added to the popup menu.
      */
     public void add(final PopupMenuItem e) {
@@ -56,11 +56,11 @@ public class PopupMenu {
 
     /**
      * Adds all of the items in the specified collection to this popup menu.
-     * 
+     *
      * @param c The collection whose items should be added.
      */
     public void addAll(final Collection<? extends PopupMenuItem> c) {
         items.addAll(c);
-    }    
+    }
 
 }

src/com/dmdirc/commandparser/PopupMenuItem.java

@@ -24,11 +24,11 @@ package com.dmdirc.commandparser;
 
 /**
  * Represents an abstract, UI-independent popup menu item.
- * 
+ *
  * @author chris
  */
 public class PopupMenuItem {
-   
+
     /** Whether this item is a divider. */
     private boolean divider = false;
     /** The submenu for this item, if any. */
@@ -37,17 +37,17 @@ public class PopupMenuItem {
     private String name;
     /** The command for this item, if any. */
     private String command;
-    
+
     /**
      * Creates a new PopupMenuItem that is used as a divider.
      */
     public PopupMenuItem() {
         divider = true;
     }
-    
+
     /**
      * Creates a new PopupMenuItem that is used as a submenu.
-     * 
+     *
      * @param name The name of the menu item
      * @param submenu The submenu of this item
      */
@@ -55,10 +55,10 @@ public class PopupMenuItem {
         this.name = name;
         this.submenu = submenu;
     }
-    
+
     /**
      * Creates a new PopupMenuItem that executes a command.
-     * 
+     *
      * @param name The name of the menu item
      * @param command The command to be executed
      */
@@ -66,10 +66,10 @@ public class PopupMenuItem {
         this.name = name;
         this.command = command;
     }
-    
+
     /**
      * Determines if this menu item is a divider or not.
-     * 
+     *
      * @return True if this item is a divider, false otherwise.
      */
     public boolean isDivider() {
@@ -78,35 +78,35 @@ public class PopupMenuItem {
 
     /**
      * Determines if this menu item contains a submenu or not.
-     * 
+     *
      * @return True if this item contains a submenu, false otherwise.
-     */    
+     */
     public boolean isSubMenu() {
         return submenu != null;
     }
-    
+
     /**
      * Retrieves the submenu associated with this item.
-     * 
+     *
      * @return This menu item's submenu.
      */
     public PopupMenu getSubMenu() {
         return submenu;
     }
-    
+
     /**
      * Retrieves the name of this menu item.
-     * 
+     *
      * @return This menu item's name.
      */
     public String getName() {
         return name;
     }
-    
+
     /**
      * Retrieves the command for this menu item, with the specified argumenwits
      * substituted in.
-     * 
+     *
      * @param arguments The arguments needed for this command
      * @return The command to be passed to a command parser
      */

src/com/dmdirc/commandparser/PopupType.java

@@ -25,93 +25,93 @@ package com.dmdirc.commandparser;
 /**
  * An enumeration of the types of popup menu which are supported by the
  * PopupManager.
- * 
+ *
  * @author chris
  */
 public enum PopupType {
-    
+
     /**
      * The menu that appears when right clicking in a channel window.
-     * 
+     *
      * Expected arguments: none.
      */
     CHAN_NORMAL,
-    
+
     /**
      * The menu that appears when right clicking in a nickname in a channel window.
-     * 
+     *
      * Expected arguments: the nickname of the user who was clicked on.
      */
     CHAN_NICK,
-    
+
     /**
      * The menu that appears when right clicking in a channel in a channel window.
-     * 
+     *
      * Expected arguments: the nickname of the user who was clicked on.
      */
     CHAN_CHANNEL,
-    
+
     /**
      * The menu that appears when right clicking in a hyperlink in a channel window.
-     * 
+     *
      * Expected arguments: the hyperlink clicked.
      */
     CHAN_HYPERLINK,
-    
+
     /**
      * The menu that appears when right clicking in a query window.
-     * 
+     *
      * Expected arguments: the nickname of the user who the query is with.
      */
     QUERY_NORMAL,
-    
+
     /**
      * The menu that appears when right clicking in a nickname in a query window.
-     * 
+     *
      * Expected arguments: the nickname of the user who the query is with.
      */
     QUERY_NICK,
-    
+
     /**
      * The menu that appears when right clicking in a channel in a query window.
-     * 
+     *
      * Expected arguments: the nickname of the user who the query is with.
      */
     QUERY_CHANNEL,
-    
+
     /**
      * The menu that appears when right clicking in a hyperlink in a query window.
-     * 
+     *
      * Expected arguments: the hyperlink clicked.
      */
     QUERY_HYPERLINK,
-    
+
     /**
      * The menu that appears when right clicking in a server window.
-     * 
+     *
      * Expected arguments: the nickname of the user who the query is with.
      */
     SERVER_NORMAL,
-    
+
     /**
      * The menu that appears when right clicking in a nickname in a server window.
-     * 
+     *
      * Expected arguments: the nickname of the user who the query is with.
      */
     SERVER_NICK,
-    
+
     /**
      * The menu that appears when right clicking in a channel in a server window.
-     * 
+     *
      * Expected arguments: the nickname of the user who the query is with.
      */
     SERVER_CHANNEL,
-    
+
     /**
      * The menu that appears when right clicking in a hyperlink in a server window.
-     * 
+     *
      * Expected arguments: the hyperlink clicked.
      */
     SERVER_HYPERLINK;
-       
+
 }

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

@@ -34,13 +34,13 @@ import com.dmdirc.ui.messages.Styliser;
  * @author chris
  */
 public abstract class Command {
-    
+
     /** The format name used for command output. */
     protected static final String FORMAT_OUTPUT = "commandOutput";
-    
+
     /** The format name used for command errors. */
     protected static final String FORMAT_ERROR = "commandError";
-    
+
     /**
      * Sends a line, if appropriate, to the specified target.
      * @param target The command window to send the line to
@@ -54,10 +54,10 @@ public abstract class Command {
             target.addLine(type, args);
         }
     }
-    
+
     /**
      * Sends a usage line, if appropriate, to the specified target.
-     * 
+     *
      * @param target The command window to send the line to
      * @param isSilent Whether this command is being silenced or not
      * @param name The name of the command that's raising the error
@@ -67,13 +67,13 @@ public abstract class Command {
             final boolean isSilent, final String name, final String args) {
         sendLine(target, isSilent, "commandUsage", CommandManager.getCommandChar(),
                 name, args);
-    }    
-    
+    }
+
     /**
      * Formats the specified data into a table suitable for output in the
      * textpane. It is expected that each String[] in data has the same number
      * of elements as the headers array.
-     * 
+     *
      * @param headers The headers of the table.
      * @param data The contents of the table.
      * @return A string containing an ASCII table
@@ -82,35 +82,35 @@ public abstract class Command {
         final StringBuilder res = new StringBuilder();
         res.append(Styliser.CODE_FIXED);
         res.append(Styliser.CODE_BOLD);
-        
+
         int[] maxsizes = new int[headers.length];
-        
+
         for (int i = 0; i < headers.length; i++) {
             maxsizes[i] = headers[i].length() + 3;
-            
+
             for (String[] row : data) {
                 maxsizes[i] = Math.max(maxsizes[i], row[i].length() + 3);
             }
-            
+
             doPadding(res, headers[i], maxsizes[i]);
         }
-                
+
         for (String[] source : data) {
             res.append('\n');
             res.append(Styliser.CODE_FIXED);
-            
+
             for (int i = 0; i < source.length; i++) {
                 doPadding(res, source[i], maxsizes[i]);
             }
         }
-        
+
         return res.toString();
     }
-    
+
     /**
      * Adds the specified data to the stringbuilder, padding with spaces to
      * the specified size.
-     * 
+     *
      * @param builder The stringbuilder to append data to
      * @param data The data to be added
      * @param size The minimum size that should be used
@@ -118,7 +118,7 @@ public abstract class Command {
     private static void doPadding(final StringBuilder builder, final String data,
             final int size) {
         builder.append(data);
-        
+
         for (int i = 0; i < size - data.length(); i++) {
             builder.append(' ');
         }

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

@@ -34,7 +34,7 @@ import com.dmdirc.commandparser.CommandType;
  */
 @Deprecated
 public abstract class GlobalCommand extends Command implements CommandInfo {
-        
+
     /** {@inheritDoc} */
     @Override
     public CommandType getType() {

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

@@ -66,7 +66,7 @@ public interface IntelligentCommand {
 
         /**
          * Retrieves the window that the command was entered in.
-         * 
+         *
          * @return The command's input window
          */
         public InputWindow getWindow() {
@@ -103,5 +103,5 @@ public interface IntelligentCommand {
      * @since 0.6.4
      */
     AdditionalTabTargets getSuggestions(int arg, IntelligentCommandContext context);
-    
+
 }

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

@@ -26,39 +26,39 @@ import java.util.Date;
 
 /**
  * Stores information about a previously executed command.
- * 
+ *
  * @author chris
  */
 public final class PreviousCommand {
-   
+
     /** The full command that was executed. */
     private final String line;
-    
+
     /** The timestamp of its execution. */
     private final long time;
-    
+
     /**
      * Creates a new record of the specified command.
-     * 
+     *
      * @param line The full command that was executed
      */
     public PreviousCommand(final String line) {
         this.line = line;
         this.time = new Date().getTime();
     }
-    
+
     /**
      * Retrieves the time that the command was executed at.
-     * 
+     *
      * @return The timestamp that the command was executed at
      */
     public long getTime() {
         return time;
     }
-    
+
     /**
      * Retrieves the command that was executed.
-     * 
+     *
      * @return The command that was executed.
      */
     public String getLine() {
@@ -71,17 +71,17 @@ public final class PreviousCommand {
         if (obj == null) {
             return false;
         }
-        
+
         if (getClass() != obj.getClass()) {
             return false;
         }
-        
+
         final PreviousCommand other = (PreviousCommand) obj;
         if (this.line != other.line
                 && (this.line == null || !this.line.equals(other.line))) {
             return false;
         }
-        
+
         return true;
     }
 
@@ -92,5 +92,5 @@ public final class PreviousCommand {
         hash = 97 * hash + (this.line == null ? 0 : this.line.hashCode());
         return hash;
     }
-    
+
 }

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

@@ -28,14 +28,14 @@ import com.dmdirc.ui.interfaces.InputWindow;
 /**
  * Validating commands are capable of validating their arguments to determine
  * whether the input would be valid or not.
- * 
+ *
  * @author chris
  */
 public interface ValidatingCommand {
-    
+
     /**
      * Validates the specified arguments.
-     * 
+     *
      * @param origin The window the command is being executed in
      * @param arguments The arguments that the user has entered (so far)
      * @return A validation response indicating the validity of the arguments

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

@@ -28,15 +28,15 @@ import com.dmdirc.ui.interfaces.InputWindow;
 /**
  * Wrapping commands are commands whose arguments may be wrapped into multiple
  * lines when sending.
- * 
+ *
  * @author chris
  */
 public interface WrappableCommand {
-    
+
     /**
      * Determines the number of lines that the specified arguments will be
      * wrapped as.
-     * 
+     *
      * @param origin The window the command is being executed in
      * @param arguments The arguments that the user has entered (so far)
      * @return The number of lines that the arguments will result in

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

@@ -45,14 +45,14 @@ import com.dmdirc.ui.input.TabCompletionType;
 @CommandOptions(allowOffline=false)
 public final class KickReason extends Command implements IntelligentCommand,
         CommandInfo {
-    
+
     /** Creates a new instance of KickReason. */
     public KickReason() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -62,25 +62,25 @@ public final class KickReason extends Command implements IntelligentCommand,
             showUsage(origin, args.isSilent(), "kick", "<user> [reason]");
             return;
         }
-        
+
         final ChannelClientInfo victim = channel.getChannelInfo().getChannelClient(args
                 .getArguments()[0]);
-        
+
         if (victim == null) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "User not found: "
                     + args.getArguments()[0]);
         } else {
-            victim.kick(args.getArguments().length > 1 ? args.getArgumentsAsString(1) :
-                origin.getConfigManager().getOption("general", "kickmessage"));
+            victim.kick(args.getArguments().length > 1 ? args.getArgumentsAsString(1)
+                    : origin.getConfigManager().getOption("general", "kickmessage"));
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "kick";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -92,7 +92,7 @@ public final class KickReason extends Command implements IntelligentCommand,
     public CommandType getType() {
         return CommandType.TYPE_CHANNEL;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
@@ -104,13 +104,13 @@ public final class KickReason extends Command implements IntelligentCommand,
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
-        
+
         if (arg == 0) {
             res.excludeAll();
             res.include(TabCompletionType.CHANNEL_NICK);
         }
-        
+
         return res;
     }
-    
+
 }

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

@@ -39,21 +39,21 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
  * Sends a names request.
- * 
+ *
  * @author chris
  */
 @CommandOptions(allowOffline=false)
-public class Names extends Command implements IntelligentCommand, 
+public class Names extends Command implements IntelligentCommand,
         ExternalCommand, CommandInfo {
-    
+
     /**
      * Creates a new instance of Names.
      */
     public Names() {
         super();
-        
+
         CommandManager.registerCommand(this);
-    }    
+    }
 
     /** {@inheritDoc} */
     @Override
@@ -63,14 +63,14 @@ public class Names extends Command implements IntelligentCommand,
         channel.getServer().getParser().sendRawMessage("NAMES "
                 + channel.getChannelInfo().getName());
     }
-    
+
 
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin, final Server server,
             final String channel, final boolean isSilent, final CommandArguments args) {
         server.getParser().sendRawMessage("NAMES " + channel);
-    }    
+    }
 
     /** {@inheritDoc} */
     @Override

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

@@ -47,24 +47,24 @@ import java.awt.Color;
  */
 public final class SetNickColour extends Command implements IntelligentCommand,
         CommandInfo {
-    
+
     /** Creates a new instance of SetNickColour. */
     public SetNickColour() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
-        
+
         int offset = 0;
         boolean nicklist = true;
         boolean text = true;
-        
+
         if (args.getArguments().length > offset && args.getArguments()[offset]
                 .equalsIgnoreCase("--nicklist")) {
             text = false;
@@ -74,16 +74,16 @@ public final class SetNickColour extends Command implements IntelligentCommand,
             nicklist = false;
             offset++;
         }
-        
+
         if (args.getArguments().length <= offset) {
             showUsage(origin, args.isSilent(), "setnickcolour", "[--nicklist|--text] <nick> [colour]");
             return;
         }
-        
+
         final ChannelClientInfo target = channel.getChannelInfo()
                 .getChannelClient(args.getArguments()[offset]);
         offset++;
-        
+
         if (target == null) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "No such nickname ("
                     + args.getArguments()[offset - 1] + ")!");
@@ -120,13 +120,13 @@ public final class SetNickColour extends Command implements IntelligentCommand,
             }
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "setnickcolour";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -138,7 +138,7 @@ public final class SetNickColour extends Command implements IntelligentCommand,
     public CommandType getType() {
         return CommandType.TYPE_CHANNEL;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
@@ -152,17 +152,17 @@ public final class SetNickColour extends Command implements IntelligentCommand,
             final IntelligentCommandContext context) {
         final AdditionalTabTargets targets = new AdditionalTabTargets();
         targets.excludeAll();
-        
+
         if (arg == 0) {
             targets.include(TabCompletionType.CHANNEL_NICK);
             targets.add("--nicklist");
             targets.add("--text");
         } else if (arg == 1 && (context.getPreviousArgs().get(0).equals("--text")
                 || context.getPreviousArgs().get(0).equals("--nicklist"))) {
-            targets.include(TabCompletionType.CHANNEL_NICK);            
+            targets.include(TabCompletionType.CHANNEL_NICK);
         }
-        
+
         return targets;
     }
-    
+
 }

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

@@ -87,8 +87,8 @@ public final class Active extends Command implements IntelligentCommand,
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
-        return "active <command> - executes the command as though it had been" +
-                " typed in the active window";
+        return "active <command> - executes the command as though it had been"
+                + " typed in the active window";
     }
 
     /** {@inheritDoc} */

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

@@ -39,7 +39,7 @@ import com.dmdirc.ui.input.TabCompleter;
 
 /**
  * The alias command allows users to create aliases on-the-fly.
- * 
+ *
  * @author chris
  */
 public final class AliasCommand extends Command implements
@@ -69,11 +69,11 @@ public final class AliasCommand extends Command implements
                     ? args.getArguments()[1].substring(1) : args.getArguments()[1];
 
             if (doRemove(name)) {
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Alias '" + name +
-                         "' removed.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Alias '"
+                        + name + "' removed.");
             } else {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Alias '" + name +
-                         "' not found.");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Alias '"
+                        + name + "' not found.");
             }
 
             return;
@@ -85,8 +85,8 @@ public final class AliasCommand extends Command implements
         for (Action alias : AliasWrapper.getAliasWrapper()) {
             if (AliasWrapper.getCommandName(alias).substring(1).equalsIgnoreCase(
                     name)) {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Alias '" + name +
-                         "' already exists.");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Alias '" + name
+                        + "' already exists.");
                 return;
             }
         }
@@ -95,13 +95,13 @@ public final class AliasCommand extends Command implements
         myAlias.setResponse(new String[]{args.getArgumentsAsString(1)});
         myAlias.createAction().save();
 
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Alias '" + name +
-                 "' created.");
+        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Alias '" + name
+                + "' created.");
     }
 
     /**
      * Removes the alias with the specified name.
-     * 
+     *
      * @param name The name of the alias to remove
      * @return True if the alias was deleted, false otherwise
      */

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

@@ -41,32 +41,32 @@ import com.dmdirc.ui.input.TabCompleter;
  */
 public final class AllServers extends Command implements IntelligentCommand,
         CommandInfo{
-    
+
     /** Creates a new instance of AllServers. */
     public AllServers() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
             final CommandArguments args, final CommandContext context) {
         final String command = args.getArgumentsAsString();
-        
+
         for (Server target : ServerManager.getServerManager().getServers()) {
             target.getCommandParser().parseCommand(target, context.getSource(), command);
         }
     }
-    
-    
+
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "allservers";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -78,12 +78,12 @@ public final class AllServers extends Command implements IntelligentCommand,
     public CommandType getType() {
         return CommandType.TYPE_GLOBAL;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
-        return "allservers <command> - executes the command as though it had" +
-                " been entered on all servers";
+        return "allservers <command> - executes the command as though it had"
+                + " been entered on all servers";
     }
 
     /** {@inheritDoc} */
@@ -92,5 +92,5 @@ public final class AllServers extends Command implements IntelligentCommand,
             final IntelligentCommandContext context) {
         return TabCompleter.getIntelligentResults(arg, context, 0);
     }
-    
+
 }

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

@@ -57,14 +57,14 @@ import java.util.Map.Entry;
  * @author Chris
  */
 public class Debug extends Command implements IntelligentCommand, CommandInfo {
-    
+
     /**
      * Creates a new instance of Debug.
      */
     public Debug() {
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -110,7 +110,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unknown debug action.");
         }
     }
-    
+
     /**
      * Generates a fake error.
      *
@@ -120,7 +120,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
         ErrorLevel el = ErrorLevel.HIGH;
         if (args.length > 2) {
             final String level = args[2];
-            
+
             if (level.equals("low")) {
                 el = ErrorLevel.LOW;
             } else if (level.equals("medium")) {
@@ -131,14 +131,14 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
                 el = ErrorLevel.UNKNOWN;
             }
         }
-        
+
         if (args.length > 1 && args[1].equals("user")) {
             Logger.userError(el, "Debug error message");
         } else {
             Logger.appError(el, "Debug error message", new Exception());
         }
     }
-    
+
     /**
      * Attempts to show the server's raw window.
      *
@@ -152,7 +152,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
             origin.getServer().addRaw();
         }
     }
-    
+
     /**
      * Shows stats related to the config system.
      *
@@ -264,7 +264,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
         sortedStats.addAll(ConfigManager.getStats().entrySet());
         return sortedStats;
     }
-    
+
     /**
      * Shows memory usage information.
      *
@@ -279,7 +279,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Used Memory: "
                 + (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
     }
-    
+
     /**
      * Outputs 100 lines containing various colours.
      *
@@ -295,7 +295,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
                     + ((char) 3) + "6Colour! " + ((char) 3) + "7Colour! ");
         }
     }
-    
+
     /**
      * Manually runs the garbage collector.
      *
@@ -306,7 +306,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
         System.gc();
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Invoked garbage collector.");
     }
-    
+
     /**
      * Shows information about the config manager.
      *
@@ -319,7 +319,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
                     + source + "(" + source.getTarget().getOrder() + ")");
         }
     }
-    
+
     /**
      * Shows information about the global config manager.
      *
@@ -332,7 +332,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
                     + source + "(" + source.getTarget().getOrder() + ")");
         }
     }
-    
+
     /**
      * Forces the update checker to check for updates.
      *
@@ -382,10 +382,10 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
             sendLine(origin, isSilent, FORMAT_OUTPUT, server.getStatus().getTransitionHistory());
         }
     }
-    
+
     /**
      * Shows information about the current server.
-     * 
+     *
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
@@ -408,36 +408,36 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
                     + server.getParser().getDoubleParameterChannelModes());
         }
     }
-    
+
     /**
      * Benchmarks the textpane.
-     * 
+     *
      * @param origin The window this command was executed in
      */
     private static void doBenchmark(final FrameContainer<?> origin) {
         long[] results = new long[10];
-        
+
         for (int i = 0; i < results.length; i++) {
             final long start = System.nanoTime();
-            
+
             for (int j = 0; j < 5000; j++) {
                 origin.addLine(FORMAT_OUTPUT, "This is a benchmark. Lorem ipsum doler...");
             }
-            
+
             final long end = System.nanoTime();
-            
+
             results[i] = end - start;
         }
-        
+
         for (int i = 0; i < results.length; i++) {
             origin.addLine(FORMAT_OUTPUT, "Iteration " + i + ": " + results[i]
                     + " nanoseconds.");
         }
     }
-    
+
     /**
      * Shows information about all the current services available to plugins.
-     * 
+     *
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      * @param args The arguments that were passed to the command
@@ -456,13 +456,13 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
             }
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "debug";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -474,21 +474,21 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
     public CommandType getType() {
         return CommandType.TYPE_GLOBAL;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
         return null;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
-        
+
         res.excludeAll();
-        
+
         if (arg == 0) {
             res.add("error");
             res.add("showraw");
@@ -519,33 +519,33 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
             res.add("fatal");
             res.add("unknown");
         }
-        
+
         return res;
     }
-    
+
     /** Reverse value comparator for a map entry. */
     private static class ValueComparator implements
             Comparator<Entry<String, Integer>>, Serializable {
-        
+
         /**
          * 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 int compare(final Entry<String, Integer> o1,
                 final Entry<String, Integer> o2) {
             int returnValue = o1.getValue().compareTo(o2.getValue()) * -1;
-            
+
             if (returnValue == 0) {
                 returnValue = o1.getKey().compareToIgnoreCase(o2.getKey());
             }
-            
+
             return returnValue;
         }
     }
-    
+
 }

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

@@ -38,16 +38,16 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
  * @author chris
  */
 public final class Exit extends Command implements CommandInfo {
-    
+
     /**
      * Creates a new instance of Exit.
      */
     public Exit() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -55,14 +55,14 @@ public final class Exit extends Command implements CommandInfo {
         Main.quit(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "closemessage"));
     }
-    
-    
+
+
     /** {@inheritDoc}. */
     @Override
     public String getName() {
         return "exit";
     }
-    
+
     /** {@inheritDoc}. */
     @Override
     public boolean showInHelp() {
@@ -74,11 +74,11 @@ public final class Exit extends Command implements CommandInfo {
     public CommandType getType() {
         return CommandType.TYPE_GLOBAL;
     }
-        
+
     /** {@inheritDoc}. */
     @Override
     public String getHelp() {
         return "exit [reason] - exits the client";
     }
-    
+
 }

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

@@ -45,16 +45,16 @@ import com.dmdirc.ui.input.TabCompleter;
  */
 public final class Ifplugin extends Command implements IntelligentCommand,
         CommandInfo {
-    
+
     /**
      * Creates a new instance of Ifplugin.
      */
     public Ifplugin() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -63,19 +63,19 @@ public final class Ifplugin extends Command implements IntelligentCommand,
             showUsage(origin, args.isSilent(), "ifplugin", "<[!]plugin> <command>");
             return;
         }
-        
+
         final boolean negative = args.getArguments()[0].charAt(0) == '!';
-        
+
         final String pname = args.getArguments()[0].substring(negative ? 1 : 0);
-        
+
         final PluginInfo pluginInfo = PluginManager.getPluginManager().getPluginInfoByName(pname);
-        
+
         boolean result = true;
-        
+
         if (pluginInfo == null || !pluginInfo.isLoaded()) {
             result = false;
         }
-        
+
         if (result != negative) {
             if (origin == null) {
                 GlobalCommandParser.getGlobalCommandParser().parseCommand(null,
@@ -86,13 +86,13 @@ public final class Ifplugin extends Command implements IntelligentCommand,
             }
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "ifplugin";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -104,12 +104,12 @@ public final class Ifplugin extends Command implements IntelligentCommand,
     public CommandType getType() {
         return CommandType.TYPE_GLOBAL;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
-        return "ifplugin <[!]plugin> <command> - executes a command if the " +
-                "specified plugin is/isn't loaded";
+        return "ifplugin <[!]plugin> <command> - executes a command if the "
+                + "specified plugin is/isn't loaded";
     }
 
     /** {@inheritDoc} */
@@ -117,7 +117,7 @@ public final class Ifplugin extends Command implements IntelligentCommand,
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final AdditionalTabTargets res;
-        
+
         if (arg == 0) {
             res = new AdditionalTabTargets().excludeAll();
 
@@ -125,12 +125,12 @@ public final class Ifplugin extends Command implements IntelligentCommand,
                     : PluginManager.getPluginManager().getPluginInfos()) {
                 res.add(possPlugin.getName());
                 res.add("!" + possPlugin.getName());
-            }            
+            }
         } else {
             res = TabCompleter.getIntelligentResults(arg, context, 1);
         }
-        
+
         return res;
-    }    
-    
+    }
+
 }

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

@@ -90,8 +90,8 @@ public class Input extends Command implements IntelligentCommand, CommandInfo {
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
-        return "input [--clear] <text to insert into inputfield> - Adds text to" +
-                " the active window's input field";
+        return "input [--clear] <text to insert into inputfield> - Adds text to"
+                + " the active window's input field";
     }
 
     /** {@inheritDoc} */
@@ -99,7 +99,7 @@ public class Input extends Command implements IntelligentCommand, CommandInfo {
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
-        
+
         if (arg == 0) {
             res.add("--clear");
         }

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

@@ -152,8 +152,8 @@ public final class NewServer extends Command implements IntelligentCommand,
         // Check for SSL
         if (args.getArguments()[offset].equalsIgnoreCase("--ssl")) {
             Logger.userError(ErrorLevel.LOW,
-                    "Using /newserver --ssl is deprecated, and may be removed in the future." +
-                    " Use /newserver <host>:+<port> instead.");
+                    "Using /newserver --ssl is deprecated, and may be removed in the future."
+                    + " Use /newserver <host>:+<port> instead.");
 
             ssl = true;
             offset++;
@@ -167,8 +167,8 @@ public final class NewServer extends Command implements IntelligentCommand,
                 if (origin != null) {
                     origin.addLine(FORMAT_ERROR, "Invalid port specified");
                 } else {
-                    Logger.userError(ErrorLevel.LOW, "Invalid port specified " +
-                            "in newserver command");
+                    Logger.userError(ErrorLevel.LOW, "Invalid port specified "
+                            + "in newserver command");
                 }
                 return null;
             }
@@ -185,16 +185,16 @@ public final class NewServer extends Command implements IntelligentCommand,
                 if (origin != null) {
                     origin.addLine(FORMAT_ERROR, "Invalid port specified");
                 } else {
-                    Logger.userError(ErrorLevel.LOW, "Invalid port specified " +
-                            "in newserver command");
+                    Logger.userError(ErrorLevel.LOW, "Invalid port specified "
+                            + "in newserver command");
                 }
                 return null;
             }
 
             if (port <= 0 || port > 65535) {
                 if (origin == null) {
-                    Logger.userError(ErrorLevel.LOW, "Port must be between 1 " +
-                            "and 65535 in newserver command");
+                    Logger.userError(ErrorLevel.LOW, "Port must be between 1 "
+                            + "and 65535 in newserver command");
                 } else if (!args.isSilent()) {
                     origin.addLine(FORMAT_ERROR, "Port must be between 1 and 65535");
                 }

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

@@ -38,21 +38,21 @@ import java.awt.Color;
 /**
  * The notify command allows the user to set the notification colour for a
  * window.
- * 
+ *
  * @author chris
  */
 public final class Notify extends Command implements IntelligentCommand,
         CommandInfo {
-    
+
     /**
      * Creates a new instance of Notify.
      */
     public Notify() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -61,26 +61,26 @@ public final class Notify extends Command implements IntelligentCommand,
             showUsage(origin, args.isSilent(), "notify", "<colour>");
             return;
         }
-        
+
         final Color colour = ColourManager.parseColour(args.getArguments()[0], null);
-        
+
         if (colour == null) {
             showUsage(origin, args.isSilent(), "notify",
-                    "<colour> - colour must be an IRC colour code (0-15) or a " +
-                    "hex string (e.g. FFFF00).");
-        } else if (origin != null) {            
+                    "<colour> - colour must be an IRC colour code (0-15) or a "
+                    + "hex string (e.g. FFFF00).");
+        } else if (origin != null) {
             // There's not much point echoing an error if the origin isn't
             // valid, as errors go to the origin!
             origin.sendNotification(colour);
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "notify";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -92,7 +92,7 @@ public final class Notify extends Command implements IntelligentCommand,
     public CommandType getType() {
         return CommandType.TYPE_GLOBAL;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
@@ -104,6 +104,6 @@ public final class Notify extends Command implements IntelligentCommand,
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         return new AdditionalTabTargets().excludeAll();
-    } 
-    
+    }
+
 }

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

@@ -36,17 +36,17 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
  * Opens a new window.
- * 
+ *
  * @author chris
  */
 public class OpenWindow extends Command implements IntelligentCommand, CommandInfo {
-    
+
     /**
      * Creates a new instance of OpenWindow.
      */
     public OpenWindow() {
         CommandManager.registerCommand(this);
-    }    
+    }
 
     /** {@inheritDoc} */
     @Override
@@ -74,15 +74,15 @@ public class OpenWindow extends Command implements IntelligentCommand, CommandIn
                     "[--server|--child] <name> [title]");
         } else {
             final FrameContainer<?> window;
-            
+
             if (parent == null) {
                 window = WindowManager.findCustomWindow(args.getArguments()[start]);
             } else {
                 window = WindowManager.findCustomWindow(parent, args.getArguments()[start]);
             }
-            
-            final String title = args.getArguments().length > start + 1 ?
-                args.getArgumentsAsString(start + 1): args.getArguments()[start];
+
+            final String title = args.getArguments().length > start + 1
+                ? args.getArgumentsAsString(start + 1) : args.getArguments()[start];
 
             if (window == null) {
                 if (parent == null) {
@@ -127,13 +127,13 @@ public class OpenWindow extends Command implements IntelligentCommand, CommandIn
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
-        
+
         if (arg == 0) {
             res.add("--server");
             res.add("--child");
         }
-        
+
         return res;
-    } 
+    }
 
 }

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

@@ -36,21 +36,21 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
  * Allows the user to reload a plugin.
- * 
+ *
  * @author chris
  */
 public final class ReloadPlugin extends Command implements IntelligentCommand,
         CommandInfo {
-    
+
     /**
      * Creates a new instance of ReloadPlugin.
      */
     public ReloadPlugin() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -59,7 +59,7 @@ public final class ReloadPlugin extends Command implements IntelligentCommand,
             showUsage(origin, args.isSilent(), "reloadplugin", "<plugin>");
             return;
         }
-        
+
         final PluginInfo plugin = PluginManager.getPluginManager()
                 .getPluginInfoByName(args.getArguments()[0]);
         if (plugin == null) {
@@ -71,13 +71,13 @@ public final class ReloadPlugin extends Command implements IntelligentCommand,
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "Plugin Reloading failed");
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "reloadplugin";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -89,7 +89,7 @@ public final class ReloadPlugin extends Command implements IntelligentCommand,
     public CommandType getType() {
         return CommandType.TYPE_GLOBAL;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
@@ -101,14 +101,14 @@ public final class ReloadPlugin extends Command implements IntelligentCommand,
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets().excludeAll();
-        
+
         if (arg == 0) {
             for (PluginInfo possPlugin : PluginManager.getPluginManager().getPluginInfos()) {
                 res.add(possPlugin.getName());
             }
         }
-        
+
         return res;
     }
-    
+
 }

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

@@ -35,37 +35,37 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
  * Allows the user to save the config file.
- * 
+ *
  * @author chris
  */
 public final class SaveConfig extends Command implements IntelligentCommand,
         CommandInfo {
-    
+
     /**
      * Creates a new instance of SaveConfig.
      */
     public SaveConfig() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
             final CommandArguments args, final CommandContext context) {
         IdentityManager.save();
-        
+
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Configuration file saved.");
     }
-    
-    
+
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "saveconfig";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -77,7 +77,7 @@ public final class SaveConfig extends Command implements IntelligentCommand,
     public CommandType getType() {
         return CommandType.TYPE_GLOBAL;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
@@ -89,6 +89,6 @@ public final class SaveConfig extends Command implements IntelligentCommand,
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         return new AdditionalTabTargets().excludeAll();
-    } 
-    
+    }
+
 }

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

@@ -188,8 +188,8 @@ public final class Set extends Command implements IntelligentCommand, CommandInf
             final String domain, final String option, final String newvalue) {
         identity.setOption(domain, option, newvalue);
 
-        sendLine(origin, isSilent, FORMAT_OUTPUT, domain + "." + option +
-                " has been set to: " + newvalue);
+        sendLine(origin, isSilent, FORMAT_OUTPUT, domain + "." + option
+                + " has been set to: " + newvalue);
     }
 
     /**
@@ -205,10 +205,10 @@ public final class Set extends Command implements IntelligentCommand, CommandInf
      */
     private void doAppendOption(final FrameContainer<?> origin,
             final boolean isSilent, final Identity identity, final ConfigManager manager,
-            final String domain,final String option, final String data) {
+            final String domain, final String option, final String data) {
         doSetOption(origin, isSilent, identity, domain, option,
-                (manager.hasOptionString(domain, option) ?
-                    manager.getOption(domain, option) : "") + data);
+                (manager.hasOptionString(domain, option)
+                ? manager.getOption(domain, option) : "") + data);
     }
 
     /**

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

@@ -36,21 +36,21 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
  * Allows the user to unload a plugin.
- * 
+ *
  * @author chris
  */
 public final class UnloadPlugin extends Command implements IntelligentCommand,
         CommandInfo {
-    
+
     /**
      * Creates a new instance of UnloadPlugin.
      */
     public UnloadPlugin() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -59,7 +59,7 @@ public final class UnloadPlugin extends Command implements IntelligentCommand,
             showUsage(origin, args.isSilent(), "unloadplugin", "<plugin>");
             return;
         }
-        
+
         final PluginInfo plugin = PluginManager.getPluginManager()
                 .getPluginInfoByName(args.getArguments()[0]);
         if (plugin == null) {
@@ -71,13 +71,13 @@ public final class UnloadPlugin extends Command implements IntelligentCommand,
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "Plugin Unloading failed");
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "unloadplugin";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -89,7 +89,7 @@ public final class UnloadPlugin extends Command implements IntelligentCommand,
     public CommandType getType() {
         return CommandType.TYPE_GLOBAL;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
@@ -101,16 +101,16 @@ public final class UnloadPlugin extends Command implements IntelligentCommand,
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets().excludeAll();
-        
-        if (arg == 0) {            
+
+        if (arg == 0) {
             for (PluginInfo possPlugin : PluginManager.getPluginManager().getPluginInfos()) {
                 if (possPlugin.isLoaded()) {
                     res.add(possPlugin.getName());
                 }
             }
         }
-        
+
         return res;
     }
-    
+
 }

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

@@ -85,8 +85,8 @@ public final class AllChannels extends Command implements IntelligentCommand,
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
-        return "allchannels <command> - executes the command as though it had" +
-                "been entered on all channels";
+        return "allchannels <command> - executes the command as though it had"
+                + " been entered on all channels";
     }
 
     /** {@inheritDoc} */

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

@@ -41,16 +41,16 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  */
 @CommandOptions(allowOffline=false)
 public final class Back extends Command implements IntelligentCommand, CommandInfo {
-    
+
     /**
      * Creates a new instance of Back.
      */
     public Back() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -58,14 +58,14 @@ public final class Back extends Command implements IntelligentCommand, CommandIn
         final Server server = ((ServerCommandContext) context).getServer();
         server.getParser().getLocalClient().setBack();
     }
-    
-    
+
+
     /** {@inheritDoc}. */
     @Override
     public String getName() {
         return "back";
     }
-    
+
     /** {@inheritDoc}. */
     @Override
     public boolean showInHelp() {
@@ -77,7 +77,7 @@ public final class Back extends Command implements IntelligentCommand, CommandIn
     public CommandType getType() {
         return CommandType.TYPE_SERVER;
     }
-    
+
     /** {@inheritDoc}. */
     @Override
     public String getHelp() {
@@ -90,5 +90,5 @@ public final class Back extends Command implements IntelligentCommand, CommandIn
             final IntelligentCommandContext context) {
         return new AdditionalTabTargets().excludeAll();
     }
-    
+
 }

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

@@ -38,20 +38,20 @@ import java.net.URISyntaxException;
 
 /**
  * The /server command allows the user to connect to a new server.
- * 
+ *
  * @author chris
  */
 public final class ChangeServer extends Command implements CommandInfo {
-    
+
     /**
      * Creates a new instance of ChangeServer.
      */
     public ChangeServer() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -79,13 +79,13 @@ public final class ChangeServer extends Command implements CommandInfo {
 
         server.connect(address, server.getProfile());
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "server";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -97,11 +97,11 @@ public final class ChangeServer extends Command implements CommandInfo {
     public CommandType getType() {
         return CommandType.TYPE_SERVER;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
         return "server <host[:[+]port]> [password] - connect to a different server";
     }
-    
+
 }

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

@@ -37,39 +37,39 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
  * @author chris
  */
 public final class Disconnect extends Command implements CommandInfo {
-    
+
     /**
      * Creates a new instance of Disconnect.
      */
     public Disconnect() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         final String line;
-        
+
         if (args.getArguments().length == 0) {
             line = origin.getConfigManager().getOption("general", "quitmessage");
         } else {
             line = args.getArgumentsAsString();
         }
-        
+
         server.disconnect(line);
     }
-    
-    
+
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "disconnect";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -81,11 +81,11 @@ public final class Disconnect extends Command implements CommandInfo {
     public CommandType getType() {
         return CommandType.TYPE_SERVER;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
         return "disconnect [reason] - disconnect from this server";
     }
-    
+
 }

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

@@ -56,17 +56,17 @@ public class JoinChannelCommand extends Command implements
     /** A map of channel name mentions. */
     private final MapList<FrameContainer<?>, String> mentions
             = new MapList<FrameContainer<?>, String>();
-    
+
     /**
      * Creates a new instance of the join channel command.
      */
     public JoinChannelCommand() {
         super();
-        
+
         CommandManager.registerCommand(this);
         ActionManager.addListener(this, CoreActionType.CLIENT_LINE_ADDED);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -92,14 +92,14 @@ public class JoinChannelCommand extends Command implements
 
         server.join(!args.isSilent(), channels.toArray(new ChannelJoinRequest[0]));
     }
-    
-    
+
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "join";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -111,7 +111,7 @@ public class JoinChannelCommand extends Command implements
     public CommandType getType() {
         return CommandType.TYPE_SERVER;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
@@ -208,5 +208,5 @@ public class JoinChannelCommand extends Command implements
 
         return results;
     }
-    
+
 }

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

@@ -43,16 +43,16 @@ import com.dmdirc.ui.input.TabCompletionType;
 @CommandOptions(allowOffline=false)
 public final class Nick extends Command implements IntelligentCommand,
         CommandInfo {
-    
+
     /**
      * Creates a new instance of Nick.
      */
     public Nick() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -62,17 +62,17 @@ public final class Nick extends Command implements IntelligentCommand,
             showUsage(origin, args.isSilent(), "nick", "<new nickname>");
             return;
         }
-        
+
         server.getParser().getLocalClient().setNickname(args.getArguments()[0]);
     }
-    
-    
+
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "nick";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -84,7 +84,7 @@ public final class Nick extends Command implements IntelligentCommand,
     public CommandType getType() {
         return CommandType.TYPE_SERVER;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
@@ -96,14 +96,14 @@ public final class Nick extends Command implements IntelligentCommand,
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
-        
+
         res.exclude(TabCompletionType.COMMAND);
-        
+
         if (arg > 0) {
             res.excludeAll();
         }
-        
+
         return res;
     }
-    
+
 }

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

@@ -43,16 +43,16 @@ import com.dmdirc.ui.input.TabCompletionType;
 @CommandOptions(allowOffline=false)
 public final class Notice extends Command implements IntelligentCommand,
         CommandInfo {
-    
+
     /**
      * Creates a new instance of Notice.
      */
     public Notice() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -67,14 +67,14 @@ public final class Notice extends Command implements IntelligentCommand,
                     args.getArgumentsAsString(1));
         }
     }
-    
-    
+
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "notice";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -86,7 +86,7 @@ public final class Notice extends Command implements IntelligentCommand,
     public CommandType getType() {
         return CommandType.TYPE_SERVER;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
@@ -98,12 +98,12 @@ public final class Notice extends Command implements IntelligentCommand,
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final AdditionalTabTargets targets = new AdditionalTabTargets();
-        
+
         if (arg == 0) {
             targets.exclude(TabCompletionType.COMMAND);
         }
-        
+
         return targets;
     }
-    
+
 }

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

@@ -44,16 +44,16 @@ import com.dmdirc.ui.messages.Styliser;
  */
 public final class OpenQuery extends Command implements IntelligentCommand,
         WrappableCommand, CommandInfo {
-    
+
     /**
      * Creates a new instance of Query.
      */
     public OpenQuery() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -63,7 +63,7 @@ public final class OpenQuery extends Command implements IntelligentCommand,
             showUsage(origin, args.isSilent(), "query", "<target> <message>");
             return;
         }
-            
+
         if (server.getParser().isValidChannelName(args.getArguments()[0])) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "You can't open a query "
                     + "with a channel; maybe you meant " + Styliser.CODE_FIXED
@@ -83,14 +83,14 @@ public final class OpenQuery extends Command implements IntelligentCommand,
                     args.getArguments()[0]);
         }
     }
-    
-    
+
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "query";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -102,27 +102,27 @@ public final class OpenQuery extends Command implements IntelligentCommand,
     public CommandType getType() {
         return CommandType.TYPE_SERVER;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
         return "query <user> [message] - opens a query with the specified user";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final AdditionalTabTargets targets = new AdditionalTabTargets();
-        
+
         if (arg == 0) {
             targets.excludeAll();
             targets.include(TabCompletionType.CHANNEL_NICK);
         }
-        
+
         return targets;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public int getLineCount(final InputWindow origin, final CommandArguments arguments) {
@@ -134,5 +134,5 @@ public final class OpenQuery extends Command implements IntelligentCommand,
             return 1;
         }
     }
-    
+
 }

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

@@ -40,34 +40,34 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
  */
 @CommandOptions(allowOffline=false)
 public final class Raw extends Command implements CommandInfo {
-    
+
     /**
      * Creates a new instance of Raw.
      */
     public Raw() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         final String line = args.getArgumentsAsString();
-        
+
         server.getParser().sendRawMessage(line);
         sendLine(origin, args.isSilent(), "rawCommand", line);
     }
-    
-    
+
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "raw";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -79,11 +79,11 @@ public final class Raw extends Command implements CommandInfo {
     public CommandType getType() {
         return CommandType.TYPE_SERVER;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
         return "raw <text> - sends the specified text directly to the server";
     }
-    
+
 }

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

@@ -36,28 +36,28 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 /**
  * Implements a raw server command (i.e., a command that is sent to the server
  * as-is.
- * 
+ *
  * @author chris
  */
 @CommandOptions(allowOffline=false)
 public final class RawServerCommand extends Command implements CommandInfo {
-    
+
     /** The name of this raw command. */
     private final String myName;
-    
+
     /**
      * Creates a new instance of RawServerCommand.
-     * 
+     *
      * @param command The command name for this raw command
      */
     public RawServerCommand(final String command) {
         super();
-        
+
         myName = command;
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
@@ -65,14 +65,14 @@ public final class RawServerCommand extends Command implements CommandInfo {
         final Server server = ((ServerCommandContext) context).getServer();
         server.getParser().sendRawMessage(myName.toUpperCase() + " " + args.getArgumentsAsString());
     }
-    
-    
+
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return myName;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -84,11 +84,11 @@ public final class RawServerCommand extends Command implements CommandInfo {
     public CommandType getType() {
         return CommandType.TYPE_SERVER;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
         return myName + " [arguments] - sends a " + myName + " command to the server";
     }
-    
+
 }

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

@@ -37,39 +37,39 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
  * @author chris
  */
 public final class Reconnect extends Command implements CommandInfo {
-    
+
     /**
      * Creates a new instance of Reconnect.
      */
     public Reconnect() {
         super();
-        
+
         CommandManager.registerCommand(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer<?> origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         final String line;
-        
+
         if (args.getArguments().length == 0) {
             line = origin.getConfigManager().getOption("general", "reconnectmessage");
         } else {
             line = args.getArgumentsAsString();
         }
-        
+
         server.reconnect(line);
     }
-    
-    
+
+
     /** {@inheritDoc} */
     @Override
     public String getName() {
         return "reconnect";
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public boolean showInHelp() {
@@ -81,11 +81,11 @@ public final class Reconnect extends Command implements CommandInfo {
     public CommandType getType() {
         return CommandType.TYPE_SERVER;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getHelp() {
         return "reconnect [reason] - reconnect to this server";
     }
-    
+
 }

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

@@ -35,23 +35,23 @@ import com.dmdirc.ui.interfaces.Window;
 
 /**
  * A command parser that is tailored for use in a channel environment.
- * 
+ *
  * @author chris
  */
 public class ChannelCommandParser extends ChatCommandParser {
-    
+
     /**
      * 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;
-    
+
     /**
      * The channel instance that this parser is attached to.
      */
     private Channel channel;
-    
+
     /**
      * Creates a new instance of ChannelCommandParser.
      *
@@ -70,14 +70,14 @@ public class ChannelCommandParser extends ChatCommandParser {
 
         super.setOwner(owner);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     protected void loadCommands() {
         CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL,
                 CommandType.TYPE_SERVER, CommandType.TYPE_CHANNEL);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     protected void executeCommand(final FrameContainer<?> origin,
@@ -89,5 +89,5 @@ public class ChannelCommandParser extends ChatCommandParser {
             super.executeCommand(origin, window, commandInfo, command, args);
         }
     }
-    
+
 }

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

@@ -38,25 +38,25 @@ import com.dmdirc.ui.interfaces.Window;
  * @author chris
  */
 public class GlobalCommandParser extends CommandParser {
-    
+
     /**
      * 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;
-    
+
     /**
      * The singleton instance of this command parser.
      */
     private static GlobalCommandParser me;
-    
+
     /** {@inheritDoc} */
     @Override
     public void setOwner(final FrameContainer<?> owner) {
         // Don't care
     }
-    
+
     /**
      * Retrieves a singleton instance of the global command parser.
      * @return A GlobalCommandParser
@@ -65,16 +65,16 @@ public class GlobalCommandParser extends CommandParser {
         if (me == null) {
             me = new GlobalCommandParser();
         }
-        
+
         return me;
     }
-    
+
     /** Loads the relevant commands into the parser. */
     @Override
     protected void loadCommands() {
         CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     protected void executeCommand(final FrameContainer<?> origin,
@@ -82,7 +82,7 @@ public class GlobalCommandParser extends CommandParser {
             final Command command, final CommandArguments args) {
         command.execute(origin, args, new CommandContext(window, commandInfo));
     }
-    
+
     /**
      * Called when the input was a line of text that was not a command. This normally
      * means it is sent to the server/channel/user as-is, with no further processing.
@@ -97,5 +97,5 @@ public class GlobalCommandParser extends CommandParser {
             origin.addLine("commandError", "Invalid global command: " + line);
         }
     }
-    
+
 }

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

@@ -39,14 +39,14 @@ import com.dmdirc.ui.interfaces.Window;
  * @author chris
  */
 public class QueryCommandParser extends ChatCommandParser {
-    
+
     /**
      * 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;
-    
+
     /**
      * The query instance that this parser is attached to.
      */
@@ -70,14 +70,14 @@ public class QueryCommandParser extends ChatCommandParser {
 
         super.setOwner(query);
     }
-    
+
     /** Loads the relevant commands into the parser. */
     @Override
     protected void loadCommands() {
         CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL,
                 CommandType.TYPE_SERVER, CommandType.TYPE_QUERY);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     protected void executeCommand(final FrameContainer<?> origin,
@@ -89,5 +89,5 @@ public class QueryCommandParser extends ChatCommandParser {
             super.executeCommand(origin, window, commandInfo, command, args);
         }
     }
-    
+
 }

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

@@ -35,23 +35,23 @@ import com.dmdirc.ui.interfaces.Window;
 
 /**
  * A command parser used in the context of a server.
- * 
+ *
  * @author chris
  */
 public class ServerCommandParser extends GlobalCommandParser {
-    
+
     /**
      * 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;
-    
+
     /**
      * The server instance that this parser is attached to.
      */
     private Server server;
-    
+
     /** {@inheritDoc} */
     @Override
     public void setOwner(final FrameContainer<?> owner) {
@@ -61,13 +61,13 @@ public class ServerCommandParser extends GlobalCommandParser {
 
         super.setOwner(owner);
     }
-    
+
     /** Loads the relevant commands into the parser. */
     @Override
     protected void loadCommands() {
         CommandManager.loadCommands(this, CommandType.TYPE_GLOBAL, CommandType.TYPE_SERVER);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     protected void executeCommand(final FrameContainer<?> origin,
@@ -88,7 +88,7 @@ public class ServerCommandParser extends GlobalCommandParser {
             super.executeCommand(origin, window, commandInfo, command, args);
         }
     }
-    
+
     /**
      * Called when the input was a line of text that was not a command. This normally
      * means it is sent to the server/channel/user as-is, with no further processing.
@@ -99,5 +99,5 @@ public class ServerCommandParser extends GlobalCommandParser {
     protected void handleNonCommand(final FrameContainer<?> origin, final String line) {
         server.sendLine(line);
     }
-    
+
 }

src/com/dmdirc/config/CipherUtils.java

@@ -52,41 +52,41 @@ import net.miginfocom.Base64;
  * Helper class to encrypt and decrypt strings, requests passwords if needed.
  */
 public class CipherUtils {
-    
+
     /** Singleton instance. */
     private static CipherUtils me;
-    
+
     /** Encryption cipher. */
     private Cipher ecipher;
-    
+
     /** Decryption cipher. */
     private Cipher dcipher;
-    
+
     /** Salt. */
     private static final byte[] SALT = {
         (byte) 0xA9, (byte) 0x9B, (byte) 0xC8, (byte) 0x32,
         (byte) 0x56, (byte) 0x35, (byte) 0xE3, (byte) 0x03,
     };
-    
+
     /** Iteration count. */
     private static final int ITERATIONS = 19;
-    
+
     /** Number of auth attemps before failing the attempt. */
     private static final int AUTH_TRIES = 4;
-    
+
     /** User password. */
     private String password;
-    
+
     /**
      * Prevents creation of a new instance of Encipher.
      */
     protected CipherUtils() {
         // Do nothing
     }
-    
+
     /**
      * Retrieves a singleton instance of CipherUtils.
-     * 
+     *
      * @return A singleton cipher utils instance.
      */
     public static CipherUtils getCipherUtils() {
@@ -94,11 +94,11 @@ public class CipherUtils {
             if (me == null) {
                 me = new CipherUtils();
             }
-            
+
             return me;
         }
     }
-    
+
     /**
      * Encrypts a string using the stored settings. Will return null if the
      * automatic user authentication fails - use checkauth and auth.
@@ -125,7 +125,7 @@ public class CipherUtils {
 
         return null;
     }
-    
+
     /**
      * Encrypts a string using the stored settings. Will return null if the
      * automatic user authentication fails - use checkauth and auth.
@@ -149,7 +149,7 @@ public class CipherUtils {
         }
         return null;
     }
-    
+
     /**
      * Performs a SHA-512 hash.
      * @param data String to hashed
@@ -166,7 +166,7 @@ public class CipherUtils {
         }
         return null;
     }
-    
+
     /**
      * Checks if a user is authed.
      *
@@ -175,7 +175,7 @@ public class CipherUtils {
     public boolean checkAuthed() {
         return dcipher != null && ecipher != null;
     }
-    
+
     /**
      * creates ciphers.
      */
@@ -213,7 +213,7 @@ public class CipherUtils {
             dcipher = null;
         }
     }
-    
+
     /**
      * Auths a user and sets the password.
      *
@@ -236,7 +236,7 @@ public class CipherUtils {
                 password = getPassword(prompt);
                 if (passwordHash == null) {
                     passwordHash = hash(password);
-                    IdentityManager.getConfigIdentity().setOption("encryption", 
+                    IdentityManager.getConfigIdentity().setOption("encryption",
                             "passwordHash", passwordHash);
                 }
                 if (!hash(password).equals(passwordHash)) {
@@ -252,10 +252,10 @@ public class CipherUtils {
         }
         return true;
     }
-    
+
     /**
      * Requests the encryption password from the user.
-     * 
+     *
      * @param prompt The prompt to show
      * @return The user-specified password
      */

src/com/dmdirc/config/ConfigManager.java

@@ -101,7 +101,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
         this.network = network;
         this.server = server;
         this.channel = chanName;
-        
+
         sources = IdentityManager.getSources(this);
 
         if (LOGGER.isLoggable(Level.FINE)) {
@@ -219,10 +219,10 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
 
         return null;
     }
-    
+
     /**
      * Checks whether the specified identity applies to this config manager.
-     * 
+     *
      * @param identity The identity to test
      * @return True if the identity applies, false otherwise
      */
@@ -262,7 +262,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
                     + identity.getTarget().getData() + " (" + identity + "). Result: "
                     + result);
         }
-        
+
         return result;
     }
 
@@ -285,7 +285,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
     /**
      * Called whenever there is a new identity available. Checks if the
      * identity is relevant for this manager, and adds it if it is.
-     * 
+     *
      * @param identity The identity to be checked
      */
     public void checkIdentity(final Identity identity) {
@@ -295,7 +295,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
                 identity.addListener(this);
                 Collections.sort(sources);
             }
-            
+
             // Determine which settings will have changed
             for (String domain : identity.getDomains()) {
                 for (String option : identity.getOptions(domain).keySet()) {
@@ -303,7 +303,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
                         configChanged(domain, option);
                     }
                 }
-            }            
+            }
         }
     }
 
@@ -320,7 +320,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
                 res.addAll(source.getDomains());
             }
         }
-        
+
         return res;
     }
 
@@ -368,7 +368,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
                     + this.channel + " to " + protocol + ", " + ircd + ", "
                     + network + ", " + server + ", " + channel);
         }
-        
+
         this.protocol = protocol;
         this.ircd = ircd;
         this.network = network;
@@ -495,5 +495,5 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
     public void identityRemoved(final Identity identity) {
         removeIdentity(identity);
     }
-    
+
 }

src/com/dmdirc/config/Identity.java

@@ -506,7 +506,7 @@ public class Identity extends ConfigSource implements Comparable<Identity> {
                         : file.getKeyDomains().entrySet()) {
                     final String domain = entry.getKey();
 
-                    for (Map.Entry<String, String> subentry : 
+                    for (Map.Entry<String, String> subentry :
                         new HashSet<Map.Entry<String, String>>(entry.getValue().entrySet())) {
                         final String key = subentry.getKey();
                         final String value = subentry.getValue();

src/com/dmdirc/config/IdentityManager.java

@@ -42,27 +42,27 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-    
+
 /**
  * The identity manager manages all known identities, providing easy methods
  * to access them.
- * 
+ *
  * @author chris
  */
 public final class IdentityManager {
-    
+
     /**
      * The identities that have been loaded into this manager.
-     * 
+     *
      * Standard identities are inserted with a <code>null</code> key, custom
      * identities use their custom type as the key.
      */
     private static final MapList<String, Identity> IDENTITIES
             = new MapList<String, Identity>();
-    
+
     /**
      * The {@link IdentityListener}s that have registered with this manager.
-     * 
+     *
      * Listeners for standard identities are inserted with a <code>null</code>
      * key, listeners for a specific custom type use their type as the key.
      */
@@ -72,26 +72,26 @@ public final class IdentityManager {
     /** A logger for this class. */
     private static final java.util.logging.Logger LOGGER = java.util.logging
             .Logger.getLogger(IdentityManager.class.getName());
-    
+
     /** The identity file used for the global config. */
     private static Identity config;
-    
+
     /** The identity file used for addon defaults. */
     private static Identity addonConfig;
 
     /** The identity file bundled with the client containing version info. */
     private static Identity versionConfig;
-    
+
     /** The config manager used for global settings. */
     private static ConfigManager globalconfig;
-    
+
     /** Creates a new instance of IdentityManager. */
     private IdentityManager() {
     }
-    
+
     /**
      * Loads all identity files.
-     * 
+     *
      * @throws InvalidIdentityFileException If there is an error with the config
      *                                      file.
      */
@@ -103,7 +103,7 @@ public final class IdentityManager {
         loadDefaults();
         loadUser();
         loadConfig();
-        
+
         if (getProfiles().size() == 0) {
             try {
                 Identity.buildProfile("Default Profile");
@@ -111,31 +111,31 @@ public final class IdentityManager {
                 Logger.userError(ErrorLevel.FATAL, "Unable to write default profile", ex);
             }
         }
-        
+
         // Set up the identity used for the addons defaults
         final ConfigTarget target = new ConfigTarget();
         target.setGlobalDefault();
         target.setOrder(500000);
-        
+
         final ConfigFile addonConfigFile = new ConfigFile((File) null);
         final Map<String, String> addonSettings = new HashMap<String, String>();
         addonSettings.put("name", "Addon defaults");
         addonConfigFile.addDomain("identity", addonSettings);
-        
+
         addonConfig = new Identity(addonConfigFile, target);
         IdentityManager.addIdentity(addonConfig);
-        
+
         if (!getGlobalConfig().hasOptionString("identity", "defaultsversion")) {
             Logger.userError(ErrorLevel.FATAL, "Default settings "
                     + "could not be loaded");
         }
     }
-    
+
     /** Loads the default (built in) identities. */
     private static void loadDefaults() {
         final String[] targets = {"default", "modealiases"};
         final String dir = getDirectory();
-        
+
         for (String target : targets) {
             File file = new File(dir + target);
 
@@ -191,11 +191,11 @@ public final class IdentityManager {
                     + "formatters: " + ex.getMessage());
         }
     }
-    
+
     /**
      * Extracts the specific set of default identities to the user's identity
      * folder.
-     * 
+     *
      * @param target The target to be extracted
      */
     private static void extractIdentities(final String target) {
@@ -211,17 +211,17 @@ public final class IdentityManager {
 
     /**
      * Retrieves the directory used to store identities in.
-     * 
+     *
      * @return The identity directory path
      */
     public static String getDirectory() {
-        return Main.getConfigDir() + "identities" + System.getProperty("file.separator"); 
+        return Main.getConfigDir() + "identities" + System.getProperty("file.separator");
     }
-    
+
     /** Loads user-defined identity files. */
     public static void loadUser() {
         final File dir = new File(getDirectory());
-        
+
         if (!dir.exists()) {
             try {
                 dir.mkdirs();
@@ -230,13 +230,13 @@ public final class IdentityManager {
                 Logger.userError(ErrorLevel.MEDIUM, "Unable to create identity dir");
             }
         }
-        
+
         loadUser(dir);
     }
-     
+
     /**
      * Recursively loads files from the specified directory.
-     * 
+     *
      * @param dir The directory to be loaded
      */
     @Precondition({
@@ -246,7 +246,7 @@ public final class IdentityManager {
     private static void loadUser(final File dir) {
         Logger.assertTrue(dir != null);
         Logger.assertTrue(dir.isDirectory());
-        
+
         if (dir.listFiles() == null) {
             Logger.userError(ErrorLevel.MEDIUM,
                     "Unable to load user identity files from "
@@ -261,11 +261,11 @@ public final class IdentityManager {
             }
         }
     }
-    
+
     /**
      * Loads an identity from the specified file. If the identity already
      * exists, it is told to reload instead.
-     * 
+     *
      * @param file The file to load the identity from.
      */
     private static void loadIdentity(final File file) {
@@ -286,7 +286,7 @@ public final class IdentityManager {
                 }
             }
         }
-        
+
         try {
             addIdentity(new Identity(file, false));
         } catch (InvalidIdentityFileException ex) {
@@ -341,21 +341,21 @@ public final class IdentityManager {
             Logger.appError(ErrorLevel.FATAL, "Unable to load version information", ex);
         }
     }
-    
+
     /**
      * Loads the config identity.
-     * 
+     *
      * @throws InvalidIdentityFileException if there is a problem with the
      * config file.
      */
     private static void loadConfig() throws InvalidIdentityFileException {
         try {
             final File file = new File(Main.getConfigDir() + "dmdirc.config");
-            
+
             if (!file.exists()) {
                 file.createNewFile();
             }
-            
+
             config = new Identity(file, true);
             config.setOption("identity", "name", "Global config");
             addIdentity(config);
@@ -364,7 +364,7 @@ public final class IdentityManager {
                     + ex.getMessage(), ex);
         }
     }
-    
+
     /**
      * Retrieves the identity used for the global config.
      *
@@ -373,10 +373,10 @@ public final class IdentityManager {
     public static Identity getConfigIdentity() {
         return config;
     }
-    
+
     /**
      * Retrieves the identity used for addons defaults.
-     * 
+     *
      * @return The addons defaults identity
      */
     public static Identity getAddonIdentity() {
@@ -393,7 +393,7 @@ public final class IdentityManager {
     public static Identity getVersionIdentity() {
         return versionConfig;
     }
-    
+
     /**
      * Saves all modified identity files to disk.
      */
@@ -404,7 +404,7 @@ public final class IdentityManager {
             }
         }
     }
-    
+
     /**
      * Adds the specific identity to this manager.
      * @param identity The identity to be added
@@ -431,7 +431,7 @@ public final class IdentityManager {
             }
         }
     }
-    
+
     /**
      * Removes an identity from this manager.
      * @param identity The identity to be removed
@@ -446,18 +446,18 @@ public final class IdentityManager {
         final String group = getGroup(identity);
 
         Logger.assertTrue(IDENTITIES.containsValue(group, identity));
-        
+
         synchronized (IDENTITIES) {
             IDENTITIES.remove(group, identity);
         }
-        
+
         synchronized (LISTENERS) {
             for (IdentityListener listener : LISTENERS.safeGet(group)) {
                 listener.identityRemoved(identity);
             }
         }
     }
-    
+
     /**
      * Adds a config manager to this manager.
      *
@@ -493,12 +493,12 @@ public final class IdentityManager {
     @Precondition("The specified listener is not null")
     public static void addIdentityListener(final String type, final IdentityListener listener) {
         Logger.assertTrue(listener != null);
-        
+
         synchronized (LISTENERS) {
             LISTENERS.add(type, listener);
         }
     }
-    
+
     /**
      * Retrieves a list of identities that serve as profiles.
      *
@@ -521,18 +521,18 @@ public final class IdentityManager {
     public static List<Identity> getCustomIdentities(final String type) {
         return Collections.unmodifiableList(IDENTITIES.safeGet(type));
     }
-    
+
     /**
      * Retrieves a list of all config sources that should be applied to the
      * specified config manager.
-     * 
+     *
      * @param manager The manager requesting sources
      * @return A list of all matching config sources
      */
     public static List<Identity> getSources(final ConfigManager manager) {
-        
+
         final List<Identity> sources = new ArrayList<Identity>();
-        
+
         synchronized (IDENTITIES) {
             for (Identity identity : IDENTITIES.safeGet(null)) {
                 if (manager.identityApplies(identity)) {
@@ -540,12 +540,12 @@ public final class IdentityManager {
                 }
             }
         }
-        
+
         Collections.sort(sources);
-        
+
         return sources;
     }
-    
+
     /**
      * Retrieves the global config manager.
      *
@@ -555,10 +555,10 @@ public final class IdentityManager {
         if (globalconfig == null) {
             globalconfig = new ConfigManager("", "", "", "");
         }
-        
+
         return globalconfig;
     }
-    
+
     /**
      * Retrieves the config for the specified channel@network. The config is
      * created if it doesn't exist.
@@ -576,14 +576,14 @@ public final class IdentityManager {
             throw new IllegalArgumentException("getChannelConfig called "
                     + "with null or empty network\n\nNetwork: " + network);
         }
-        
+
         if (channel == null || channel.isEmpty()) {
             throw new IllegalArgumentException("getChannelConfig called "
                     + "with null or empty channel\n\nChannel: " + channel);
-        }        
+        }
 
         final String myTarget = (channel + "@" + network).toLowerCase();
-        
+
         synchronized (IDENTITIES) {
             for (Identity identity : IDENTITIES.safeGet(null)) {
                 if (identity.getTarget().getType() == ConfigTarget.TYPE.CHANNEL
@@ -592,7 +592,7 @@ public final class IdentityManager {
                 }
             }
         }
-        
+
         // We need to create one
         final ConfigTarget target = new ConfigTarget();
         target.setChannel(myTarget);
@@ -604,7 +604,7 @@ public final class IdentityManager {
             return null;
         }
     }
-    
+
     /**
      * Retrieves the config for the specified network. The config is
      * created if it doesn't exist.
@@ -620,7 +620,7 @@ public final class IdentityManager {
         }
 
         final String myTarget = network.toLowerCase();
-        
+
         synchronized (IDENTITIES) {
             for (Identity identity : IDENTITIES.safeGet(null)) {
                 if (identity.getTarget().getType() == ConfigTarget.TYPE.NETWORK
@@ -629,11 +629,11 @@ public final class IdentityManager {
                 }
             }
         }
-        
+
         // We need to create one
         final ConfigTarget target = new ConfigTarget();
         target.setNetwork(myTarget);
-        
+
         try {
             return Identity.buildIdentity(target);
         } catch (IOException ex) {
@@ -641,11 +641,11 @@ public final class IdentityManager {
             return null;
         }
     }
-    
+
     /**
      * Retrieves the config for the specified server. The config is
      * created if it doesn't exist.
-     * 
+     *
      * @param server The name of the server
      * @return A config source for the server
      */
@@ -655,9 +655,9 @@ public final class IdentityManager {
             throw new IllegalArgumentException("getServerConfig called "
                     + "with null or empty server\n\nServer: " + server);
         }
-        
+
         final String myTarget = server.toLowerCase();
-        
+
         synchronized (IDENTITIES) {
             for (Identity identity : IDENTITIES.safeGet(null)) {
                 if (identity.getTarget().getType() == ConfigTarget.TYPE.SERVER
@@ -666,17 +666,17 @@ public final class IdentityManager {
                 }
             }
         }
-        
+
         // We need to create one
         final ConfigTarget target = new ConfigTarget();
         target.setServer(myTarget);
-        
+
         try {
             return Identity.buildIdentity(target);
         } catch (IOException ex) {
             Logger.userError(ErrorLevel.HIGH, "Unable to create network identity", ex);
             return null;
         }
-    }    
-    
+    }
+
 }

src/com/dmdirc/config/prefs/PreferencesManager.java

@@ -145,12 +145,12 @@ public class PreferencesManager {
                 "Show a confirmation message when you try to close the client"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "channel", "splitusermodes", "Split user modes",
-                "Show individual mode lines for each mode change that affects" +
-                " a user (e.g. op, devoice)"));
+                "Show individual mode lines for each mode change that affects"
+                + " a user (e.g. op, devoice)"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "channel", "sendwho", "Send channel WHOs",
-                "Request information (away state, hostname, etc) on channel " +
-                "users automatically"));
+                "Request information (away state, hostname, etc) on channel "
+                + "users automatically"));
         category.addSetting(new PreferencesSetting(PreferencesType.DURATION,
                 "general", "whotime", "Who request interval",
                 "How often to send WHO requests for a channel (if enabled)"));
@@ -165,8 +165,8 @@ public class PreferencesManager {
                 "Show an indicator in windows when you are marked as away"));
         category.addSetting(new PreferencesSetting(PreferencesType.OPTIONALINTEGER,
                 new OptionalValidator(new NumericalValidator(0, 100)), "ui", "pasteProtectionLimit",
-                "Paste protection trigger", "Confirm pasting of text that " +
-                "contains more than this many lines."));
+                "Paste protection trigger", "Confirm pasting of text that "
+                + "contains more than this many lines."));
 
         addTabCompletionCategory(category);
         addCategory(category.setInlineAfter());
@@ -186,15 +186,15 @@ public class PreferencesManager {
         }
 
         category.addSetting(new PreferencesSetting("tabcompletion", "style",
-                "Tab completion style", "Determines the behaviour of " +
-                "the tab completer when there are multiple matches", taboptions));
+                "Tab completion style", "Determines the behaviour of "
+                + "the tab completer when there are multiple matches", taboptions));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "tabcompletion", "casesensitive", "Case-sensitive tab completion",
                 "Respect case when tab completing"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "tabcompletion", "allowempty", "Allow empty tab completion",
-                "Attempt to tab complete when the Tab key is pressed even " +
-                "if there is nothing to complete"));
+                "Attempt to tab complete when the Tab key is pressed even "
+                + "if there is nothing to complete"));
 
         parent.addSubCategory(category.setInline());
     }
@@ -211,27 +211,27 @@ public class PreferencesManager {
                 "Close channel windows when you manually disconnect from the server"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "general", "closechannelsondisconnect",
-                "Close channels on disconnect", "Close channel windows when " +
-                "the server is disconnected (because of an error)"));
+                "Close channels on disconnect", "Close channel windows when "
+                + "the server is disconnected (because of an error)"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "general", "closequeriesonquit", "Close queries on quit",
                 "Close query windows when you manually disconnect from the server"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "general", "closequeriesondisconnect",
-                "Close queries on disconnect", "Close query windows when " +
-                "the server is disconnected (because of an error)"));
+                "Close queries on disconnect", "Close query windows when "
+                + "the server is disconnected (because of an error)"));
         category.addSetting(new PreferencesSetting(PreferencesType.DURATION,
                 "server", "pingtimer", "Ping warning time",
-                "How long to wait after a ping reply is sent before showing " +
-                "a warning message"));
+                "How long to wait after a ping reply is sent before showing "
+                + "a warning message"));
         category.addSetting(new PreferencesSetting(PreferencesType.DURATION,
                 "server", "pingtimeout", "Ping timeout",
-                "How long to wait for a server to reply to a PING request " +
-                "before assuming the server has died"));
+                "How long to wait for a server to reply to a PING request "
+                + "before assuming the server has died"));
         category.addSetting(new PreferencesSetting(PreferencesType.DURATION,
                 "server", "pingfrequency", "Ping frequency",
-                "How often a PING request should be sent to the server (to " +
-                "check that it is still alive)"));
+                "How often a PING request should be sent to the server (to "
+                + "check that it is still alive)"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "general", "reconnectonconnectfailure", "Reconnect on failure",
                 "Attempt to reconnect if there is an error when connecting"));
@@ -381,8 +381,8 @@ public class PreferencesManager {
 
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "browser", "uselaunchdelay", "Use browser launch delay",
-                "Enable delay between browser launches (to prevent mistakenly" +
-                " double clicking)"));
+                "Enable delay between browser launches (to prevent mistakenly"
+                + " double clicking)"));
         category.addSetting(new PreferencesSetting(PreferencesType.DURATION,
                 "browser", "launchdelay", "Browser launch delay",
                 "Minimum time between opening of URLs if enabled"));
@@ -393,8 +393,8 @@ public class PreferencesManager {
                 "general", "logerrors", "Log errors to disk",
                 "Save copies of all client errors to disk"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "ui", "quickCopy", "Quick copy", "Automatically copy" +
-                " text that's selected when the mouse button is released"));
+                "ui", "quickCopy", "Quick copy", "Automatically copy"
+                + " text that's selected when the mouse button is released"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "ui", "showversion", "Show version",
                 "Show the current DMDirc version in the titlebar"));
@@ -420,11 +420,11 @@ public class PreferencesManager {
         category.addSetting(new PreferencesSetting("general", "ui", "Active UI",
                 "User interface to use", uiOptions).setRestartNeeded());
         category.addSetting(new PreferencesSetting(PreferencesType.COLOUR,
-                "ui", "backgroundcolour", "Background colour", "Default " +
-                "background colour to use"));
+                "ui", "backgroundcolour", "Background colour", "Default "
+                + "background colour to use"));
         category.addSetting(new PreferencesSetting(PreferencesType.COLOUR,
-                "ui", "foregroundcolour", "Foreground colour", "Default " +
-                "foreground colour to use"));
+                "ui", "foregroundcolour", "Foreground colour", "Default "
+                + "foreground colour to use"));
         category.addSetting(new PreferencesSetting(PreferencesType.OPTIONALCOLOUR,
                 "ui", "inputbackgroundcolour", "Input background colour",
                 "Default background colour to use for input fields"));
@@ -457,20 +457,20 @@ public class PreferencesManager {
      * @since 0.6.4
      */
     private void addStyleSubCategory(PreferencesCategory parent) {
-        final PreferencesCategory category = new PreferencesCategory("Link styles" +
-                " and colours", "");
+        final PreferencesCategory category = new PreferencesCategory("Link styles"
+                + " and colours", "");
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "ui", "stylelinks", "Style hyperlinks", "Style hyperlinks in " +
-                "text areas with underlines"));
+                "ui", "stylelinks", "Style hyperlinks", "Style hyperlinks in "
+                + "text areas with underlines"));
         category.addSetting(new PreferencesSetting(PreferencesType.OPTIONALCOLOUR,
-                "ui", "linkcolour", "Hyperlink colour", "Default colour to use " +
-                "for hyperlinks in the text area"));
+                "ui", "linkcolour", "Hyperlink colour", "Default colour to use "
+                + "for hyperlinks in the text area"));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "ui", "stylechannels", "Style channel links", "Styles channel " +
-                "links in text areas with underlines"));
+                "ui", "stylechannels", "Style channel links", "Styles channel "
+                + "links in text areas with underlines"));
         category.addSetting(new PreferencesSetting(PreferencesType.OPTIONALCOLOUR,
-                "ui", "channelcolour", "Channel link colour", "Default colour to use " +
-                "for channel links in the text area"));
+                "ui", "channelcolour", "Channel link colour", "Default colour to use "
+                + "for channel links in the text area"));
 
         parent.addSubCategory(category.setInline());
     }

src/com/dmdirc/config/prefs/PreferencesSetting.java

@@ -32,47 +32,47 @@ import java.util.Map;
 
 /**
  * Represents a single setting.
- * 
+ *
  * @author chris
  */
 public class PreferencesSetting {
-    
+
     /** The type of this setting. */
     protected final PreferencesType type;
-    
+
     /** The possible options for a multichoice setting. */
     protected final Map<String, String> combooptions;
 
     /** The validator to use to validate this setting. */
     protected final Validator<String> validator;
-    
+
     /** The domain of the setting. */
     protected final String domain;
-    
+
     /** The option name of the setting. */
     protected final String option;
-    
+
     /** The title of this setting. */
     protected final String title;
-    
+
     /** Text to inform the user what the setting is for. */
     protected final String helptext;
-    
+
     /** The current value of the setting. */
     protected String current;
-    
+
     /** The original value of this vsetting. */
     private String original;
-    
+
     /** Whether or not we need a restart. */
     protected boolean restartNeeded;
-    
+
     /** A list of change listeners. */
     private final List<SettingChangeListener> listeners = new ArrayList<SettingChangeListener>();
 
     /**
      * Creates a new preferences setting for any type except multi-choice.
-     * 
+     *
      * @param type The type of the setting to create
      * @param validator A validator to validate the setting's value
      * @param domain The domain of the setting
@@ -84,10 +84,10 @@ public class PreferencesSetting {
             final Validator<String> validator, final String domain,
             final String option, final String title, final String helptext) {
         if (PreferencesType.MULTICHOICE.equals(type)) {
-            throw new IllegalArgumentException("Multi-choice preferences must " +
-                    "have their options specified.");
+            throw new IllegalArgumentException("Multi-choice preferences must "
+                    + "have their options specified.");
         }
-        
+
         this.type = type;
         this.combooptions = null;
         this.validator = validator;
@@ -95,15 +95,15 @@ public class PreferencesSetting {
         this.option = option;
         this.title = title;
         this.helptext = helptext;
-        
+
         current = IdentityManager.getGlobalConfig().getOption(domain, option);
         original = current;
     }
-    
+
     /**
      * Creates a new preferences setting for any type except multi-choice, with
      * a default permissive validator.
-     * 
+     *
      * @param type The type of the setting to create
      * @param domain The domain of the setting
      * @param option The option name of the setting
@@ -113,10 +113,10 @@ public class PreferencesSetting {
     public PreferencesSetting(final PreferencesType type, final String domain,
             final String option, final String title, final String helptext) {
         if (PreferencesType.MULTICHOICE.equals(type)) {
-            throw new IllegalArgumentException("Multi-choice preferences must " +
-                    "have their options specified.");
+            throw new IllegalArgumentException("Multi-choice preferences must "
+                    + "have their options specified.");
         }
-        
+
         this.type = type;
         this.combooptions = null;
         this.validator = new PermissiveValidator<String>();
@@ -124,14 +124,14 @@ public class PreferencesSetting {
         this.option = option;
         this.title = title;
         this.helptext = helptext;
-        
+
         current = IdentityManager.getGlobalConfig().getOption(domain, option);
         original = current;
-    }    
-    
+    }
+
     /**
      * Creates a new preferences setting for multi-choice preferences.
-     * 
+     *
      * @param domain The domain of the setting
      * @param option The option name of the setting
      * @param options A map of setting values to display names for this setting
@@ -148,18 +148,18 @@ public class PreferencesSetting {
         this.option = option;
         this.title = title;
         this.helptext = helptext;
-        
+
         current = IdentityManager.getGlobalConfig().getOption(domain, option);
         original = current;
-        
+
         if (!combooptions.containsKey(current)) {
             combooptions.put(current, "Current (" + current + ")");
         }
-    }    
+    }
 
     /**
      * Retrieves the possible options for use in a multi-choice preference.
-     * 
+     *
      * @return A map of setting values to display names, representing the
      * possible options for this setting.
      */
@@ -169,7 +169,7 @@ public class PreferencesSetting {
 
     /**
      * Retrieves the help text for this setting.
-     * 
+     *
      * @return This setting's help text.
      */
     public String getHelptext() {
@@ -178,7 +178,7 @@ public class PreferencesSetting {
 
     /**
      * Retrieves the title of this setting.
-     * 
+     *
      * @return This setting's title.
      */
     public String getTitle() {
@@ -187,7 +187,7 @@ public class PreferencesSetting {
 
     /**
      * Retrieves the current value of this setting.
-     * 
+     *
      * @return The current value of this setting.
      */
     public String getValue() {
@@ -196,7 +196,7 @@ public class PreferencesSetting {
 
     /**
      * Retieves the type of this setting.
-     * 
+     *
      * @return This setting's type.
      */
     public PreferencesType getType() {
@@ -205,22 +205,22 @@ public class PreferencesSetting {
 
     /**
      * Returns a validator that can validate this setting.
-     * 
+     *
      * @return This setting's validator.
      */
     public Validator<String> getValidator() {
         return validator;
     }
-    
+
     /**
      * Sets the current value of this setting. Note that the setting is not
      * saved to the configuration file until the save method is called.
-     * 
+     *
      * @param newValue The new value of the setting
      */
     public void setValue(final String newValue) {
         current = newValue;
-        
+
         for (SettingChangeListener listener : listeners) {
             listener.settingChanged(this);
         }
@@ -228,7 +228,7 @@ public class PreferencesSetting {
 
     /**
      * Determines whether or not this setting needs a restart when it's changed.
-     * 
+     *
      * @return True if this setting needs a restart, false otherwise
      */
     public boolean isRestartNeeded() {
@@ -238,35 +238,35 @@ public class PreferencesSetting {
     /**
      * Sets the "restart needed" flag for this setting, indicating a client
      * restart is needed before the setting takes effect.
-     * 
+     *
      * @return A reference to this setting, for convenience
      */
     public PreferencesSetting setRestartNeeded() {
         restartNeeded = true;
         return this;
     }
-    
+
     /**
      * Registers the specified setting change listener.
-     * 
+     *
      * @param listener The listener to be registered
      * @return A reference to this setting, for convenience
      */
     public PreferencesSetting registerChangeListener(final SettingChangeListener listener) {
         listeners.add(listener);
         return this;
-    }    
-    
+    }
+
     /**
      * Saves the current value of this setting to the global configuration.
-     * 
+     *
      * @return True if the setting has changed, false otherwise
      */
     public boolean save() {
         if (!needsSaving()) {
             return false;
         }
-        
+
         if (current == null) {
             IdentityManager.getConfigIdentity().unsetOption(domain, option);
         } else {
@@ -276,7 +276,7 @@ public class PreferencesSetting {
         original = current;
         return true;
     }
-    
+
     /**
      * Dismisses changes to this setting.
      */
@@ -285,17 +285,17 @@ public class PreferencesSetting {
                 || (original == null && current == null)) {
             return;
         }
-        
+
         current = original;
-        
+
         for (SettingChangeListener listener : listeners) {
             listener.settingChanged(this);
         }
     }
-    
+
     /**
      * Does the setting need saving?
-     * 
+     *
      * @return true iif the setting will be changed if saved
      */
     public boolean needsSaving() {

src/com/dmdirc/config/prefs/SettingChangeListener.java

@@ -24,14 +24,14 @@ package com.dmdirc.config.prefs;
 
 /**
  * Defines the methods required for setting change listeners.
- * 
+ *
  * @author chris
  */
 public interface SettingChangeListener {
-    
+
     /**
      * Called to indicate that the specified setting has changed.
-     * 
+     *
      * @param setting The setting that was changed
      */
     void settingChanged(final PreferencesSetting setting);

src/com/dmdirc/config/prefs/validator/FileNameValidator.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

src/com/dmdirc/config/prefs/validator/IdentValidator.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

src/com/dmdirc/config/prefs/validator/NumericalValidator.java

@@ -23,20 +23,20 @@ package com.dmdirc.config.prefs.validator;
 
 /**
  * Validates that a number is within certain bounds.
- * 
+ *
  * @author chris
  */
 public class NumericalValidator implements Validator<String> {
-    
+
     /** The minimum value for this number. */
     protected final int min;
-    
+
     /** The maximum value for this number. */
     protected final int max;
 
     /**
      * Creates a new numerical validator with the specified bounds.
-     * 
+     *
      * @param min The minimum value for the number, or -1 for unlimited.
      * @param max The maximum value for the number, or -1 for unlimited.
      */
@@ -47,7 +47,7 @@ public class NumericalValidator implements Validator<String> {
 
     /**
      * Retrieves the maximum value that this validator will allow.
-     * 
+     *
      * @return This validator's maximum value
      */
     public int getMax() {
@@ -56,24 +56,24 @@ public class NumericalValidator implements Validator<String> {
 
     /**
      * Retrieves the minimum value that this validator will allow.
-     * 
+     *
      * @return This validator's minimum value
-     */    
+     */
     public int getMin() {
         return min == -1 ? Integer.MIN_VALUE : min;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public ValidationResponse validate(final String object) {
         int intv;
-        
+
         try {
             intv = Integer.parseInt(object);
         } catch (NumberFormatException ex) {
             return new ValidationResponse("Must be a valid number");
         }
-        
+
         if (intv < min && min != -1) {
             return new ValidationResponse("Must be at least " + min);
         } else if (intv > max && max != -1) {

src/com/dmdirc/config/prefs/validator/PortValidator.java

@@ -23,14 +23,14 @@ package com.dmdirc.config.prefs.validator;
 
 /**
  * Validates a port number.
- * 
+ *
  * @author chris
  */
 public class PortValidator extends NumericalValidator {
-    
+
     /** The minimum port number. */
     private static final int MIN_PORT = 1;
-    
+
     /** The maximum port number. */
     private static final int MAX_PORT = 65535;
 

src/com/dmdirc/config/prefs/validator/RegexValidator.java

@@ -24,7 +24,7 @@ package com.dmdirc.config.prefs.validator;
 
 /**
  * Validates a regular expression.
- * 
+ *
  * @author chris
  */
 public class RegexValidator implements Validator<String> {
@@ -35,7 +35,7 @@ public class RegexValidator implements Validator<String> {
         try {
             // Is there a proper way of doing this, as opposed to just seeing
             // if it breaks?
-            
+
             "abc".matches(object);
             return new ValidationResponse();
         } catch (Exception ex) {

src/com/dmdirc/config/prefs/validator/ValidationResponse.java

@@ -24,42 +24,42 @@ package com.dmdirc.config.prefs.validator;
 /**
  * Describes the response from a Validator. The response may be either positive
  * or negative. Negative responses have an associated failure reason.
- * 
+ *
  * @author chris
  */
 public class ValidationResponse {
-   
+
     /** The failure reason, or null if the validation passed. */
     private final String failure;
-    
+
     /**
      * Creates a new ValidationResponse for a positive response.
      */
     public ValidationResponse() {
         this.failure = null;
     }
-    
+
     /**
      * Creates a new ValidationResponse for a negative response.
-     * 
+     *
      * @param failure The reason for the negative response.
      */
     public ValidationResponse(final String failure) {
         this.failure = failure;
     }
-    
+
     /**
      * Determines whether or not this response indicates that a failure occured.
-     * 
+     *
      * @return True if a failure occured, false otherwise.
      */
     public boolean isFailure() {
         return failure != null;
     }
-    
+
     /**
      * Retrieves the reason for the validation failure.
-     * 
+     *
      * @return The reason for the validation failure.
      */
     public String getFailureReason() {

src/com/dmdirc/config/prefs/validator/Validator.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
@@ -24,16 +24,16 @@ package com.dmdirc.config.prefs.validator;
 
 /**
  * Validator interface.
- * 
+ *
  * @param V Type to validate
  */
 public interface Validator<V> {
 
     /**
      * Validates the object.
-     * 
+     *
      * @param object Object to validate
-     * 
+     *
      * @return A validation response indicating the success/failure of the
      * validation
      */

src/com/dmdirc/config/prefs/validator/ValidatorChain.java

@@ -27,19 +27,19 @@ import java.util.List;
 
 /**
  * Allows multiple validators to be chained together.
- * 
+ *
  * @param A The type of class that this chain validates
  * @author chris
  */
 public class ValidatorChain<A> implements Validator<A> {
-    
+
     /** A list of validators to use. */
     private final List<Validator<A>> validatorList
             = new ArrayList<Validator<A>>();
 
     /**
      * Creates a new validator chain containing the specified validators.
-     * 
+     *
      * @param validators The validators to be used in this chain.
      */
     public ValidatorChain(final Validator<A> ... validators) {
@@ -53,12 +53,12 @@ public class ValidatorChain<A> implements Validator<A> {
     public ValidationResponse validate(final A object) {
         for (Validator<A> validator : validatorList) {
             final ValidationResponse res = validator.validate(object);
-            
+
             if (res.isFailure()) {
                 return res;
             }
         }
-        
+
         return new ValidationResponse();
     }
 

src/com/dmdirc/installer/DefaultSettings.java

@@ -32,29 +32,29 @@ public class DefaultSettings implements Settings {
     /** {@inheritDoc} */
     @Override
     public boolean getShortcutMenuState() {
-        return (CLIParser.getCLIParser().getParamNumber("-no-shortcut-menu") ==
-                0);
+        return CLIParser.getCLIParser().getParamNumber("-no-shortcut-menu")
+                == 0;
     }
 
     /** {@inheritDoc} */
     @Override
     public boolean getShortcutDesktopState() {
-        return (CLIParser.getCLIParser().getParamNumber("-no-shortcut-desktop") ==
-                0);
+        return CLIParser.getCLIParser().getParamNumber("-no-shortcut-desktop")
+                == 0;
     }
 
     /** {@inheritDoc} */
     @Override
     public boolean getShortcutQuickState() {
-        return (CLIParser.getCLIParser().getParamNumber(
-                "-no-shortcut-quicklaunch") == 0);
+        return CLIParser.getCLIParser().getParamNumber("-no-shortcut-quicklaunch")
+                == 0;
     }
 
     /** {@inheritDoc} */
     @Override
     public boolean getShortcutProtocolState() {
-        return (CLIParser.getCLIParser().getParamNumber("-no-shortcut-protocol") ==
-                0);
+        return CLIParser.getCLIParser().getParamNumber("-no-shortcut-protocol")
+                == 0;
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/installer/Installer.java

@@ -99,12 +99,12 @@ public abstract class Installer extends Thread {
 
         if (Main.getInstaller().supportsShortcut(ShortcutType.MENU)) {
             if (settings.getShortcutMenuState()) {
-                step.addText("Setting up " + Main.getInstaller().getMenuName() +
-                             " shortcut");
+                step.addText("Setting up " + Main.getInstaller().getMenuName()
+                        + " shortcut");
                 setupShortcut(location, ShortcutType.MENU);
             } else {
-                step.addText("Not setting up " +
-                             Main.getInstaller().getMenuName() + " shortcut");
+                step.addText("Not setting up "
+                        + Main.getInstaller().getMenuName() + " shortcut");
             }
         }
 

src/com/dmdirc/installer/InstallerListener.java

@@ -1,17 +1,17 @@
 /*
- * 
+ *
  * 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
@@ -93,20 +93,19 @@ public class InstallerListener implements WizardListener, StepListener {
                     getMenuName() + " shortcut\n";
         }
 
-        if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP) &&
-            settings.getShortcutDesktopState()) {
+        if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP)
+                && settings.getShortcutDesktopState()) {
             shortcutText = shortcutText + " - Create desktop shortcut\n";
         }
 
-        if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH) &&
-            settings.getShortcutQuickState()) {
+        if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH)
+                && settings.getShortcutQuickState()) {
             shortcutText = shortcutText + " - Create Quick Launch shortcut\n";
         }
 
-        if (Main.getInstaller().supportsShortcut(ShortcutType.PROTOCOL) &&
-            settings.getShortcutProtocolState()) {
-            shortcutText = shortcutText +
-                           " - Make DMDirc handle irc:// links\n";
+        if (Main.getInstaller().supportsShortcut(ShortcutType.PROTOCOL)
+                && settings.getShortcutProtocolState()) {
+            shortcutText = shortcutText + " - Make DMDirc handle irc:// links\n";
         }
 
 
@@ -117,16 +116,16 @@ public class InstallerListener implements WizardListener, StepListener {
             final TextStep textStep = (TextStep) step;
             if (installLocation.isEmpty()) {
                 textStep.setText(
-                        "You have chosen an invalid install location\n\n" +
-                        "Please press the \"Previous\" button to go back and correct it.");
+                        "You have chosen an invalid install location\n\n"
+                        + "Please press the \"Previous\" button to go back and correct it.");
                Main.getWizardFrame().enableNextStep(false);
             } else {
                 textStep.setText(
-                        "Please review your chosen settings:\n\n" +
-                        " - Install Location:\n" + "    " + installLocation +
-                        "\n" + shortcutText + "\n" + "If you wish to change " +
-                        "any of these settings, press the \"Previous\" " +
-                        "button, otherwise click \"Next\" to begin the installation");
+                        "Please review your chosen settings:\n\n"
+                        + " - Install Location:\n" + "    " + installLocation
+                        + "\n" + shortcutText + "\n" + "If you wish to change "
+                        + "any of these settings, press the \"Previous\" "
+                        + "button, otherwise click \"Next\" to begin the installation");
                 Main.getWizardFrame().enableNextStep(true);
            }
         }

src/com/dmdirc/installer/WindowsInstaller.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 java.util.ArrayList;
 
 /**
  * Installs DMDirc on windows
- * 
+ *
  * @author Shane Mc Cormack
  */
 public class WindowsInstaller extends Installer {
@@ -70,7 +70,7 @@ public class WindowsInstaller extends Installer {
 
     /**
      * Are we running vista? -_-
-     * 
+     *
      * @return True if this is vista.
      */
     public boolean isVista() {
@@ -79,7 +79,7 @@ public class WindowsInstaller extends Installer {
 
     /**
      * Are we running NT?
-     * 
+     *
      * @return True if this is NT.
      */
     public boolean isNT() {
@@ -118,7 +118,7 @@ public class WindowsInstaller extends Installer {
 
     /**
      * Add a registry key.
-     * 
+     *
      * @param key
      *            Key to add.
      */
@@ -130,7 +130,7 @@ public class WindowsInstaller extends Installer {
 
     /**
      * Modify a registry value.
-     * 
+     *
      * @param key
      *            Key to use.
      * @param value
@@ -145,7 +145,7 @@ public class WindowsInstaller extends Installer {
 
     /**
      * Modify a registry value.
-     * 
+     *
      * @param key
      *            Key to use.
      * @param value
@@ -181,7 +181,7 @@ public class WindowsInstaller extends Installer {
 
     /**
      * Execute and wait for the requested command
-     * 
+     *
      * @param cmd
      *            Command array to execute/
      * @return return value from command, or -1 if there was an error.

src/com/dmdirc/installer/cliparser/CLIParser.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Shane Mc Cormack
- * 
+ *
  * 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
@@ -57,7 +57,7 @@ public class CLIParser {
 
     /**
      * Get a reference to the CLIParser.
-     * 
+     *
      * @return CLI parser instance
      */
     public static synchronized CLIParser getCLIParser() {
@@ -80,7 +80,7 @@ public class CLIParser {
 
     /**
      * Add a CLIParam to the cliparser.
-     * 
+     *
      * @param param
      *            CLIParam sub-class to use as a parameter.
      * @return true if added, false if already exists.
@@ -108,7 +108,7 @@ public class CLIParser {
      * Get the number of times a param was given.
      * In the case of params with both a char and string value, this number is
      * the total for both.
-     * 
+     *
      * @param flag
      *            Flag to get count for
      * @return number, or -1 if the param is invalud
@@ -123,7 +123,7 @@ public class CLIParser {
 
     /**
      * Get a CLIParam object for a given flag.
-     * 
+     *
      * @param flag
      *            Flag to get param for
      * @return CLIParam object, or null if there is none.
@@ -138,7 +138,7 @@ public class CLIParser {
 
     /**
      * Get the list of params.
-     * 
+     *
      * @return list of params.
      */
     public List<CLIParam> getParamList() {
@@ -147,7 +147,7 @@ public class CLIParser {
 
     /**
      * Get the list of redundant strings.
-     * 
+     *
      * @return list of redundant strings.
      */
     public List<String> getRedundant() {
@@ -160,7 +160,7 @@ public class CLIParser {
 
     /**
      * Set the "help" command.
-     * 
+     *
      * @param param
      *            Param to look for in wantsHelp.
      */
@@ -170,9 +170,9 @@ public class CLIParser {
 
     /**
      * Check if the help parameter has been passed to the CLI.
-     * 
+     *
      * @param args Command line arguments to parse
-     * 
+     *
      * @return true iif help param is passed
      */
     public boolean wantsHelp(final String[] args) {
@@ -220,7 +220,7 @@ public class CLIParser {
 
     /**
      * Given a string array of arguments, parse as CLI Params.
-     * 
+     *
      * @param args
      *            Arguments to pass
      * @param strict

src/com/dmdirc/installer/cliparser/IntegerParam.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Shane Mc Cormack
- * 
+ *
  * 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
@@ -31,7 +31,7 @@ public class IntegerParam extends CLIParam {
 
     /**
      * Create a new IntegerParam.
-     * 
+     *
      * @param chr
      *            Single Character flag for this param.
      * @param str
@@ -45,7 +45,7 @@ public class IntegerParam extends CLIParam {
 
     /**
      * Set the value of this param to the value given by a string.
-     * 
+     *
      * @param value
      *            String taken from command line to use as value.
      * @return true if value was valid, else false.
@@ -62,7 +62,7 @@ public class IntegerParam extends CLIParam {
 
     /**
      * Get the value of this param.
-     * 
+     *
      * @return Value of this parameter
      */
     public int getValue() {
@@ -71,7 +71,7 @@ public class IntegerParam extends CLIParam {
 
     /**
      * Return the value of this param as a string.
-     * 
+     *
      * @return The value of this param as a string.
      */
     @Override

src/com/dmdirc/installer/ui/InstallerDialog.java

@@ -1,17 +1,17 @@
 /*
- * 
+ *
  * 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
@@ -60,7 +60,7 @@ public class InstallerDialog extends JFrame implements ActionListener {
 
     /**
      * Instantiates a new installer dialog
-     * 
+     *
      * @param dialogTitle
      */
     public InstallerDialog(final String dialogTitle) {
@@ -74,13 +74,13 @@ public class InstallerDialog extends JFrame implements ActionListener {
 
 
         title.setBorder(BorderFactory.createCompoundBorder(
-                BorderFactory.createEmptyBorder(SMALL_GAP, SMALL_GAP,SMALL_GAP,
+                BorderFactory.createEmptyBorder(SMALL_GAP, SMALL_GAP, SMALL_GAP,
                 SMALL_GAP), title.getBorder()));
         wizard.setBorder(BorderFactory.createCompoundBorder(
-                BorderFactory.createEmptyBorder(SMALL_GAP, SMALL_GAP,SMALL_GAP,
+                BorderFactory.createEmptyBorder(SMALL_GAP, SMALL_GAP, SMALL_GAP,
                 SMALL_GAP), wizard.getBorder()));
         control.setBorder(BorderFactory.createCompoundBorder(
-                BorderFactory.createEmptyBorder(SMALL_GAP, SMALL_GAP,SMALL_GAP,
+                BorderFactory.createEmptyBorder(SMALL_GAP, SMALL_GAP, SMALL_GAP,
                 SMALL_GAP), control.getBorder()));
 
         add(title, BorderLayout.NORTH);
@@ -99,7 +99,7 @@ public class InstallerDialog extends JFrame implements ActionListener {
 
     /**
      * Adds a step.
-     * 
+     *
      * @param step Step to add
      */
     public void addStep(final SwingStep step) {
@@ -132,7 +132,7 @@ public class InstallerDialog extends JFrame implements ActionListener {
 
     /**
      * Displays the installer with these steps added.
-     * 
+     *
      * @param steps Steps to add
      */
     public void display(final List<Step> steps) {
@@ -165,7 +165,7 @@ public class InstallerDialog extends JFrame implements ActionListener {
 
     /**
      * shows the cancel confirmation.
-     * 
+     *
      * @return true if confirmed
      */
     public boolean showCancelConfirmation() {
@@ -239,7 +239,7 @@ public class InstallerDialog extends JFrame implements ActionListener {
 
     /**
      * Informs listeners a step is about to be hidden.
-     * 
+     *
      * @param step Step to be hidden
      */
     void fireStepHidden(final Step step) {
@@ -250,7 +250,7 @@ public class InstallerDialog extends JFrame implements ActionListener {
 
     /**
      * Adds a step listener to this installer.
-     * 
+     *
      * @param listener Listener to add
      */
     public void addStepListener(final StepListener listener) {
@@ -296,7 +296,7 @@ public class InstallerDialog extends JFrame implements ActionListener {
 
     /**
      * Removes  a wizard listener from this installer
-     * 
+     *
      * @param listener Listener to remove
      */
     public void removeWizardListener(final WizardListener listener) {
@@ -326,7 +326,7 @@ public class InstallerDialog extends JFrame implements ActionListener {
         } catch (IllegalAccessException ex) {
             throw new UnsupportedOperationException("Unable to switch to the " +
                                                     "system look and feel", ex);
-        }   
+        }
 
         UIManager.put("swing.useSystemFontSettings", true);
         UIManager.put("swing.boldMetal", false);

src/com/dmdirc/installer/ui/StepLayout.java

@@ -62,7 +62,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Instantiates a new step layout.
-     * 
+     *
      * @param parent Parent component
      */
     public StepLayout(final Container parent) {
@@ -71,7 +71,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Instantiates a new step layout with the specified gaps.
-     * 
+     *
      * @param hGap Horizontal gap
      * @param vGap Vertical gap
      */
@@ -81,7 +81,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Instantiates a new step layout with the specified gaps.
-     * 
+     *
      * @param hGap Horizontal gap
      * @param vGap Vertical gap
      * @param parent Parent component
@@ -95,7 +95,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Returns the number of steps in the layout.
-     * 
+     *
      * @return number of steps >= 0
      */
     public int size() {
@@ -104,7 +104,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Checks if the layout is empty
-     * 
+     *
      * @return true iif the layout has no steps
      */
     public boolean isEmpty() {
@@ -113,9 +113,9 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Returns the specified step from the layout.
-     * 
+     *
      * @param index Step to retrieve
-     * 
+     *
      * @return Step
      */
     public Step getStep(final int index) {
@@ -124,7 +124,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Returns the step list.
-     * 
+     *
      * @return List of steps
      */
     public List<SwingStep> getSteps() {
@@ -160,7 +160,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Show the first step.
-     * 
+     *
      * @param parent Parent container
      */
     public void first(final Container parent) {
@@ -169,7 +169,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Show the last step.
-     * 
+     *
      * @param parent Parent container
      */
     public void last(final Container parent) {
@@ -178,16 +178,16 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Show the next step.
-     * 
+     *
      * @param parent Parent container
      */
     public void next(final Container parent) {
         show(currentStep + 1, parent);
     }
 
-    /** 
+    /**
      * Show the previous step.
-     * 
+     *
      * @param parent Parent container
      */
     public void previous(final Container parent) {
@@ -196,7 +196,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Show the specified step.
-     * 
+     *
      * @param step Step to show
      * @param parent Parent container
      */
@@ -206,7 +206,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Show the step at the specified index.
-     * 
+     *
      * @param step Step to show
      * @param parent Parent container
      */
@@ -247,12 +247,12 @@ public class StepLayout implements LayoutManager2, Serializable {
         addLayoutComponent((SwingStep) comp);
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
-     * @deprecated Use addLayoutComponent(Component, Object) or 
+     *
+     * @deprecated Use addLayoutComponent(Component, Object) or
      * addLayoutComponent(Component)
-     * 
+     *
      * @see addLayoutComponent(Component)
      * @see addLayoutComponent(Component, Object)
      */
@@ -268,7 +268,7 @@ public class StepLayout implements LayoutManager2, Serializable {
 
     /**
      * Adds a component to the layout.
-     * 
+     *
      * @param step Component to add
      */
     public void addLayoutComponent(final SwingStep step) {
@@ -292,9 +292,9 @@ public class StepLayout implements LayoutManager2, Serializable {
         }
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @return Returns the preferred size of the container
      */
     @Override
@@ -317,9 +317,9 @@ public class StepLayout implements LayoutManager2, Serializable {
         }
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @return Returns the minimum size of the container
      */
     @Override
@@ -342,11 +342,11 @@ public class StepLayout implements LayoutManager2, Serializable {
         }
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param parent Container to get the size for
-     * 
+     *
      * @return Returns the maximum size of the container
      */
     @Override
@@ -354,11 +354,11 @@ public class StepLayout implements LayoutManager2, Serializable {
         return new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE);
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param target Container to get the alignment from
-     * 
+     *
      * @return Alignment
      */
     @Override
@@ -366,11 +366,11 @@ public class StepLayout implements LayoutManager2, Serializable {
         return 0.5f;
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param target Container to get the alignment from
-     * 
+     *
      * @return Alignment
      */
     @Override
@@ -378,9 +378,9 @@ public class StepLayout implements LayoutManager2, Serializable {
         return 0.5f;
     }
 
-    /** 
+    /**
      * {@inheritDoc}
-     * 
+     *
      * @param target  Container to invalidate
      */
     @Override

src/com/dmdirc/installer/ui/StepSettings.java

@@ -83,8 +83,8 @@ public final class StepSettings extends SwingStep implements Settings {
         constraints.gridx = 0;
         constraints.gridy = 0;
         constraints.gridwidth = 2;
-        add(new TextLabel("Here you can choose options for the install." +
-                          "\n\nInstall Location:"), constraints);
+        add(new TextLabel("Here you can choose options for the install."
+                + "\n\nInstall Location:"), constraints);
 
         constraints.fill = GridBagConstraints.HORIZONTAL;
         constraints.gridx = 1;