Fix PMD bugs in parser.

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

src/com/dmdirc/parser/common/AwayState.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/parser/common/CallbackManager.java

@@ -69,7 +69,7 @@ public abstract class CallbackManager<T extends Parser> {
         WallDesyncListener.class, WallopListener.class, WalluserListener.class,
         ServerNoticeListener.class, UnknownServerNoticeListener.class,
     };
-    
+
     /** Hashtable used to store the different types of callback known. */
     private final Map<Class<? extends CallbackInterface>, CallbackObject> callbackHash
             = new HashMap<Class<? extends CallbackInterface>, CallbackObject>();
@@ -88,7 +88,7 @@ public abstract class CallbackManager<T extends Parser> {
      *
      * @param parser The parser associated with this CallbackManager
      */
-    protected void initialise(T parser) {
+    protected void initialise(final T parser) {
         for (Class<?> type : CLASSES) {
             if (type.isAnnotationPresent(SpecificCallback.class)) {
                 addCallbackType(getSpecificCallbackObject(parser, type));
@@ -229,7 +229,7 @@ public abstract class CallbackManager<T extends Parser> {
         if (o == null) {
             throw new NullPointerException("CallbackInterface is null");
         }
-        
+
         ((CallbackObjectSpecific) getCallbackType(callback)).add(o, target);
     }
 

src/com/dmdirc/parser/common/CallbackNotFoundException.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,7 +24,7 @@ package com.dmdirc.parser.common;
 
 /**
  * IRC Parser Callback Exception.
- * 
+ *
  * @author Shane Mc Cormack
  */
 public class CallbackNotFoundException extends RuntimeException {
@@ -37,7 +37,7 @@ public class CallbackNotFoundException extends RuntimeException {
 
     /**
      * Create a new CallbackNotFound Exception.
-     * 
+     *
      * @param message Reason for exception
      */
     public CallbackNotFoundException(final String message) {

src/com/dmdirc/parser/common/CallbackObject.java

@@ -178,7 +178,7 @@ public abstract class CallbackObject {
             }
             bResult = true;
         }
-        
+
         return bResult;
     }
 
@@ -227,7 +227,7 @@ public abstract class CallbackObject {
         for (Annotation[] anns : type.getMethods()[0].getParameterAnnotations()) {
             for (Annotation ann : anns) {
                 if (ann.annotationType().equals(FakableSource.class)) {
-                    Class<?> argType = type.getMethods()[0].getParameterTypes()[i];
+                    final Class<?> argType = type.getMethods()[0].getParameterTypes()[i];
 
                     sources.put(argType, args[i]);
                 }
@@ -258,10 +258,10 @@ public abstract class CallbackObject {
                 if (!found) {
                     param = getFakeArg(args, needed);
 
-                    if (param != null) {
-                        params[i] = param;
-                    } else {
+                    if (param == null) {
                         failed = true;
+                    } else {
+                        params[i] = param;
                     }
                 }
 
@@ -305,6 +305,6 @@ public abstract class CallbackObject {
      * @param type The type to be instansiated
      * @return A concrete implementation of that type
      */
-    protected abstract Class<?> getImplementation(Class<?> type);
-    
+    protected abstract Class<?> getImplementation(final Class<?> type);
+
 }

src/com/dmdirc/parser/common/CallbackObjectSpecific.java

@@ -147,14 +147,14 @@ public abstract class CallbackObjectSpecific extends CallbackObject {
         createFakeArgs(newArgs);
 
         for (CallbackInterface iface : new ArrayList<CallbackInterface>(callbackInfo)) {
-            if (type.isAnnotationPresent(SpecificCallback.class) &&
-                    ((args[0] instanceof ClientInfo
+            if (type.isAnnotationPresent(SpecificCallback.class)
+                    && ((args[0] instanceof ClientInfo
                     && !isValidUser(iface, ((ClientInfo) args[0]).getHostname()))
                     || (args[0] instanceof ChannelInfo
                     && !isValidChan(iface, (ChannelInfo) args[0]))
                     || (!(args[0] instanceof ClientInfo
-                    || args[0] instanceof ChannelInfo) &&
-                    args[args.length - 1] instanceof String
+                    || args[0] instanceof ChannelInfo)
+                    && args[args.length - 1] instanceof String
                     && !isValidUser(iface, (String) args[args.length - 1])))) {
                 continue;
             }

src/com/dmdirc/parser/common/ChannelListModeItem.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,7 +24,7 @@ package com.dmdirc.parser.common;
 
 /**
  * Contains Channel List Mode information.
- * 
+ *
  * @author Shane Mc Cormack
  * @author Chris Smith
  * @see IRCParser
@@ -42,7 +42,7 @@ public final class ChannelListModeItem {
 
     /**
      * Create a new Item.
-     * 
+     *
      * @param item The item (ie: test!joe@user.com)
      * @param owner The owner (ie: Dataforce)
      * @param time The Time (ie: 1173389295)
@@ -60,7 +60,7 @@ public final class ChannelListModeItem {
 
     /**
      * Get The Item itself.
-     * 
+     *
      * @return The Item itself.
      */
     public String getItem() {
@@ -69,7 +69,7 @@ public final class ChannelListModeItem {
 
     /**
      * Get The Person who created the item.
-     * 
+     *
      * @return The Person who created the item.
      */
     public String getOwner() {
@@ -78,7 +78,7 @@ public final class ChannelListModeItem {
 
     /**
      * Get The Time the item was created.
-     * 
+     *
      * @return The Time the item was created.
      */
     public long getTime() {
@@ -87,7 +87,7 @@ public final class ChannelListModeItem {
 
     /**
      * Returns a String representation of this object.
-     * 
+     *
      * @return String representation of this object
      */
     @Override

src/com/dmdirc/parser/common/DefaultStringConverter.java

@@ -34,19 +34,19 @@ public class DefaultStringConverter implements StringConverter {
 
     /** {@inheritDoc} */
     @Override
-    public String toLowerCase(String input) {
+    public String toLowerCase(final String input) {
         return input.toLowerCase();
     }
 
     /** {@inheritDoc} */
     @Override
-    public String toUpperCase(String input) {
+    public String toUpperCase(final String input) {
         return input.toUpperCase();
     }
 
     /** {@inheritDoc} */
     @Override
-    public boolean equalsIgnoreCase(String first, String second) {
+    public boolean equalsIgnoreCase(final String first, final String second) {
         return first.equalsIgnoreCase(second);
     }
 

src/com/dmdirc/parser/common/MyInfo.java

@@ -46,10 +46,10 @@ public class MyInfo {
      */
     private String altNickname;
 
-    /** Realname string to use */
+    /** Realname string to use. */
     private String realname;
 
-    /** Username to use, this doesn't matter when an ident server is running */
+    /** Username to use, this doesn't matter when an ident server is running. */
     private String username;
 
     /**

src/com/dmdirc/parser/common/ParserError.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,7 +24,7 @@ package com.dmdirc.parser.common;
 
 /**
  * IRC Parser Error.
- * 
+ *
  * @author Shane Mc Cormack
  */
 public final class ParserError {
@@ -47,11 +47,11 @@ public final class ParserError {
     private Exception exceptionInfo;
 
     /** Last line of server input before this exception was triggered. */
-    private String lastLine = "";
+    private final String lastLine;
 
     /**
      * Create a new Error.
-     * 
+     *
      * @param level Set the error level.
      * @param data String containing information about the error.
      * @param line The last line of data recieved from the server before this
@@ -65,7 +65,7 @@ public final class ParserError {
 
     /**
      * Check if this error is considered Fatal.
-     * 
+     *
      * @return Returns true for a fatal error, false for a non-fatal error
      */
     public boolean isFatal() {
@@ -75,7 +75,7 @@ public final class ParserError {
     /**
      * Check if this error is considered an error (less severe than fatal, worse
      * than warning).
-     * 
+     *
      * @return Returns true for an "Error" level error, else false.
      */
     public boolean isError() {
@@ -84,7 +84,7 @@ public final class ParserError {
 
     /**
      * Check if this error is considered a warning.
-     * 
+     *
      * @return Returns true for a warning, else false.
      */
     public boolean isWarning() {
@@ -94,7 +94,7 @@ public final class ParserError {
     /**
      * Check if this error is considered a user-error rather than a server error.
      * For DMDirc this will cause the error not to be reported to the developers
-     * 
+     *
      * @return Returns true for a user error, else false.
      */
     public boolean isUserError() {
@@ -103,7 +103,7 @@ public final class ParserError {
 
     /**
      * Check if this error was generated from an exception.
-     * 
+     *
      * @return Returns true if getException will return an exception.
      */
     public boolean isException() {
@@ -112,7 +112,7 @@ public final class ParserError {
 
     /**
      * Check if this error has a lastLine parameter.
-     * 
+     *
      * @return Returns true if getLastLine returns anything non null, non empty.
      */
     public boolean hasLastLine() {
@@ -121,7 +121,7 @@ public final class ParserError {
 
     /**
      * Set the Exception object.
-     * 
+     *
      * @param newException The exception object to store
      */
     public void setException(final Exception newException) {
@@ -133,7 +133,7 @@ public final class ParserError {
 
     /**
      * Get the Exception object.
-     * 
+     *
      * @return Returns the exception object
      */
     public Exception getException() {
@@ -142,7 +142,7 @@ public final class ParserError {
 
     /**
      * Get the full ErrorLevel.
-     * 
+     *
      * @return Returns the error level
      */
     public int getLevel() {
@@ -151,7 +151,7 @@ public final class ParserError {
 
     /**
      * Get the Error information.
-     * 
+     *
      * @return Returns the error data
      */
     public String getData() {
@@ -160,7 +160,7 @@ public final class ParserError {
 
     /**
      * Add to the error information.
-     * 
+     *
      * @param data Information to add to the end of the existing Data
      */
     public void appendData(final String data) {
@@ -169,7 +169,7 @@ public final class ParserError {
 
     /**
      * Get the last line recieved from the server before this exception.
-     * 
+     *
      * @return Returns the error data
      */
     public String getLastLine() {

src/com/dmdirc/parser/common/QueuePriority.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/parser/interfaces/ChannelClientInfo.java

@@ -36,7 +36,7 @@ public interface ChannelClientInfo extends Comparable<ChannelClientInfo> {
     /**
      * Retrieves the {@link ClientInfo} object which this object corresponds
      * to.
-     * 
+     *
      * @return The client info object which this object represents
      */
     ClientInfo getClient();

src/com/dmdirc/parser/interfaces/ClientInfo.java

@@ -82,5 +82,5 @@ public interface ClientInfo {
      * @return This ClientInfo's parser
      */
     Parser getParser();
-    
+
 }

src/com/dmdirc/parser/interfaces/Parser.java

@@ -88,14 +88,14 @@ public interface Parser extends Runnable {
     Collection<? extends ChannelInfo> getChannels();
 
     /**
-     * Get the IP address that this parser will bind to
+     * Get the IP address that this parser will bind to.
      *
      * @return IP that this parser is bound to ("" for default IP)
      */
     String getBindIP();
 
     /**
-     * Set the IP address that this parser will bind to
+     * Set the IP address that this parser will bind to.
      *
      * @param ip IP to bind to
      */
@@ -227,14 +227,14 @@ public interface Parser extends Runnable {
     String getServerSoftware();
 
     /**
-     * Retrieves the detected type of the software running on the server
+     * Retrieves the detected type of the software running on the server.
      *
      * @return This parser's server's software type
      */
     String getServerSoftwareType();
 
     /**
-     * Get the list of lines that lines that help describe the server
+     * Get the list of lines that lines that help describe the server.
      *
      * @return List of identification lines for the server.
      *

src/com/dmdirc/parser/interfaces/callbacks/ChannelJoinListener.java

@@ -29,7 +29,7 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
 
 import java.util.Date;
 
-/** 
+/**
  * Called When we, or another client joins a channel.
  * This is called AFTER client has been added to channel as a ChannelClientInfo
  */

src/com/dmdirc/parser/interfaces/callbacks/ChannelModeChangeListener.java

@@ -31,7 +31,7 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
 
 import java.util.Date;
 
-/** 
+/**
  * Called when the channel modes are changed or discovered.
  * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
  * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it

src/com/dmdirc/parser/interfaces/callbacks/ChannelNickChangeListener.java

@@ -29,7 +29,7 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
 
 import java.util.Date;
 
-/** 
+/**
  * Called when we or another user change nickname (Called once per channel the user is on).
  * This is called after the nickname change has been done internally
  */

src/com/dmdirc/parser/interfaces/callbacks/ChannelNonUserModeChangeListener.java

@@ -31,7 +31,7 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
 
 import java.util.Date;
 
-/** 
+/**
  * Called when the channel modes are changed or discovered.
  * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
  * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it

src/com/dmdirc/parser/interfaces/callbacks/ChannelPartListener.java

@@ -28,7 +28,7 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 import java.util.Date;
 
-/** 
+/**
  * Called When we, or another client parts a channel.
  * This is called BEFORE client has been removed from the channel.
  */

src/com/dmdirc/parser/interfaces/callbacks/ChannelSelfJoinListener.java

@@ -27,7 +27,7 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
-/** 
+/**
  * Called When we join a channel.
  * We are NOT added as a channelclient until after the names reply
  */

src/com/dmdirc/parser/interfaces/callbacks/ChannelTopicListener.java

@@ -27,7 +27,7 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 import java.util.Date;
 
-/** 
+/**
  * Called when the topic is changed or discovered for the first time.
  * bIsNewTopic is true if someone sets the topic, false if the topic is discovered on join
  */

src/com/dmdirc/parser/interfaces/callbacks/ChannelUserModeChangeListener.java

@@ -31,7 +31,7 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
 
 import java.util.Date;
 
-/** 
+/**
  * Called when a users channel mode is changed.
  */
 @SpecificCallback

src/com/dmdirc/parser/interfaces/callbacks/ErrorInfoListener.java

@@ -41,5 +41,5 @@ public interface ErrorInfoListener extends CallbackInterface {
      * @see com.dmdirc.parser.irc.IRCParser#callErrorInfo
      */
     void onErrorInfo(Parser parser, Date date, ParserError errorInfo);
-    
+
 }

src/com/dmdirc/parser/interfaces/callbacks/PrivateMessageListener.java

@@ -28,7 +28,7 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
 import java.util.Date;
 
 /**
- * Called when a person sends a message to you directly (PM). 
+ * Called when a person sends a message to you directly (PM).
  * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
  * cClient is null if user is a server, or not on any common channel.
  */

src/com/dmdirc/parser/interfaces/callbacks/QuitListener.java

@@ -27,7 +27,7 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
-/** 
+/**
  * Called When we, or another client quits IRC (Called once in total).
  * This is called BEFORE client has been removed from the channel.
  */

src/com/dmdirc/parser/interfaces/callbacks/UserModeChangeListener.java

@@ -27,7 +27,7 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
-/** 
+/**
  * Called when user modes are changed.
  * cClient represents the user who's modes were changed (should ALWAYS be us)<br>
  * sSetby is the host of the person who set the mode (usually us, may be an oper or server in some cases)

src/com/dmdirc/parser/interfaces/callbacks/UserModeDiscoveryListener.java

@@ -27,7 +27,7 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
-/** 
+/**
  * Called when user modes are Discovered.
  * cClient represents the user who's modes were Discovered (should ALWAYS be us)<br>
  * sSetby is the host of the person who set the mode (usually us, may be an oper or server in some cases)

src/com/dmdirc/parser/irc/IRCAuthenticator.java

@@ -32,11 +32,12 @@ import java.util.concurrent.Semaphore;
 
 /**
  * Handles proxy authentication for the parser.
- * 
+ *
  * @author Shane Mc Cormack
  * @see IRCParser
  */
-public class IRCAuthenticator extends Authenticator {
+public final class IRCAuthenticator extends Authenticator {
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
@@ -46,7 +47,7 @@ public class IRCAuthenticator extends Authenticator {
 
     /** Singleton instance of IRCAuthenticator. */
     private static IRCAuthenticator me = null;
-    
+
     /** List of authentication replies. */
     private final Map<String, PasswordAuthentication> replies = new HashMap<String, PasswordAuthentication>();
 
@@ -63,9 +64,11 @@ public class IRCAuthenticator extends Authenticator {
      * Authenticator.
      */
     private IRCAuthenticator() {
+        super();
+
         Authenticator.setDefault(this);
     }
-    
+
     /**
      * Get the instance of IRCAuthenticator.
      *
@@ -93,9 +96,9 @@ public class IRCAuthenticator extends Authenticator {
         final String password = server.getProxyPass();
 
         if (username == null || password == null || username.isEmpty() || password.isEmpty()) { return; }
-        
+
         final PasswordAuthentication pass = new PasswordAuthentication(username, password.toCharArray());
-        final String fullhost = host.toLowerCase()+":"+port;
+        final String fullhost = host.toLowerCase() + ":" + port;
 
         // Delete old username/password if one exists and then add the new one
         replies.remove(fullhost);
@@ -109,7 +112,7 @@ public class IRCAuthenticator extends Authenticator {
     }
 
     /**
-     * Get a copy of the semaphore
+     * Get a copy of the semaphore.
      *
      * @return the IRCAuthenticator semaphore.
      */
@@ -126,7 +129,7 @@ public class IRCAuthenticator extends Authenticator {
         final String host = server.getProxyHost();
         final int port = server.getProxyPort();
 
-        final String fullhost = host.toLowerCase()+":"+port;
+        final String fullhost = host.toLowerCase() + ":" + port;
 
         // See if any other servers are associated with this proxy.
         final List<ServerInfo> servers = owners.containsKey(fullhost) ? owners.get(fullhost) : new ArrayList<ServerInfo>();
@@ -137,7 +140,7 @@ public class IRCAuthenticator extends Authenticator {
             replies.remove(fullhost);
         }
     }
-    
+
     /** {@inheritDoc} */
     @Override
     protected PasswordAuthentication getPasswordAuthentication() {
@@ -152,7 +155,7 @@ public class IRCAuthenticator extends Authenticator {
          * getRequestorType: SERVER
          */
 
-        final String fullhost = getRequestingHost().toLowerCase()+":"+getRequestingPort();
+        final String fullhost = getRequestingHost().toLowerCase() + ":" + getRequestingPort();
         return replies.get(fullhost);
     }
 }

src/com/dmdirc/parser/irc/IRCCallbackManager.java

@@ -29,7 +29,7 @@ import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
 
 /**
  * Handles callbacks for the IRC Parser.
- * 
+ *
  * @author chris
  */
 public class IRCCallbackManager extends CallbackManager<IRCParser> {

src/com/dmdirc/parser/irc/IRCCallbackObject.java

@@ -41,8 +41,11 @@ import java.util.Map;
  */
 public class IRCCallbackObject extends CallbackObject {
 
-    /** A map of interfaces to the classes which should be instansiated for them. */
-    protected static final Map<Class<?>, Class<?>> IMPL_MAP = new HashMap<Class<?>, Class<?>>();
+    /**
+     * A map of interfaces to the classes which should be instansiated for them.
+     */
+    protected static final Map<Class<?>, Class<?>> IMPL_MAP
+            = new HashMap<Class<?>, Class<?>>();
 
     static {
         IMPL_MAP.put(ChannelClientInfo.class, IRCChannelClientInfo.class);
@@ -51,14 +54,22 @@ public class IRCCallbackObject extends CallbackObject {
         IMPL_MAP.put(LocalClientInfo.class, IRCClientInfo.class);
     }
 
-    public IRCCallbackObject(Parser parser, CallbackManager<?> manager,
-            Class<? extends CallbackInterface> type) {
+    /**
+     * Creates a new IRC parser callback object.
+     *
+     * @param parser Parser this callback is owned by
+     * @param manager Manager callback is owned by
+     * @param type Callback type
+     */
+    public IRCCallbackObject(final Parser parser,
+            final CallbackManager<?> manager,
+            final Class<? extends CallbackInterface> type) {
         super(parser, manager, type);
     }
 
     /** {@inheritDoc} */
     @Override
-    protected Class<?> getImplementation(Class<?> type) {
+    protected Class<?> getImplementation(final Class<?> type) {
         return IMPL_MAP.containsKey(type) ? IMPL_MAP.get(type) : type;
     }
 

src/com/dmdirc/parser/irc/IRCCallbackObjectSpecific.java

@@ -34,7 +34,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * A specific callback object for use with the IRC Parser
+ * A specific callback object for use with the IRC Parser.
  *
  * @since 0.6.3m2
  * @author chris
@@ -64,7 +64,7 @@ public class IRCCallbackObjectSpecific extends CallbackObjectSpecific {
 
     /** {@inheritDoc} */
     @Override
-    protected Class<?> getImplementation(Class<?> type) {
+    protected Class<?> getImplementation(final Class<?> type) {
         return IMPL_MAP.containsKey(type) ? IMPL_MAP.get(type) : type;
     }
 

src/com/dmdirc/parser/irc/IRCChannelClientInfo.java

@@ -44,7 +44,7 @@ public class IRCChannelClientInfo implements ChannelClientInfo {
     private final IRCParser myParser;
     /** Reference to the channel object that owns this channelclient. */
     private final ChannelInfo myChannel;
-    /** A Map to allow applications to attach misc data to this object */
+    /** A Map to allow applications to attach misc data to this object. */
     private Map<Object, Object> myMap;
 
     /**

src/com/dmdirc/parser/irc/IRCChannelInfo.java

@@ -86,12 +86,12 @@ public class IRCChannelInfo implements ChannelInfo {
     private final List<Character> lAddingModes = new LinkedList<Character>();
     /** Modes waiting to be sent to the server. */
     private final List<String> lModeQueue = new LinkedList<String>();
-    /** A Map to allow applications to attach misc data to this object */
+    /** A Map to allow applications to attach misc data to this object. */
     private Map<Object, Object> myMap;
 
-    /** Queue of requested list modes */
+    /** Queue of requested list modes. */
     private final Queue<Character> listModeQueue = new LinkedList<Character>();
-    /** Listmode Queue Time */
+    /** Listmode Queue Time. */
     private long listModeQueueTime = System.currentTimeMillis();
     /** Have we asked the server for the list modes for this channel yet? */
     private boolean askedForListModes = false;
@@ -120,7 +120,7 @@ public class IRCChannelInfo implements ChannelInfo {
         final long now = System.currentTimeMillis();
         // Incase of breakage, if getListModeQueue() was last called greater than
         // 60 seconds ago, we reset the list.
-        if (now-(30*1000) > listModeQueueTime) {
+        if (now - (30 * 1000) > listModeQueueTime) {
             result = new LinkedList<Character>();
             myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "Resetting LMQ");
         }
@@ -153,7 +153,9 @@ public class IRCChannelInfo implements ChannelInfo {
         if (serverType != ServerType.UNREAL && serverType != ServerType.IRSEE && myParser.h005Info.containsKey("MODES")) {
             try {
                 modecount = Integer.parseInt(myParser.h005Info.get("MODES"));
-            } catch (NumberFormatException e) { /* use default modecount */}
+            } catch (NumberFormatException e) {
+                 modecount = 1;
+            }
         }
 
         // Support for potential future decent mode listing in the protocol
@@ -177,7 +179,7 @@ public class IRCChannelInfo implements ChannelInfo {
                 i++;
                 listmodes = listmodes + cTemp;
                 if (i >= modecount && !supportLISTMODE) {
-                    myParser.sendString("MODE "+getName()+" "+listmodes, QueuePriority.LOW);
+                    myParser.sendString("MODE " + getName() + " " + listmodes, QueuePriority.LOW);
                     i = 0;
                     listmodes = "";
                 }
@@ -185,9 +187,9 @@ public class IRCChannelInfo implements ChannelInfo {
         }
         if (i > 0) {
             if (supportLISTMODE) {
-                myParser.sendString("LISTMODE "+getName()+" "+listmodes, QueuePriority.LOW);
+                myParser.sendString("LISTMODE " + getName() + " " + listmodes, QueuePriority.LOW);
             } else {
-                myParser.sendString("MODE "+getName()+" "+listmodes, QueuePriority.LOW);
+                myParser.sendString("MODE " + getName() + " " + listmodes, QueuePriority.LOW);
             }
         }
     }
@@ -276,7 +278,7 @@ public class IRCChannelInfo implements ChannelInfo {
     /** {@inheritDoc} */
         @Override
     public Collection<ChannelClientInfo> getChannelClients() {
-        synchronized(hChannelUserList) {
+        synchronized (hChannelUserList) {
             return new ArrayList<ChannelClientInfo>(hChannelUserList.values());
         }
     }
@@ -312,7 +314,7 @@ public class IRCChannelInfo implements ChannelInfo {
             return hChannelUserList.get(who);
         }
         if (create) {
-            return new IRCChannelClientInfo(myParser, (new IRCClientInfo(myParser, client)).setFake(true), this);
+            return new IRCChannelClientInfo(myParser, new IRCClientInfo(myParser, client).setFake(true), this);
         } else {
             return null;
         }
@@ -352,7 +354,7 @@ public class IRCChannelInfo implements ChannelInfo {
      * @param cClient Client object to be removed from channel
      */
     protected void delClient(final IRCClientInfo cClient) {
-        IRCChannelClientInfo cTemp = getChannelClient(cClient);
+        final IRCChannelClientInfo cTemp = getChannelClient(cClient);
         if (cTemp != null) {
             final IRCClientInfo clTemp = cTemp.getClient();
             clTemp.delChannelClientInfo(cTemp);
@@ -522,8 +524,9 @@ public class IRCChannelInfo implements ChannelInfo {
         final ArrayList<ChannelListModeItem> lModes = hListModes.get(cMode);
         for (int i = 0; i < lModes.size(); i++) {
             if (myParser.getStringConverter().equalsIgnoreCase(lModes.get(i).getItem(), newItem.getItem())) {
-                if (bAdd) { return; }
-                else {
+                if (bAdd) {
+                    return;
+                } else {
                     lModes.remove(i);
                     break;
                 }
@@ -634,7 +637,7 @@ public class IRCChannelInfo implements ChannelInfo {
                     modestr = modestr + " " + parameter;
                 }
             } else {
-                myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Trying to alter unknown mode.  positive: '"+add+"' | mode: '"+mode+"' | parameter: '"+parameter+"' ", ""));
+                myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Trying to alter unknown mode.  positive: '" + add + "' | mode: '" + mode + "' | parameter: '" + parameter + "' ", ""));
             }
         }
         myParser.callDebugInfo(IRCParser.DEBUG_INFO, "Queueing mode: %s", modestr);
@@ -714,11 +717,14 @@ public class IRCChannelInfo implements ChannelInfo {
      * @param sType Type of CTCP
      * @param sMessage Optional Additional Parameters
      */
-    public void sendCTCP(final String sType, String sMessage) {
+    public void sendCTCP(final String sType, final String sMessage) {
         if (sType.isEmpty()) { return; }
         final char char1 = (char) 1;
-        if (!sMessage.isEmpty()) { sMessage = " " + sMessage; }
-        sendMessage(char1 + sType.toUpperCase() + sMessage + char1);
+        if (sMessage.isEmpty()) {
+            sendMessage(char1 + sType.toUpperCase() + sMessage + char1);
+        } else {
+            sendMessage(char1 + sType.toUpperCase() + " " + sMessage + char1);
+        }
     }
 
     /**
@@ -727,11 +733,14 @@ public class IRCChannelInfo implements ChannelInfo {
      * @param sType Type of CTCP
      * @param sMessage Optional Additional Parameters
      */
-    public void sendCTCPReply(final String sType, String sMessage) {
+    public void sendCTCPReply(final String sType, final String sMessage) {
         if (sType.isEmpty()) { return; }
         final char char1 = (char) 1;
-        if (!sMessage.isEmpty()) { sMessage = " " + sMessage; }
-        sendNotice(char1 + sType.toUpperCase() + sMessage + char1);
+        if (sMessage.isEmpty()) {
+            sendNotice(char1 + sType.toUpperCase() + sMessage + char1);
+        } else {
+            sendNotice(char1 + sType.toUpperCase() + " " + sMessage + char1);
+        }
     }
 
     /**

src/com/dmdirc/parser/irc/IRCClientInfo.java

@@ -58,9 +58,9 @@ public class IRCClientInfo implements LocalClientInfo {
     private boolean bIsFake;
     /** Reference to the parser object that owns this channel, Used for modes. */
     private final IRCParser myParser;
-    /** A Map to allow applications to attach misc data to this object */
+    /** A Map to allow applications to attach misc data to this object. */
     private Map<Object, Object> myMap;
-    /** List of ChannelClientInfos that point to this */
+    /** List of ChannelClientInfos that point to this. */
     private final Map<String, IRCChannelClientInfo> myChannelClientInfos = new HashMap<String, IRCChannelClientInfo>();
     /** Modes waiting to be sent to the server. */
     private final List<String> lModeQueue = new LinkedList<String>();
@@ -133,11 +133,14 @@ public class IRCClientInfo implements LocalClientInfo {
      * @param sWho Hostname to parse
      * @return Array containing details. (result[0] -> Nick | result[1] -> Ident | result[2] -> Host)
      */
-    public static String[] parseHostFull(String sWho) {
+    public static String[] parseHostFull(final String sWho) {
         String[] sTemp = null;
         final String[] result = new String[3];
-        if (!sWho.isEmpty() && sWho.charAt(0) == ':') { sWho = sWho.substring(1); }
-        sTemp = sWho.split("@", 2);
+        if (!sWho.isEmpty() && sWho.charAt(0) == ':') {
+            sTemp = sWho.substring(1).split("@", 2);
+        } else {
+            sTemp = sWho.split("@", 2);
+        }
         if (sTemp.length == 1) { result[2] = ""; } else { result[2] = sTemp[1]; }
         sTemp = sTemp[0].split("!", 2);
         if (sTemp.length == 1) { result[1] = ""; } else { result[1] = sTemp[1]; }
@@ -415,7 +418,7 @@ public class IRCClientInfo implements LocalClientInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void setAway(String reason) {
+    public void setAway(final String reason) {
         myParser.sendRawMessage("AWAY :" + reason);
     }
 

src/com/dmdirc/parser/irc/IRCParserException.java

@@ -1,14 +1,29 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 package com.dmdirc.parser.irc;
 
 /**
  * IRC Parser Exception!
- *
- * @author shane
  */
 class IRCParserException extends Exception {
 
@@ -16,7 +31,7 @@ class IRCParserException extends Exception {
     private static final long serialVersionUID = 1L;
 
     /**
-     * Create a new IRCParserException
+     * Create a new IRCParserException.
      *
      * @param message Reason for exception
      */

src/com/dmdirc/parser/irc/IRCProcessor.java

@@ -32,10 +32,10 @@ import com.dmdirc.parser.common.QueuePriority;
  *
  * @author Shane Mc Cormack
  */
-abstract class IRCProcessor {
+public abstract class IRCProcessor {
     /** Reference to the IRCParser that owns this IRCProcessor. */
     protected IRCParser myParser;
-    
+
     /** Reference to the Processing in charge of this IRCProcessor. */
     protected ProcessingManager myManager;
 
@@ -62,7 +62,7 @@ abstract class IRCProcessor {
     protected final boolean callErrorInfo(final ParserError errorInfo) {
         return myParser.callErrorInfo(errorInfo);
     }
-    
+
     /**
      * Callback to all objects implementing the DebugInfo Callback.
      *
@@ -75,7 +75,7 @@ abstract class IRCProcessor {
     protected final boolean callDebugInfo(final int level, final String data, final Object... args) {
         return myParser.callDebugInfo(level, String.format(data, args));
     }
-    
+
     /**
      * Callback to all objects implementing the DebugInfo Callback.
      *
@@ -87,7 +87,7 @@ abstract class IRCProcessor {
     protected final boolean callDebugInfo(final int level, final String data) {
         return myParser.callDebugInfo(level, data);
     }
-    
+
     /**
      * Check if a channel name is valid .
      *
@@ -97,7 +97,7 @@ abstract class IRCProcessor {
     protected final boolean isValidChannelName(final String sChannelName) {
         return myParser.isValidChannelName(sChannelName);
     }
-    
+
     /**
      * Get the ClientInfo object for a person.
      *
@@ -107,7 +107,7 @@ abstract class IRCProcessor {
     protected final IRCClientInfo getClientInfo(final String sWho) {
         return myParser.isKnownClient(sWho) ? myParser.getClient(sWho) : null;
     }
-    
+
     /**
      * Get the ChannelInfo object for a channel.
      *
@@ -117,7 +117,7 @@ abstract class IRCProcessor {
     protected final IRCChannelInfo getChannel(final String name) {
         return myParser.getChannel(name);
     }
-    
+
     /**
      * Get a reference to the CallbackManager.
      *
@@ -126,7 +126,7 @@ abstract class IRCProcessor {
     protected final CallbackManager<?> getCallbackManager() {
         return myParser.getCallbackManager();
     }
-    
+
     /**
      * Send a line to the server and add proper line ending.
      *
@@ -145,7 +145,7 @@ abstract class IRCProcessor {
     protected final void sendString(final String line, final QueuePriority priority) {
         myParser.sendString(line, priority);
     }
-    
+
     /**
      * Process a Line.
      *
@@ -153,15 +153,15 @@ abstract class IRCProcessor {
      * @param token IRCTokenised line to process
      */
     public abstract void process(final String sParam, final String[] token);
-    
+
     /**
      * What does this IRCProcessor handle.
      *
      * @return String[] with the names of the tokens we handle.
      */
     public abstract String[] handles();
-    
-    /** 
+
+    /**
      * Get the name for this Processor.
      * @return the name of this processor
      */
@@ -173,20 +173,20 @@ abstract class IRCProcessor {
         }
         return this.getClass().getName().substring(packageLength);
     }
-    
-    /** 
+
+    /**
      * Get the name for this Processor in lowercase.
      * @return lower case name of this processor
      */
     public final String getLowerName() {
         return this.getName().toLowerCase();
     }
-    
-    /** 
+
+    /**
      * Get the name for this Processor.
      * @return the name of this processor
      */
         @Override
     public final String toString() { return this.getName(); }
-    
+
 }

src/com/dmdirc/parser/irc/IRCStringConverter.java

@@ -30,12 +30,12 @@ import com.dmdirc.parser.interfaces.StringConverter;
  * @author Shane Mc Cormack
  */
 public class IRCStringConverter implements StringConverter {
-    
+
     /** Characters to use when converting tolowercase. */
     private final char[] lowercase;
     /** Characters to use when converting touppercase. */
     private final char[] uppercase;
-    /** limit */
+    /** limit. */
     private final byte limit;
 
     /**
@@ -44,7 +44,7 @@ public class IRCStringConverter implements StringConverter {
     public IRCStringConverter() {
         this((byte) 4);
     }
-    
+
     /**
      * Create a new IRCStringConverter.
      * @param limit Number of post-alphabetical characters to convert
@@ -54,9 +54,12 @@ public class IRCStringConverter implements StringConverter {
      */
     public IRCStringConverter(final byte limit) {
         // If limit is out side the boundries, use rfc1459
-        if (limit > 4 || limit < 0) { this.limit = (byte) 4; }
-        else { this.limit = limit; }
-        
+        if (limit > 4 || limit < 0) {
+            this.limit = (byte) 4;
+        } else {
+            this.limit = limit;
+        }
+
         lowercase = new char[127];
         uppercase = new char[127];
         // Normal Chars
@@ -78,7 +81,7 @@ public class IRCStringConverter implements StringConverter {
      * @return last used chararray limit
      */
     protected int getLimit() { return limit; }
-    
+
     /** {@inheritDoc} */
         @Override
     public String toLowerCase(final String input) {

src/com/dmdirc/parser/irc/Logging.java

@@ -29,7 +29,7 @@ import java.lang.reflect.Method;
  * Logging using log4j if available.
  */
 public class Logging {
-    /** Available Log Levels */
+    /** Available Log Levels. */
     public enum LogLevel {
         TRACE("trace", "isTraceEnabled"),
         DEBUG("debug", "isDebugEnabled"),
@@ -38,14 +38,14 @@ public class Logging {
         ERROR("error", "isErrorEnabled"),
         FATAL("fatal", "isFatalEnabled");
 
-        /** Method name */
+        /** Method name. */
         private final String methodName;
 
-        /** Check Method name */
+        /** Check Method name. */
         private final String checkMethodName;
 
         /**
-         * Create a new LogLevel
+         * Create a new LogLevel.
          *
          * @param methodName Name of method in log4j to log to
          * @param checkMethodName Name of method in log4j to sue to check logging
@@ -56,14 +56,14 @@ public class Logging {
         }
 
         /**
-         * Get the Name of method in log4j to log to
+         * Get the Name of method in log4j to log to.
          *
          * @return Name of method in log4j to log to
          */
         public String getMethodName() { return methodName; }
 
         /**
-         * Get the Name of the check method in log4j
+         * Get the Name of the check method in log4j.
          *
          * @return Name of check method in log4j
          */

src/com/dmdirc/parser/irc/PingTimer.java

@@ -34,7 +34,7 @@ import java.util.TimerTask;
 public class PingTimer extends TimerTask {
     /** Owning Parser. */
     final IRCParser myOwner;
-    /** The Timer that owns this task */
+    /** The Timer that owns this task. */
     final Timer myTimer;
     
     /**
@@ -44,6 +44,7 @@ public class PingTimer extends TimerTask {
      * @param timer Timer that owns this TimerTask.
      */
     public PingTimer(final IRCParser control, final Timer timer) {
+        super();
         myOwner = control;
         myTimer = timer;
     }

src/com/dmdirc/parser/irc/Process001.java

@@ -101,6 +101,8 @@ public class Process001 extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected Process001(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected Process001(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/Process004005.java

@@ -47,13 +47,13 @@ public class Process004005 extends IRCProcessor {
                 myParser.h005Info.put("002IRCD", matcher.group(1));
             }
         } else if (sParam.equals("003")) {
-            myParser.h005Info.put("003IRCD", token[token.length-1]);
+            myParser.h005Info.put("003IRCD", token[token.length - 1]);
         } else if (sParam.equals("004")) {
             // 004
             final boolean multiParam = token.length > 4;
             int i = multiParam ? 4 : 1;
             final String[] bits = multiParam ? token : token[3].split(" ");
-            
+
             myParser.h005Info.put("004IRCD", bits[i++]);
             // some IRCDs put a timestamp where the usermodes should be
             // (issues 4140. 4181 and 4183) so check to see if this is numeric
@@ -66,7 +66,7 @@ public class Process004005 extends IRCProcessor {
         } else if (sParam.equals("005")) {
             // 005
             for (int i = 3; i < token.length; i++) {
-                String[] bits = token[i].split("=", 2);
+                final String[] bits = token[i].split("=", 2);
                 if (bits[0].isEmpty()) { continue; }
                 final boolean isNegation = (bits[0].charAt(0) == '-');
                 final String sKey = (isNegation) ? bits[0].substring(1).toUpperCase() : bits[0].toUpperCase();
@@ -87,7 +87,7 @@ public class Process004005 extends IRCProcessor {
                     } else if (sValue.equalsIgnoreCase("ascii")) {
                         limit = (byte) 0;
                     } else if (!sValue.equalsIgnoreCase("rfc1459")) {
-                        myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Unknown casemapping: '"+sValue+"' - assuming rfc1459", myParser.getLastLine()));
+                        myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Unknown casemapping: '" + sValue + "' - assuming rfc1459", myParser.getLastLine()));
                     }
                     final boolean limitChanged = (myParser.getStringConverter().getLimit() != limit);
                     myParser.updateCharArrays(limit);
@@ -105,15 +105,15 @@ public class Process004005 extends IRCProcessor {
                 } else if (sKey.equals("CHANMODES")) {
                     myParser.parseChanModes();
                 } else if (sKey.equals("NAMESX") || sKey.equals("UHNAMES")) {
-                    myParser.sendString("PROTOCTL "+sKey);
+                    myParser.sendString("PROTOCTL " + sKey);
                 } else if (sKey.equals("LISTMODE")) {
                     // Support for potential future decent mode listing in the protocol
-                    // 
+                    //
                     // See my proposal: http://shanemcc.co.uk/irc/#listmode
                     // Add listmode handler
                     String[] handles = new String[2];
                     handles[0] = sValue; // List mode item
-                    final String endValue = ""+(Integer.parseInt(sValue) + 1);
+                    final String endValue = "" + (Integer.parseInt(sValue) + 1);
                     myParser.h005Info.put("LISTMODEEND", endValue);
                     handles[1] = endValue; // List mode end
                     // Add listmode handlers
@@ -124,7 +124,7 @@ public class Process004005 extends IRCProcessor {
             }
         }
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -133,8 +133,8 @@ public class Process004005 extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"002", "003", "004", "005"};
-    } 
-    
+    }
+
     /**
      * Callback to all objects implementing the GotNetwork Callback.
      * This takes no params of its own, but works them out itself.
@@ -146,10 +146,10 @@ public class Process004005 extends IRCProcessor {
         final String networkName = myParser.networkName;
         final String ircdVersion = myParser.getServerSoftware();
         final String ircdType = myParser.getServerSoftwareType();
-        
+
         return getCallbackManager().getCallbackType(NetworkDetectedListener.class).call(networkName, ircdVersion, ircdType);
     }
-    
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *

src/com/dmdirc/parser/irc/Process464.java

@@ -35,12 +35,12 @@ public class Process464 extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(String sParam, String[] token) {
+    public void process(final String sParam, final String[] token) {
         callPasswordRequired();
 //        ParserError ei = new ParserError(ParserError.ERROR_ERROR, "Password Required");
 //        callErrorInfo(ei);
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -49,8 +49,8 @@ public class Process464 extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"464"};
-    } 
-    
+    }
+
     /**
      * Callback to all objects implementing the PasswordRequired Callback.
      *
@@ -60,13 +60,15 @@ public class Process464 extends IRCProcessor {
     protected boolean callPasswordRequired() {
         return getCallbackManager().getCallbackType(PasswordRequiredListener.class).call();
     }
-    
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected Process464(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected Process464(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessAway.java

@@ -36,17 +36,19 @@ public class ProcessAway extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(String sParam, String[] token) {
-        if (sParam.equals("301")) {
-            IRCClientInfo iClient = getClientInfo(token[3]);
-            if (iClient != null) { iClient.setAwayReason(token[token.length-1]); }
+    public void process(final String sParam, final String[] token) {
+        if ("301".equals(sParam)) {
+            final IRCClientInfo iClient = getClientInfo(token[3]);
+            if (iClient != null) {
+                iClient.setAwayReason(token[token.length - 1]);
+            }
         } else {
             final AwayState oldState = myParser.getLocalClient().getAwayState();
-            myParser.getLocalClient().setAwayState(sParam.equals("306") ? AwayState.AWAY : AwayState.HERE);
+            myParser.getLocalClient().setAwayState("306".equals(sParam) ? AwayState.AWAY : AwayState.HERE);
             callAwayState(oldState, myParser.getLocalClient().getAwayState(), myParser.getLocalClient().getAwayReason());
         }
     }
-    
+
     /**
      * Callback to all objects implementing the onAwayState Callback.
      *
@@ -59,7 +61,7 @@ public class ProcessAway extends IRCProcessor {
     protected boolean callAwayState(final AwayState oldState, final AwayState currentState, final String reason) {
         return getCallbackManager().getCallbackType(AwayStateListener.class).call(oldState, currentState, reason);
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -68,14 +70,16 @@ public class ProcessAway extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"301", "305", "306"};
-    } 
-    
+    }
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessAway(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessAway(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessInvite.java

@@ -41,7 +41,7 @@ public class ProcessInvite extends IRCProcessor {
             callInvite(token[0].substring(1), token[3]);
         }
     }
-    
+
     /**
      * Callback to all objects implementing the Invite Callback.
      *
@@ -53,7 +53,7 @@ public class ProcessInvite extends IRCProcessor {
     protected boolean callInvite(final String userHost, final String channel) {
         return getCallbackManager().getCallbackType(InviteListener.class).call(userHost, channel);
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -62,14 +62,16 @@ public class ProcessInvite extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"INVITE"};
-    } 
-    
+    }
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessInvite(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessInvite(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessJoin.java

@@ -44,24 +44,25 @@ public class ProcessJoin extends IRCProcessor {
     public void process(final String sParam, final String[] token) {
         if (sParam.equals("329")) {
             if (token.length < 5) { return; }
-            IRCChannelInfo iChannel = myParser.getChannel(token[3]);
+            final IRCChannelInfo iChannel = myParser.getChannel(token[3]);
             if (iChannel != null) {
                 try {
                     iChannel.setCreateTime(Integer.parseInt(token[4]));
-                } catch (NumberFormatException nfe) { /* Oh well, not a normal ircd I guess */ }
+                } catch (NumberFormatException nfe) {
+                    /* Oh well, not a normal ircd I guess */
+                }
             }
         } else {
             // :nick!ident@host JOIN (:)#Channel
-            Byte nTemp;
             if (token.length < 3) { return; }
             IRCClientInfo iClient;
             IRCChannelInfo iChannel;
             IRCChannelClientInfo iChannelClient;
-            
+
             iClient = getClientInfo(token[0]);
-            iChannel = myParser.getChannel(token[token.length-1]);
-            
-            if (iClient == null) { 
+            iChannel = myParser.getChannel(token[token.length - 1]);
+
+            if (iClient == null) {
                 iClient = new IRCClientInfo(myParser, token[0]);
                 myParser.addClient(iClient);
             }
@@ -70,13 +71,13 @@ public class ProcessJoin extends IRCProcessor {
             if (iChannel != null) {
                 if (iClient == myParser.getLocalClient()) {
                     try {
-                        if (iChannel.getChannelClient(iClient) != null) {
+                        if (iChannel.getChannelClient(iClient) == null) {
+                            // Otherwise we have a channel known, that we are not in?
+                            myParser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL, "Joined known channel that we wern't already on..", myParser.getLastLine()));
+                        } else {
                             // If we are joining a channel we are already on, fake a part from
                             // the channel internally, and rejoin.
                             myParser.getProcessingManager().process("PART", token);
-                        } else {
-                            // Otherwise we have a channel known, that we are not in?
-                            myParser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL, "Joined known channel that we wern't already on..", myParser.getLastLine()));
                         }
                     } catch (ProcessorNotFoundException e) { }
                 } else if (iChannel.getChannelClient(iClient) != null) {
@@ -93,16 +94,16 @@ public class ProcessJoin extends IRCProcessor {
             //if (iClient != myParser.getMyself()) {
                 // callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got join for channel ("+token[token.length-1]+") that I am not on. [Me: "+myParser.getMyself()+"]", myParser.getLastLine()));
             //}
-            iChannel = new IRCChannelInfo(myParser, token[token.length-1]);
+            iChannel = new IRCChannelInfo(myParser, token[token.length - 1]);
             // Add ourself to the channel, this will be overridden by the NAMES reply
             iChannel.addClient(iClient);
             myParser.addChannel(iChannel);
-            sendString("MODE "+iChannel.getName(), QueuePriority.LOW);
-            
+            sendString("MODE " + iChannel.getName(), QueuePriority.LOW);
+
             callChannelSelfJoin(iChannel);
         }
     }
-    
+
 
     /**
      * Callback to all objects implementing the ChannelJoin Callback.
@@ -115,7 +116,7 @@ public class ProcessJoin extends IRCProcessor {
     protected boolean callChannelJoin(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient) {
         return getCallbackManager().getCallbackType(ChannelJoinListener.class).call(cChannel, cChannelClient);
     }
-    
+
     /**
      * Callback to all objects implementing the ChannelSelfJoin Callback.
      *
@@ -126,7 +127,7 @@ public class ProcessJoin extends IRCProcessor {
     protected boolean callChannelSelfJoin(final ChannelInfo cChannel) {
         return getCallbackManager().getCallbackType(ChannelSelfJoinListener.class).call(cChannel);
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -135,14 +136,16 @@ public class ProcessJoin extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"JOIN", "329"};
-    } 
-    
+    }
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessJoin(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessJoin(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessKick.java

@@ -46,26 +46,28 @@ public class ProcessKick extends IRCProcessor {
         IRCClientInfo iClient;
         IRCClientInfo iKicker;
         String sReason = "";
-        
+
         iClient = getClientInfo(token[3]);
         iKicker = getClientInfo(token[0]);
         iChannel = getChannel(token[2]);
-        
+
         if (iClient == null) { return; }
-        
+
         if ((IRCParser.ALWAYS_UPDATECLIENT && iKicker != null)
                 && iKicker.getHostname().isEmpty()) {
             // To facilitate dmdirc formatter, get user information
             iKicker.setUserBits(token[0], false);
         }
 
-        if (iChannel == null) { 
+        if (iChannel == null) {
             if (iClient != myParser.getLocalClient()) {
-                callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got kick for channel ("+token[2]+") that I am not on. [User: "+token[3]+"]", myParser.getLastLine()));
+                callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got kick for channel (" + token[2] + ") that I am not on. [User: " + token[3] + "]", myParser.getLastLine()));
             }
             return;
         } else {
-            if (token.length > 4) { sReason = token[token.length-1]; }
+            if (token.length > 4) {
+                sReason = token[token.length - 1];
+            }
             iChannelClient = iChannel.getChannelClient(iClient);
             if (iChannelClient == null) {
                 // callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got kick for channel ("+token[2]+") for a non-existant user. [User: "+token[0]+"]", myParser.getLastLine()));
@@ -81,7 +83,7 @@ public class ProcessKick extends IRCProcessor {
             }
         }
     }
-    
+
     /**
      * Callback to all objects implementing the ChannelKick Callback.
      *
@@ -93,10 +95,10 @@ public class ProcessKick extends IRCProcessor {
      * @param sKickedByHost Hostname of Kicker (or servername)
      * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelKick(ChannelInfo cChannel, ChannelClientInfo cKickedClient, ChannelClientInfo cKickedByClient, String sReason, String sKickedByHost) {
+    protected boolean callChannelKick(final ChannelInfo cChannel, final ChannelClientInfo cKickedClient, final ChannelClientInfo cKickedByClient, final String sReason, final String sKickedByHost) {
         return getCallbackManager().getCallbackType(ChannelKickListener.class).call(cChannel, cKickedClient, cKickedByClient, sReason, sKickedByHost);
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -105,14 +107,16 @@ public class ProcessKick extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"KICK"};
-    } 
-    
+    }
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessKick(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessKick(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessListModes.java

@@ -42,8 +42,8 @@ public class ProcessListModes extends IRCProcessor {
      */
     @SuppressWarnings("unchecked")
     @Override
-    public void process(String sParam, String[] token) {
-        IRCChannelInfo channel = getChannel(token[3]);
+    public void process(final String sParam, final String[] token) {
+        final IRCChannelInfo channel = getChannel(token[3]);
         final ServerType serverType = myParser.getServerType();
         String item = "";
         String owner = "";
@@ -53,7 +53,7 @@ public class ProcessListModes extends IRCProcessor {
         char mode = 'b';
         boolean isItem = true; // true if item listing, false if "end of .." item
         if (channel == null) { return; }
-        
+
         if (sParam.equals("367") || sParam.equals("368")) {
             // Ban List/Item.
             // (Also used for +d and +q on dancer/hyperion... -_-)
@@ -99,27 +99,27 @@ public class ProcessListModes extends IRCProcessor {
             tokenStart = 5;
             isCleverMode = true;
         }
-        
+
         final Queue<Character> listModeQueue = channel.getListModeQueue();
         if (!isCleverMode && listModeQueue != null) {
             if (sParam.equals("482")) {
-                myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "Dropped LMQ mode "+listModeQueue.poll());
+                myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "Dropped LMQ mode " + listModeQueue.poll());
                 return;
             } else {
                 if (listModeQueue.peek() != null) {
-                    Character oldMode = mode;
+                    final Character oldMode = mode;
                     mode = listModeQueue.peek();
-                    myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "LMQ says this is "+mode);
-                    
+                    myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "LMQ says this is " + mode);
+
                     boolean error = true;
-                    
+
                     // b or q are given in the same list, d is separate.
                     // b and q remove each other from the LMQ.
                     //
                     // Only raise an LMQ error if the lmqmode isn't one of bdq if the
                     // guess is one of bdq
                     if (ServerTypeGroup.FREENODE.isMember(serverType) && (mode == 'b' || mode == 'q' || mode == 'd')) {
-                        LinkedList<Character> lmq = (LinkedList<Character>) listModeQueue;
+                        final LinkedList<Character> lmq = (LinkedList<Character>) listModeQueue;
                         if (mode == 'b') {
                             error = !(oldMode == 'q' || oldMode == 'd');
                             lmq.remove((Character) 'q');
@@ -142,47 +142,50 @@ public class ProcessListModes extends IRCProcessor {
                     // freenode-specific hacks above think the mode should be
                     // something else, error.
                     if (oldMode != mode && error) {
-                        myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "LMQ disagrees with guess. LMQ: "+mode+" Guess: "+oldMode);
+                        myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "LMQ disagrees with guess. LMQ: " + mode + " Guess: " + oldMode);
 //                        myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "LMQ disagrees with guess. LMQ: "+mode+" Guess: "+oldMode, myParser.getLastLine()));
                     }
-                    
+
                     if (!isItem) {
                         listModeQueue.poll();
                     }
                 }
             }
         }
-        
+
         if (isItem) {
             if ((!isCleverMode) && listModeQueue == null && ServerTypeGroup.FREENODE.isMember(serverType) && token.length > 4 && mode == 'b') {
                 // Assume mode is a 'd' mode
                 mode = 'd';
                 // Now work out if its not (or attempt to.)
-                int identstart = token[tokenStart].indexOf('!');
-                int hoststart = token[tokenStart].indexOf('@');
+                final int identstart = token[tokenStart].indexOf('!');
+                final int hoststart = token[tokenStart].indexOf('@');
                 // Check that ! and @ are both in the string - as required by +b and +q
                 if ((identstart >= 0) && (identstart < hoststart)) {
-                    if (serverType == ServerType.HYPERION && token[tokenStart].charAt(0) == '%') { mode = 'q'; }
-                    else { mode = 'b'; }
+                    if (serverType == ServerType.HYPERION && token[tokenStart].charAt(0) == '%') {
+                        mode = 'q';
+                    } else {
+                        mode = 'b';
+                    }
                 }
             } // End Hyperian stupidness of using the same numeric for 3 different things..
-            
+
             if (!channel.getAddState(mode)) {
-                callDebugInfo(IRCParser.DEBUG_INFO, "New List Mode Batch ("+mode+"): Clearing!");
+                callDebugInfo(IRCParser.DEBUG_INFO, "New List Mode Batch (" + mode + "): Clearing!");
                 final Collection<ChannelListModeItem> list = channel.getListMode(mode);
                 if (list == null) {
-                    myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got list mode: '"+mode+"' - but channel object doesn't agree.", myParser.getLastLine()));
+                    myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got list mode: '" + mode + "' - but channel object doesn't agree.", myParser.getLastLine()));
                 } else {
                     list.clear();
                     if (ServerTypeGroup.FREENODE.isMember(serverType) && (mode == 'b' || mode == 'q')) {
                         // Also clear the other list if b or q.
                         final Character otherMode = (mode == 'b') ? 'q' : 'b';
-                        
+
                         if (!channel.getAddState(otherMode)) {
-                            callDebugInfo(IRCParser.DEBUG_INFO, "New List Mode Batch ("+mode+"): Clearing!");
+                            callDebugInfo(IRCParser.DEBUG_INFO, "New List Mode Batch (" + mode + "): Clearing!");
                             final Collection<ChannelListModeItem> otherList = channel.getListMode(otherMode);
                             if (otherList == null) {
-                                myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got list mode: '"+otherMode+"' - but channel object doesn't agree.", myParser.getLastLine()));
+                                myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got list mode: '" + otherMode + "' - but channel object doesn't agree.", myParser.getLastLine()));
                             } else {
                                 otherList.clear();
                             }
@@ -191,14 +194,22 @@ public class ProcessListModes extends IRCProcessor {
                 }
                 channel.setAddState(mode, true);
             }
-            
-            if (token.length > (tokenStart+2)) {
-                try { time = Long.parseLong(token[tokenStart+2]); } catch (NumberFormatException e) { time = 0; }
+
+            if (token.length > (tokenStart + 2)) {
+                try {
+                    time = Long.parseLong(token[tokenStart + 2]);
+                } catch (NumberFormatException e) {
+                    time = 0;
+                }
+            }
+            if (token.length > (tokenStart + 1)) {
+                owner = token[tokenStart + 1];
+            }
+            if (token.length > tokenStart) {
+                item = token[tokenStart];
             }
-            if (token.length > (tokenStart+1)) { owner = token[tokenStart+1]; }
-            if (token.length > tokenStart) { item = token[tokenStart]; }
             if (!item.isEmpty()) {
-                ChannelListModeItem clmi = new ChannelListModeItem(item, owner, time);
+                final ChannelListModeItem clmi = new ChannelListModeItem(item, owner, time);
                 callDebugInfo(IRCParser.DEBUG_INFO, "List Mode: %c [%s/%s/%d]", mode, item, owner, time);
                 channel.setListModeParam(mode, clmi, true);
             }
@@ -221,7 +232,7 @@ public class ProcessListModes extends IRCProcessor {
             }
         }
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -240,7 +251,7 @@ public class ProcessListModes extends IRCProcessor {
                             "__LISTMODE__" /* Sensible List Modes */
                            };
     }
-    
+
     /**
      * Callback to all objects implementing the ChannelGotListModes Callback.
      *
@@ -249,16 +260,18 @@ public class ProcessListModes extends IRCProcessor {
      * @param mode the mode that we got list modes for.
      * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelGotListModes(ChannelInfo cChannel, final char mode) {
+    protected boolean callChannelGotListModes(final ChannelInfo cChannel, final char mode) {
         return getCallbackManager().getCallbackType(ChannelListModeListener.class).call(cChannel, mode);
     }
-    
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessListModes(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessListModes(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessMOTD.java

@@ -38,16 +38,16 @@ public class ProcessMOTD extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(String sParam, String[] token) {
-        if (sParam.equals("375")) {
-            callMOTDStart(token[token.length-1]);
-        } else if (sParam.equals("372")) {
-            callMOTDLine(token[token.length-1]);
+    public void process(final String sParam, final String[] token) {
+        if ("375".equals(sParam)) {
+            callMOTDStart(token[token.length - 1]);
+        } else if ("372".equals(sParam)) {
+            callMOTDLine(token[token.length - 1]);
         } else {
-            callMOTDEnd(sParam.equals("422"), token[token.length-1]);
+            callMOTDEnd("422".equals(sParam), token[token.length - 1]);
         }
     }
-    
+
     /**
      * Callback to all objects implementing the MOTDEnd Callback.
      *
@@ -59,7 +59,7 @@ public class ProcessMOTD extends IRCProcessor {
     protected boolean callMOTDEnd(final boolean noMOTD, final String data) {
         return getCallbackManager().getCallbackType(MotdEndListener.class).call(noMOTD, data);
     }
-    
+
     /**
      * Callback to all objects implementing the MOTDLine Callback.
      *
@@ -70,7 +70,7 @@ public class ProcessMOTD extends IRCProcessor {
     protected boolean callMOTDLine(final String data) {
         return getCallbackManager().getCallbackType(MotdLineListener.class).call(data);
     }
-    
+
     /**
      * Callback to all objects implementing the MOTDStart Callback.
      *
@@ -78,10 +78,10 @@ public class ProcessMOTD extends IRCProcessor {
      * @param data Incomming Line.
      * @return true if a method was called, false otherwise
      */
-    protected boolean callMOTDStart(String data) {
+    protected boolean callMOTDStart(final String data) {
         return getCallbackManager().getCallbackType(MotdStartListener.class).call(data);
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -90,14 +90,16 @@ public class ProcessMOTD extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"372", "375", "376", "422"};
-    } 
-    
+    }
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessMOTD(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessMOTD(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessMessage.java

@@ -68,7 +68,7 @@ public class ProcessMessage extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, String[] token) {
+    public void process(final String sParam, final String[] token) {
         // Ignore people!
         String sMessage = "";
         if (token[0].charAt(0) == ':') { sMessage = token[0].substring(1); } else { sMessage = token[0]; }
@@ -76,7 +76,7 @@ public class ProcessMessage extends IRCProcessor {
         try {
             if (myParser.getIgnoreList().matches(sMessage) > -1) { return; }
         } catch (PatternSyntaxException pse) {
-             final ParserError pe = new ParserError(ParserError.ERROR_WARNING + ParserError.ERROR_USER, "Error with ignore list regex: "+pse, myParser.getLastLine());
+             final ParserError pe = new ParserError(ParserError.ERROR_WARNING + ParserError.ERROR_USER, "Error with ignore list regex: " + pse, myParser.getLastLine());
              pe.setException(pse);
              callErrorInfo(pe);
         }
@@ -101,7 +101,7 @@ public class ProcessMessage extends IRCProcessor {
         if (token.length < 4) {
             sMessage = "";
         } else {
-            sMessage = token[token.length-1];
+            sMessage = token[token.length - 1];
         }
         String[] bits = sMessage.split(" ", 2);
         final Character char1 = Character.valueOf((char) 1);
@@ -114,18 +114,18 @@ public class ProcessMessage extends IRCProcessor {
             // Bits is the message been split into 2 parts
             //         the first word and the rest
             if (sParam.equalsIgnoreCase("PRIVMSG") && bits[0].equalsIgnoreCase(
-                    char1+"ACTION") && Character.valueOf(sMessage.charAt(
-                    sMessage.length()-1)).equals(char1)) {
+                    char1 + "ACTION") && Character.valueOf(sMessage.charAt(
+                    sMessage.length() - 1)).equals(char1)) {
                 isAction = true;
                 if (bits.length > 1) {
                     sMessage = bits[1];
-                    sMessage = sMessage.substring(0, sMessage.length()-1);
+                    sMessage = sMessage.substring(0, sMessage.length() - 1);
                 } else { sMessage = ""; }
             }
             // If the message is not an action, check if it is another type of CTCP
             // CTCPs have Character(1) at the start/end of the line
             if (!isAction && Character.valueOf(sMessage.charAt(0)).equals(char1)
-                    && Character.valueOf(sMessage.charAt(sMessage.length()-1))
+                    && Character.valueOf(sMessage.charAt(sMessage.length() - 1))
                     .equals(char1)) {
                 isCTCP = true;
                 // Bits is the message been split into 2 parts, the first word and the rest
@@ -139,10 +139,10 @@ public class ProcessMessage extends IRCProcessor {
                 bits = bits[0].split(char1.toString(), 2);
                 sCTCP = bits[1];
                 // remove the trailing char1
-                if (!sMessage.isEmpty()) {
-                    sMessage = sMessage.split(char1.toString(), 2)[0];
-                } else {
+                if (sMessage.isEmpty()) {
                     sCTCP = sCTCP.split(char1.toString(), 2)[0];
+                } else {
+                    sMessage = sMessage.split(char1.toString(), 2)[0];
                 }
                 callDebugInfo(IRCParser.DEBUG_INFO, "CTCP: \"%s\" \"%s\"",
                         sCTCP, sMessage);
@@ -184,7 +184,9 @@ public class ProcessMessage extends IRCProcessor {
             }
             if (iClient != null) { iChannelClient = iChannel.getChannelClient(iClient); }
             if (sParam.equalsIgnoreCase("PRIVMSG")) {
-                if (!isAction) {
+                if (isAction) {
+                    callChannelAction(iChannel, iChannelClient, sMessage, token[0]);
+                } else {
                     if (isCTCP) {
                         callChannelCTCP(iChannel, iChannelClient, sCTCP, sMessage, token[0]);
                     } else if (hasModePrefix) {
@@ -192,8 +194,6 @@ public class ProcessMessage extends IRCProcessor {
                     } else {
                         callChannelMessage(iChannel, iChannelClient, sMessage, token[0]);
                     }
-                } else {
-                    callChannelAction(iChannel, iChannelClient, sMessage, token[0]);
                 }
             } else if (sParam.equalsIgnoreCase("NOTICE")) {
                 if (isCTCP) {
@@ -206,20 +206,20 @@ public class ProcessMessage extends IRCProcessor {
             }
         } else if (myParser.getStringConverter().equalsIgnoreCase(token[2], myParser.getMyNickname())) {
             if (sParam.equalsIgnoreCase("PRIVMSG")) {
-                if (!isAction) {
+                if (isAction) {
+                    callPrivateAction(sMessage, token[0]);
+                } else {
                     if (isCTCP) {
                         callPrivateCTCP(sCTCP, sMessage, token[0]);
                     } else {
                         callPrivateMessage(sMessage, token[0]);
                     }
-                } else {
-                    callPrivateAction(sMessage, token[0]);
                 }
             } else if (sParam.equalsIgnoreCase("NOTICE")) {
                 if (isCTCP) {
                     callPrivateCTCPReply(sCTCP, sMessage, token[0]);
                 } else {
-                    if (token[0].indexOf("@") == -1) {
+                    if (token[0].indexOf('@') == -1) {
                         callServerNotice(sMessage, token[0]);
                     } else {
                         callPrivateNotice(sMessage, token[0]);
@@ -227,22 +227,22 @@ public class ProcessMessage extends IRCProcessor {
                 }
             }
         } else {
-            callDebugInfo(IRCParser.DEBUG_INFO, "Message for Other ("+token[2]+")");
+            callDebugInfo(IRCParser.DEBUG_INFO, "Message for Other (" + token[2] + ")");
             if (sParam.equalsIgnoreCase("PRIVMSG")) {
-                if (!isAction) {
+                if (isAction) {
+                    callUnknownAction(sMessage, token[2], token[0]);
+                } else {
                     if (isCTCP) {
                         callUnknownCTCP(sCTCP, sMessage, token[2], token[0]);
                     } else {
                         callUnknownMessage(sMessage, token[2], token[0]);
                     }
-                } else {
-                    callUnknownAction(sMessage, token[2], token[0]);
                 }
             } else if (sParam.equalsIgnoreCase("NOTICE")) {
                 if (isCTCP) {
                     callUnknownCTCPReply(sCTCP, sMessage, token[2], token[0]);
                 } else {
-                    if (token[0].indexOf("@") == -1) {
+                    if (token[0].indexOf('@') == -1) {
                         callUnknownServerNotice(sMessage, token[2], token[0]);
                     } else {
                         callUnknownNotice(sMessage, token[2], token[0]);
@@ -525,6 +525,8 @@ public class ProcessMessage extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessMessage(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessMessage(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessMode.java

@@ -48,33 +48,38 @@ public class ProcessMode extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(String sParam, String[] token) {
+    public void process(final String sParam, final String[] token) {
         String[] sModestr;
         String sChannelName;
         if (sParam.equals("324")) {
             sChannelName = token[3];
-            sModestr = new String[token.length-4];
-            System.arraycopy(token, 4, sModestr, 0, token.length-4);
+            sModestr = new String[token.length - 4];
+            System.arraycopy(token, 4, sModestr, 0, token.length - 4);
         } else if (sParam.equals("221")) {
-            processUserMode(sParam, token, new String[]{token[token.length-1]}, true);
+            processUserMode(sParam, token, new String[]{token[token.length - 1]}, true);
             return;
         } else {
             sChannelName = token[2];
-            sModestr = new String[token.length-3];
-            System.arraycopy(token, 3, sModestr, 0, token.length-3);
+            sModestr = new String[token.length - 3];
+            System.arraycopy(token, 3, sModestr, 0, token.length - 3);
         }
 
-        if (!isValidChannelName(sChannelName)) { processUserMode(sParam, token, sModestr, false); }
-        else { processChanMode(sParam, token, sModestr, sChannelName); }
+        if (isValidChannelName(sChannelName)) {
+            processChanMode(sParam, token, sModestr, sChannelName);
+        } else {
+            processUserMode(sParam, token, sModestr, false);
+        }
     }
 
     /**
-     * Method to trim spaces from strings
+     * Method to trim spaces from strings.
      *
      * @param str String to trim
      * @return String without spaces on the ends
      */
-    private String trim(String str) { return str.trim(); }
+    private String trim(final String str) {
+        return str.trim();
+    }
 
     /**
      * Process Chan modes.
@@ -84,8 +89,8 @@ public class ProcessMode extends IRCProcessor {
      * @param sModestr The modes and params
      * @param sChannelName Channel these modes are for
      */
-    public void processChanMode(String sParam, String[] token, String[] sModestr, String sChannelName) {
-        StringBuilder sFullModeStr = new StringBuilder();
+    public void processChanMode(final String sParam, final String[] token, final String[] sModestr, final String sChannelName) {
+        final StringBuilder sFullModeStr = new StringBuilder();
         String sNonUserModeStr = "";
         String sNonUserModeStrParams = "";
         String sModeParam;
@@ -115,7 +120,9 @@ public class ProcessMode extends IRCProcessor {
             return;
         }
         // Get the current channel modes
-        if (!sParam.equals("324")) { nCurrent = iChannel.getMode(); }
+        if (!sParam.equals("324")) {
+            nCurrent = iChannel.getMode();
+        }
 
         setterCCI = iChannel.getChannelClient(token[0]);
         // Facilitate dmdirc formatter
@@ -126,16 +133,22 @@ public class ProcessMode extends IRCProcessor {
 
         // Loop through the mode string, and add/remove modes/params where they are needed
         for (int i = 0; i < sModestr[0].length(); ++i) {
-            Character cMode = sModestr[0].charAt(i);
-            if (cMode.equals(":".charAt(0))) { continue; }
-
-            sNonUserModeStr = sNonUserModeStr+cMode;
-            if (cMode.equals("+".charAt(0))) { cPositive = '+'; bPositive = true; }
-            else if (cMode.equals("-".charAt(0))) { cPositive = '-'; bPositive = false; }
-            else {
-                if (myParser.chanModesBool.containsKey(cMode)) { nValue = myParser.chanModesBool.get(cMode); bBooleanMode = true; }
-                else if (myParser.chanModesOther.containsKey(cMode)) { nValue = myParser.chanModesOther.get(cMode); bBooleanMode = false; }
-                else if (myParser.prefixModes.containsKey(cMode)) {
+            final Character cMode = sModestr[0].charAt(i);
+            if (cMode.equals(":".charAt(0))) {
+                continue;
+            }
+
+            sNonUserModeStr = sNonUserModeStr + cMode;
+            if (cMode.equals("+".charAt(0))) {
+                cPositive = '+'; bPositive = true;
+            } else if (cMode.equals("-".charAt(0))) {
+                cPositive = '-'; bPositive = false;
+            } else {
+                if (myParser.chanModesBool.containsKey(cMode)) {
+                    nValue = myParser.chanModesBool.get(cMode); bBooleanMode = true;
+                } else if (myParser.chanModesOther.containsKey(cMode)) {
+                    nValue = myParser.chanModesOther.get(cMode); bBooleanMode = false;
+                } else if (myParser.prefixModes.containsKey(cMode)) {
                     // (de) OP/Voice someone
                     if (sModestr.length <= nParam) {
                         myParser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL + ParserError.ERROR_USER, "Broken Modes. Parameter required but not given.", myParser.getLastLine()));
@@ -155,9 +168,12 @@ public class ProcessMode extends IRCProcessor {
                         iChannelClientInfo = iChannel.addClient(iClient);
                     }
                     callDebugInfo(IRCParser.DEBUG_INFO, "\tOld Mode Value: %d", iChannelClientInfo.getChanMode());
-                    if (bPositive) { iChannelClientInfo.setChanMode(iChannelClientInfo.getChanMode() | nValue); sTemp = "+"; }
-                    else { iChannelClientInfo.setChanMode(iChannelClientInfo.getChanMode() ^ (iChannelClientInfo.getChanMode() & nValue)); sTemp = "-"; }
-                    sTemp = sTemp+cMode;
+                    if (bPositive) {
+                        iChannelClientInfo.setChanMode(iChannelClientInfo.getChanMode() | nValue); sTemp = "+";
+                    } else {
+                        iChannelClientInfo.setChanMode(iChannelClientInfo.getChanMode() ^ (iChannelClientInfo.getChanMode() & nValue)); sTemp = "-";
+                    }
+                    sTemp = sTemp + cMode;
                     callChannelUserModeChanged(iChannel, iChannelClientInfo, setterCCI, token[0], sTemp);
                     continue;
                 } else {
@@ -165,14 +181,17 @@ public class ProcessMode extends IRCProcessor {
                     myParser.chanModesBool.put(cMode, myParser.nextKeyCMBool);
                     nValue = myParser.nextKeyCMBool;
                     bBooleanMode = true;
-                    myParser.nextKeyCMBool = myParser.nextKeyCMBool*2;
+                    myParser.nextKeyCMBool = myParser.nextKeyCMBool * 2;
                 }
 
                 if (bBooleanMode) {
                     callDebugInfo(IRCParser.DEBUG_INFO, "Boolean Mode: %c [%d] {Positive: %b}", cMode, nValue, bPositive);
 
-                    if (bPositive) { nCurrent = nCurrent | nValue; }
-                    else { nCurrent = nCurrent ^ (nCurrent & nValue); }
+                    if (bPositive) {
+                        nCurrent = nCurrent | nValue;
+                    } else {
+                        nCurrent = nCurrent ^ (nCurrent & nValue);
+                    }
                 } else {
 
                     if ((bPositive || nValue == IRCParser.MODE_LIST || ((nValue & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET)) && (sModestr.length <= nParam)) {
@@ -183,31 +202,37 @@ public class ProcessMode extends IRCProcessor {
                     if (nValue == IRCParser.MODE_LIST) {
                         // List Mode
                         sModeParam = sModestr[nParam++];
-                        sNonUserModeStrParams = sNonUserModeStrParams+" "+sModeParam;
+                        sNonUserModeStrParams = sNonUserModeStrParams + " " + sModeParam;
                         nTemp = (Calendar.getInstance().getTimeInMillis() / 1000);
                         iChannel.setListModeParam(cMode, new ChannelListModeItem(sModeParam, token[0], nTemp), bPositive);
                         callDebugInfo(IRCParser.DEBUG_INFO, "List Mode: %c [%s] {Positive: %b}", cMode, sModeParam, bPositive);
-                        if (cbSingle != null) { cbSingle.call(iChannel, setterCCI, token[0], cPositive+cMode+" "+sModeParam); }
+                        if (cbSingle != null) {
+                            cbSingle.call(iChannel, setterCCI, token[0], cPositive + cMode + " " + sModeParam);
+                        }
                     } else {
                         // Mode with a parameter
                         if (bPositive) {
                             // +Mode - always needs a parameter to set
                             sModeParam = sModestr[nParam++];
-                            sNonUserModeStrParams = sNonUserModeStrParams+" "+sModeParam;
+                            sNonUserModeStrParams = sNonUserModeStrParams + " " + sModeParam;
                             callDebugInfo(IRCParser.DEBUG_INFO, "Set Mode: %c [%s] {Positive: %b}", cMode, sModeParam, bPositive);
                             iChannel.setModeParam(cMode, sModeParam);
-                            if (cbSingle != null) { cbSingle.call(iChannel, setterCCI, token[0], cPositive+cMode+" "+sModeParam); }
+                            if (cbSingle != null) {
+                                cbSingle.call(iChannel, setterCCI, token[0], cPositive + cMode + " " + sModeParam);
+                            }
                         } else {
                             // -Mode - parameter isn't always needed, we need to check
                             if ((nValue & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET) {
                                 sModeParam = sModestr[nParam++];
-                                sNonUserModeStrParams = sNonUserModeStrParams+" "+sModeParam;
+                                sNonUserModeStrParams = sNonUserModeStrParams + " " + sModeParam;
                             } else {
                                 sModeParam = "";
                             }
                             callDebugInfo(IRCParser.DEBUG_INFO, "Unset Mode: %c [%s] {Positive: %b}", cMode, sModeParam, bPositive);
                             iChannel.setModeParam(cMode, "");
-                            if (cbSingle != null) { cbSingle.call(iChannel, setterCCI, token[0], trim(cPositive+cMode+" "+sModeParam)); }
+                            if (cbSingle != null) {
+                                cbSingle.call(iChannel, setterCCI, token[0], trim(cPositive + cMode + " " + sModeParam));
+                            }
                         }
                     }
                 }
@@ -218,9 +243,14 @@ public class ProcessMode extends IRCProcessor {
         for (int i = 0; i < sModestr.length; ++i) { sFullModeStr.append(sModestr[i]).append(" "); }
 
         iChannel.setMode(nCurrent);
-        if (sParam.equals("324")) { callChannelModeChanged(iChannel, null, "", sFullModeStr.toString().trim()); }
-        else { callChannelModeChanged(iChannel, setterCCI, token[0], sFullModeStr.toString().trim()); }
-        if (cbNonUser != null) { cbNonUser.call(iChannel, setterCCI, token[0], trim(sNonUserModeStr+sNonUserModeStrParams)); }
+        if (sParam.equals("324")) {
+            callChannelModeChanged(iChannel, null, "", sFullModeStr.toString().trim());
+        } else {
+            callChannelModeChanged(iChannel, setterCCI, token[0], sFullModeStr.toString().trim());
+        }
+        if (cbNonUser != null) {
+            cbNonUser.call(iChannel, setterCCI, token[0], trim(sNonUserModeStr + sNonUserModeStrParams));
+        }
     }
 
     /**
@@ -230,11 +260,11 @@ public class ProcessMode extends IRCProcessor {
      * @param token IRCTokenised Array of the incomming line
      * @param clearOldModes Clear old modes before applying these modes (used by 221)
      */
-    private void processUserMode(String sParam, String[] token, String[] sModestr, boolean clearOldModes) {
+    private void processUserMode(final String sParam, final String[] token, final String[] sModestr, final boolean clearOldModes) {
         long nCurrent = 0, nValue = 0;
         boolean bPositive = true;
 
-        IRCClientInfo iClient = getClientInfo(token[2]);
+        final IRCClientInfo iClient = getClientInfo(token[2]);
 
         if (iClient == null) { return; }
 
@@ -245,23 +275,30 @@ public class ProcessMode extends IRCProcessor {
         }
 
         for (int i = 0; i < sModestr[0].length(); ++i) {
-            Character cMode = sModestr[0].charAt(i);
-            if (cMode.equals("+".charAt(0))) { bPositive = true; }
-            else if (cMode.equals("-".charAt(0))) { bPositive = false; }
-            else if (cMode.equals(":".charAt(0))) { continue; }
-            else {
-                if (myParser.userModes.containsKey(cMode)) { nValue = myParser.userModes.get(cMode); }
-                else {
+            final Character cMode = sModestr[0].charAt(i);
+            if (cMode.equals("+".charAt(0))) {
+                bPositive = true;
+            } else if (cMode.equals("-".charAt(0))) {
+                bPositive = false;
+            } else if (cMode.equals(":".charAt(0))) {
+                continue;
+            } else {
+                if (myParser.userModes.containsKey(cMode)) {
+                    nValue = myParser.userModes.get(cMode);
+                } else {
                     // Unknown mode
-                    callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got unknown user mode "+cMode+" - Added", myParser.getLastLine()));
+                    callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got unknown user mode " + cMode + " - Added", myParser.getLastLine()));
                     myParser.userModes.put(cMode, myParser.nNextKeyUser);
                     nValue = myParser.nNextKeyUser;
-                    myParser.nNextKeyUser = myParser.nNextKeyUser*2;
+                    myParser.nNextKeyUser = myParser.nNextKeyUser * 2;
                 }
                 // Usermodes are always boolean
                 callDebugInfo(IRCParser.DEBUG_INFO, "User Mode: %c [%d] {Positive: %b}", cMode, nValue, bPositive);
-                if (bPositive) { nCurrent = nCurrent | nValue; }
-                else { nCurrent = nCurrent ^ (nCurrent & nValue); }
+                if (bPositive) {
+                    nCurrent = nCurrent | nValue;
+                } else {
+                    nCurrent = nCurrent ^ (nCurrent & nValue);
+                }
             }
         }
 
@@ -283,7 +320,7 @@ public class ProcessMode extends IRCProcessor {
      * @param sModes Exact String parsed
      * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelModeChanged(ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sHost, String sModes) {
+    protected boolean callChannelModeChanged(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sHost, final String sModes) {
         return getCallbackManager().getCallbackType(ChannelModeChangeListener.class).call(cChannel, cChannelClient, sHost, sModes);
     }
 
@@ -298,7 +335,7 @@ public class ProcessMode extends IRCProcessor {
      * @param sHost Host doing the mode changing (User host or server name)
      * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelUserModeChanged(ChannelInfo cChannel, ChannelClientInfo cChangedClient, ChannelClientInfo cSetByClient, String sHost, String sMode) {
+    protected boolean callChannelUserModeChanged(final ChannelInfo cChannel, final ChannelClientInfo cChangedClient, final ChannelClientInfo cSetByClient, final String sHost, final String sMode) {
         return getCallbackManager().getCallbackType(ChannelUserModeChangeListener.class).call(cChannel, cChangedClient, cSetByClient, sHost, sMode);
     }
 
@@ -311,7 +348,7 @@ public class ProcessMode extends IRCProcessor {
      * @param sModes The modes set.
      * @return true if a method was called, false otherwise
      */
-    protected boolean callUserModeChanged(ClientInfo cClient, String sSetby, String sModes) {
+    protected boolean callUserModeChanged(final ClientInfo cClient, final String sSetby, final String sModes) {
         return getCallbackManager().getCallbackType(UserModeChangeListener.class).call(cClient, sSetby, sModes);
     }
 
@@ -323,7 +360,7 @@ public class ProcessMode extends IRCProcessor {
      * @param sModes The modes set.
      * @return true if a method was called, false otherwise
      */
-    protected boolean callUserModeDiscovered(ClientInfo cClient, String sModes) {
+    protected boolean callUserModeDiscovered(final ClientInfo cClient, final String sModes) {
         return getCallbackManager().getCallbackType(UserModeDiscoveryListener.class).call(cClient, sModes);
     }
 
@@ -343,6 +380,8 @@ public class ProcessMode extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessMode(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessMode(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessNames.java

@@ -37,39 +37,39 @@ public class ProcessNames extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(String sParam, String[] token) {
+    public void process(final String sParam, final String[] token) {
         IRCChannelInfo iChannel;
-        if (sParam.equals("366")) {
+        if ("366".equals(sParam)) {
             // End of names
             iChannel = getChannel(token[3]);
             if (iChannel == null) { return; }
-            
+
             if (!iChannel.hadTopic()) {
                 callChannelTopic(iChannel, true);
             }
 
             iChannel.setAddingNames(false);
             callChannelGotNames(iChannel);
-            
-            if (!iChannel.hasAskedForListModes() 
+
+            if (!iChannel.hasAskedForListModes()
                     && myParser.getAutoListMode()) {
                 iChannel.requestListModes();
             }
         } else {
             // Names
-            
+
             IRCClientInfo iClient;
             IRCChannelClientInfo iChannelClient;
-            
+
             iChannel = getChannel(token[4]);
-        
+
             if (iChannel == null) { return; }
-            
+
             // If we are not expecting names, clear the current known names - this is fresh stuff!
             if (!iChannel.isAddingNames()) { iChannel.emptyChannel(); }
             iChannel.setAddingNames(true);
-            
-            String[] sNames = token[token.length-1].split(" ");
+
+            final String[] sNames = token[token.length - 1].split(" ");
             String sNameBit = "", sName = "";
             StringBuilder sModes = new StringBuilder();
             long nPrefix = 0;
@@ -79,7 +79,7 @@ public class ProcessNames extends IRCProcessor {
                 if (sNameBit.isEmpty()) { continue; }
                 // This next bit of code allows for any ircd which decides to use @+Foo in names
                 for (int i = 0; i < sNameBit.length(); ++i) {
-                    Character cMode = sNameBit.charAt(i);
+                    final Character cMode = sNameBit.charAt(i);
                     // hPrefixMap contains @, o, +, v this caused issue 107
                     // hPrefixModes only contains o, v so if the mode is in hPrefixMap
                     // and not in hPrefixModes, its ok to use.
@@ -92,7 +92,7 @@ public class ProcessNames extends IRCProcessor {
                     }
                 }
                 callDebugInfo(IRCParser.DEBUG_INFO, "Name: %s Modes: \"%s\" [%d]", sName, sModes.toString(), nPrefix);
-                
+
                 iClient = getClientInfo(sName);
                 if (iClient == null) { iClient = new IRCClientInfo(myParser, sName); myParser.addClient(iClient); }
                 iClient.setUserBits(sName, false); // Will do nothing if this isn't UHNAMES
@@ -105,7 +105,7 @@ public class ProcessNames extends IRCProcessor {
             }
         }
     }
-    
+
     /**
      * Callback to all objects implementing the ChannelTopic Callback.
      *
@@ -126,10 +126,10 @@ public class ProcessNames extends IRCProcessor {
      * @param cChannel Channel which the names reply is for
      * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelGotNames(ChannelInfo cChannel) {
+    protected boolean callChannelGotNames(final ChannelInfo cChannel) {
         return getCallbackManager().getCallbackType(ChannelNamesListener.class).call(cChannel);
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -138,14 +138,16 @@ public class ProcessNames extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"353", "366"};
-    } 
-    
+    }
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessNames(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessNames(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessNick.java

@@ -40,51 +40,50 @@ public class ProcessNick extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(String sParam, String[] token) {
+    public void process(final String sParam, final String[] token) {
         IRCClientInfo iClient;
         IRCChannelClientInfo iChannelClient;
         String oldNickname;
-        
+
         iClient = getClientInfo(token[0]);
-        if (iClient != null) {
-            oldNickname = myParser.getStringConverter().toLowerCase(iClient.getNickname());
-            // Remove the client from the known clients list
-            final boolean isSameNick = myParser.getStringConverter().equalsIgnoreCase(oldNickname, token[token.length-1]);
-            
+        if (iClient == null) {
+            return;
+        }
+        oldNickname = myParser.getStringConverter().toLowerCase(iClient.getNickname());
+        // Remove the client from the known clients list
+        final boolean isSameNick = myParser.getStringConverter().equalsIgnoreCase(oldNickname, token[token.length - 1]);
+
+        if (!isSameNick) {
+            myParser.forceRemoveClient(getClientInfo(oldNickname));
+        }
+        // Change the nickame
+        iClient.setUserBits(token[token.length - 1], true);
+        // Readd the client
+        if (!isSameNick && getClientInfo(iClient.getNickname()) != null) {
+            myParser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL + ParserError.ERROR_USER, "Nick change would overwrite existing client", myParser.getLastLine()));
+        } else {
             if (!isSameNick) {
-                myParser.forceRemoveClient(getClientInfo(oldNickname));
+                myParser.addClient(iClient);
             }
-            // Change the nickame
-            iClient.setUserBits(token[token.length-1], true);
-            // Readd the client
-            if (!isSameNick && getClientInfo(iClient.getNickname()) != null) {
-//                myParser.onPostErrorInfo(new ParserError(ParserError.ERROR_FATAL, "Nick change would overwrite existing client", myParser.getLastLine()), false);
-                myParser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL + ParserError.ERROR_USER, "Nick change would overwrite existing client", myParser.getLastLine()));
-            } else {
-                if (!isSameNick) {
-                    myParser.addClient(iClient);
-                }
-                
-                for (IRCChannelInfo iChannel : myParser.getChannels()) {
-                    // Find the user (using the old nickname)
-                    iChannelClient = iChannel.getChannelClient(oldNickname);
-                    if (iChannelClient != null) {
-                        // Rename them. This uses the old nickname (the key in the hashtable)
-                        // and the channelClient object has access to the new nickname (by way
-                        // of the ClientInfo object we updated above)
-                        if (!isSameNick) {
-                            iChannel.renameClient(oldNickname, iChannelClient);
-                        }
-                        callChannelNickChanged(iChannel, iChannelClient, IRCClientInfo.parseHost(token[0]));
+
+            for (IRCChannelInfo iChannel : myParser.getChannels()) {
+                // Find the user (using the old nickname)
+                iChannelClient = iChannel.getChannelClient(oldNickname);
+                if (iChannelClient != null) {
+                    // Rename them. This uses the old nickname (the key in the hashtable)
+                    // and the channelClient object has access to the new nickname (by way
+                    // of the ClientInfo object we updated above)
+                    if (!isSameNick) {
+                        iChannel.renameClient(oldNickname, iChannelClient);
                     }
+                    callChannelNickChanged(iChannel, iChannelClient, IRCClientInfo.parseHost(token[0]));
                 }
-                
-                callNickChanged(iClient, IRCClientInfo.parseHost(token[0]));
             }
+
+            callNickChanged(iClient, IRCClientInfo.parseHost(token[0]));
         }
-        
     }
-    
+
     /**
      * Callback to all objects implementing the ChannelNickChanged Callback.
      *
@@ -94,10 +93,10 @@ public class ProcessNick extends IRCProcessor {
      * @param sOldNick Nickname before change
      * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelNickChanged(ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sOldNick) {
+    protected boolean callChannelNickChanged(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sOldNick) {
         return getCallbackManager().getCallbackType(ChannelNickChangeListener.class).call(cChannel, cChannelClient, sOldNick);
     }
-    
+
     /**
      * Callback to all objects implementing the NickChanged Callback.
      *
@@ -106,10 +105,10 @@ public class ProcessNick extends IRCProcessor {
      * @param sOldNick Nickname before change
      * @return true if a method was called, false otherwise
      */
-    protected boolean callNickChanged(ClientInfo cClient, String sOldNick) {
+    protected boolean callNickChanged(final ClientInfo cClient, final String sOldNick) {
         return getCallbackManager().getCallbackType(NickChangeListener.class).call(cClient, sOldNick);
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -118,14 +117,16 @@ public class ProcessNick extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"NICK"};
-    } 
-    
+    }
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessNick(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessNick(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessNickInUse.java

@@ -58,15 +58,15 @@ public class ProcessNickInUse extends IRCProcessor {
                     if (myParser.getStringConverter().equalsIgnoreCase(myParser.thinkNickname, myParser.me.getAltNickname())) {
                         myParser.thinkNickname = myParser.me.getNickname();
                     }
-                    myParser.getLocalClient().setNickname(myParser.me.getPrependChar()+myParser.thinkNickname);
+                    myParser.getLocalClient().setNickname(myParser.me.getPrependChar() + myParser.thinkNickname);
                 } else {
                     myParser.getLocalClient().setNickname(myParser.me.getAltNickname());
-                    myParser.triedAlt = true; 
+                    myParser.triedAlt = true;
                 }
             }
         }
     }
-    
+
     /**
      * Callback to all objects implementing the NickInUse Callback.
      *
@@ -77,7 +77,7 @@ public class ProcessNickInUse extends IRCProcessor {
     protected boolean callNickInUse(final String nickname) {
         return getCallbackManager().getCallbackType(NickInUseListener.class).call(nickname);
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -87,7 +87,7 @@ public class ProcessNickInUse extends IRCProcessor {
     public String[] handles() {
         return new String[]{"433"};
     }
-    
+
     /**
      * Create a new instance of the ProcessNickInUse Object.
      *

src/com/dmdirc/parser/irc/ProcessNoticeAuth.java

@@ -36,9 +36,9 @@ public class ProcessNoticeAuth extends IRCProcessor {
      */
     @Override
     public void process(final String sParam, final String[] token) {
-        callNoticeAuth(token[token.length-1]);
+        callNoticeAuth(token[token.length - 1]);
     }
-    
+
     /**
      * Callback to all objects implementing the NoticeAuth Callback.
      *
@@ -49,7 +49,7 @@ public class ProcessNoticeAuth extends IRCProcessor {
     protected boolean callNoticeAuth(final String data) {
         return getCallbackManager().getCallbackType(AuthNoticeListener.class).call(data);
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -58,8 +58,8 @@ public class ProcessNoticeAuth extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"Notice Auth"};
-    } 
-    
+    }
+
     /**
      * Create a new instance of the ProcessNoticeAuth Object.
      *

src/com/dmdirc/parser/irc/ProcessPart.java

@@ -46,23 +46,23 @@ public class ProcessPart extends IRCProcessor {
         IRCClientInfo iClient;
         IRCChannelInfo iChannel;
         IRCChannelClientInfo iChannelClient;
-        
+
         iClient = getClientInfo(token[0]);
         iChannel = getChannel(token[2]);
-        
+
         if (iClient == null) { return; }
         if (IRCParser.ALWAYS_UPDATECLIENT && iClient.getHostname().isEmpty()) {
             // This may seem pointless - updating before they leave - but the formatter needs it!
             iClient.setUserBits(token[0], false);
         }
-        if (iChannel == null) { 
+        if (iChannel == null) {
             if (iClient != myParser.getLocalClient()) {
-                callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got part for channel ("+token[2]+") that I am not on. [User: "+token[0]+"]", myParser.getLastLine()));
+                callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got part for channel (" + token[2] + ") that I am not on. [User: " + token[0] + "]", myParser.getLastLine()));
             }
             return;
         } else {
             String sReason = "";
-            if (token.length > 3) { sReason = token[token.length-1]; }
+            if (token.length > 3) { sReason = token[token.length - 1]; }
             iChannelClient = iChannel.getChannelClient(iClient);
             if (iChannelClient == null) {
                 // callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got part for channel ("+token[2]+") for a non-existant user. [User: "+token[0]+"]", myParser.getLastLine()));
@@ -78,7 +78,7 @@ public class ProcessPart extends IRCProcessor {
             }
         }
     }
-    
+
     /**
      * Callback to all objects implementing the ChannelPart Callback.
      *
@@ -91,7 +91,7 @@ public class ProcessPart extends IRCProcessor {
     protected boolean callChannelPart(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sReason) {
         return getCallbackManager().getCallbackType(ChannelPartListener.class).call(cChannel, cChannelClient, sReason);
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -100,14 +100,16 @@ public class ProcessPart extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"PART"};
-    } 
-    
+    }
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessPart(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessPart(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessQuit.java

@@ -47,18 +47,18 @@ public class ProcessQuit extends IRCProcessor {
         if (token.length < 2) { return; }
         IRCClientInfo iClient;
         IRCChannelClientInfo iChannelClient;
-        
+
         iClient = getClientInfo(token[0]);
-        
+
         if (iClient == null) { return; }
         if (IRCParser.ALWAYS_UPDATECLIENT && iClient.getHostname().isEmpty()) {
             // This may seem pointless - updating before they leave - but the formatter needs it!
             iClient.setUserBits(token[0], false);
         }
         String sReason = "";
-        if (token.length > 2) { sReason = token[token.length-1]; }
-        
-        ArrayList<IRCChannelInfo> channelList = new ArrayList<IRCChannelInfo>(myParser.getChannels());
+        if (token.length > 2) { sReason = token[token.length - 1]; }
+
+        final ArrayList<IRCChannelInfo> channelList = new ArrayList<IRCChannelInfo>(myParser.getChannels());
         for (IRCChannelInfo iChannel : channelList) {
             iChannelClient = iChannel.getChannelClient(iClient);
             if (iChannelClient != null) {
@@ -80,8 +80,8 @@ public class ProcessQuit extends IRCProcessor {
             myParser.removeClient(iClient);
         }
         if (!myParser.removeAfterCallback) { callQuit(iClient, sReason); }
-    }    
-    
+    }
+
     /**
      * Callback to all objects implementing the ChannelQuit Callback.
      *
@@ -94,7 +94,7 @@ public class ProcessQuit extends IRCProcessor {
     protected boolean callChannelQuit(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sReason) {
         return getCallbackManager().getCallbackType(ChannelQuitListener.class).call(cChannel, cChannelClient, sReason);
     }
-    
+
     /**
      * Callback to all objects implementing the Quit Callback.
      *
@@ -106,7 +106,7 @@ public class ProcessQuit extends IRCProcessor {
     protected boolean callQuit(final ClientInfo cClient, final String sReason) {
         return getCallbackManager().getCallbackType(QuitListener.class).call(cClient, sReason);
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -115,14 +115,16 @@ public class ProcessQuit extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"QUIT"};
-    } 
-    
+    }
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessQuit(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessQuit(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessTopic.java

@@ -41,7 +41,7 @@ public class ProcessTopic extends IRCProcessor {
         if (sParam.equals("332")) {
             iChannel = getChannel(token[3]);
             if (iChannel == null) { return; }
-            iChannel.setInternalTopic(token[token.length-1]);
+            iChannel.setInternalTopic(token[token.length - 1]);
         } else if (sParam.equals("333")) {
             if (token.length > 3) {
                 iChannel = getChannel(token[3]);
@@ -57,18 +57,20 @@ public class ProcessTopic extends IRCProcessor {
         } else {
             if (IRCParser.ALWAYS_UPDATECLIENT) {
                 final IRCClientInfo iClient = getClientInfo(token[0]);
-                if (iClient != null && iClient.getHostname().isEmpty()) {iClient.setUserBits(token[0], false); }
+                if (iClient != null && iClient.getHostname().isEmpty()) {
+                    iClient.setUserBits(token[0], false);
+                }
             }
             iChannel = getChannel(token[2]);
             if (iChannel == null) { return; }
             iChannel.setTopicTime(System.currentTimeMillis() / 1000);
             if (token[0].charAt(0) == ':') { token[0] = token[0].substring(1); }
             iChannel.setTopicUser(token[0]);
-            iChannel.setInternalTopic(token[token.length-1]);
+            iChannel.setInternalTopic(token[token.length - 1]);
             callChannelTopic(iChannel, false);
         }
     }
-    
+
     /**
      * Callback to all objects implementing the ChannelTopic Callback.
      *
@@ -81,7 +83,7 @@ public class ProcessTopic extends IRCProcessor {
         ((IRCChannelInfo) cChannel).setHadTopic();
         return getCallbackManager().getCallbackType(ChannelTopicListener.class).call(cChannel, bIsJoinTopic);
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -90,14 +92,16 @@ public class ProcessTopic extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"TOPIC", "332", "333"};
-    } 
-    
+    }
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessTopic(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessTopic(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessWallops.java

@@ -39,11 +39,11 @@ public class ProcessWallops extends IRCProcessor {
     @Override
     public void process(final String sParam, final String[] token) {
         if (token.length < 3) { return; }
-        
+
         String user = token[0];
-        String message = token[token.length-1];
+        final String message = token[token.length - 1];
         if (user.charAt(0) == ':' && user.length() > 1) { user = user.substring(1); }
-        String[] bits = message.split(" ", 2);
+        final String[] bits = message.split(" ", 2);
 
         if (bits.length > 1) {
             if (message.charAt(0) == '*') {
@@ -56,7 +56,7 @@ public class ProcessWallops extends IRCProcessor {
         }
         callWallDesync(message, user);
     }
-    
+
     /**
      * Callback to all objects implementing the Wallop Callback.
      *
@@ -68,7 +68,7 @@ public class ProcessWallops extends IRCProcessor {
     protected boolean callWallop(final String message, final String host) {
         return getCallbackManager().getCallbackType(WallopListener.class).call(message, host);
     }
-    
+
     /**
      * Callback to all objects implementing the Walluser Callback.
      *
@@ -80,7 +80,7 @@ public class ProcessWallops extends IRCProcessor {
     protected boolean callWalluser(final String message, final String host) {
         return getCallbackManager().getCallbackType(WalluserListener.class).call(message, host);
     }
-    
+
     /**
      * Callback to all objects implementing the WallDesync Callback.
      *
@@ -92,8 +92,8 @@ public class ProcessWallops extends IRCProcessor {
     protected boolean callWallDesync(final String message, final String host) {
         return getCallbackManager().getCallbackType(WallDesyncListener.class).call(message, host);
     }
-    
-    
+
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -102,14 +102,16 @@ public class ProcessWallops extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"WALLOPS"};
-    } 
-    
+    }
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessWallops(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessWallops(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessWho.java

@@ -50,11 +50,11 @@ public class ProcessWho extends IRCProcessor {
         //              0               1      2        3     4              5                      6       7     8      9
         // :server 352 mynickname channel username address server nick flags :hops info
         //     0    1      2         3     4          5      6      7    8        9
-        
+
         final IRCClientInfo client = getClientInfo(token[7]);
         if (client != null) {
             // Update ident/host
-            client.setUserBits(token[7]+"!"+token[4]+"@"+token[5], false);
+            client.setUserBits(token[7] + "!" + token[4] + "@" + token[5], false);
             // Update real name
             if (client.getRealname().isEmpty()) {
                 final String name = token[9].split(" ", 2)[1];
@@ -70,7 +70,7 @@ public class ProcessWho extends IRCProcessor {
                     callAwayState(oldState, client.getAwayState(), client.getAwayReason());
                 } else {
                     callAwayStateOther(client, oldState, isAway);
-                    
+
                     ChannelClientInfo iChannelClient;
                     for (ChannelInfo iChannel : myParser.getChannels()) {
                         iChannelClient = iChannel.getChannelClient(client);
@@ -82,7 +82,7 @@ public class ProcessWho extends IRCProcessor {
             }
         }
     }
-    
+
     /**
      * Callback to all objects implementing the onAwayState Callback.
      *
@@ -95,7 +95,7 @@ public class ProcessWho extends IRCProcessor {
     protected boolean callAwayState(final AwayState oldState, final AwayState currentState, final String reason) {
         return getCallbackManager().getCallbackType(AwayStateListener.class).call(oldState, currentState, reason);
     }
-    
+
     /**
      * Callback to all objects implementing the onAwayStateOther Callback.
      *
@@ -108,7 +108,7 @@ public class ProcessWho extends IRCProcessor {
     protected boolean callAwayStateOther(final ClientInfo client, final AwayState oldState, final AwayState state) {
         return getCallbackManager().getCallbackType(OtherAwayStateListener.class).call(client, oldState, state);
     }
-    
+
     /**
      * Callback to all objects implementing the onChannelAwayStateOther Callback.
      *
@@ -122,7 +122,7 @@ public class ProcessWho extends IRCProcessor {
     protected boolean callChannelAwayStateOther(final ChannelInfo channel, final ChannelClientInfo channelClient, final AwayState oldState, final AwayState state) {
         return getCallbackManager().getCallbackType(ChannelOtherAwayStateListener.class).call(channel, channelClient, oldState, state);
     }
-    
+
     /**
      * What does this IRCProcessor handle.
      *
@@ -131,14 +131,16 @@ public class ProcessWho extends IRCProcessor {
     @Override
     public String[] handles() {
         return new String[]{"352"};
-    } 
-    
+    }
+
     /**
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    protected ProcessWho(IRCParser parser, ProcessingManager manager) { super(parser, manager); }
+    protected ProcessWho(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
 
 }

src/com/dmdirc/parser/irc/ProcessingManager.java

@@ -34,7 +34,7 @@ import java.util.Map;
  * @author Shane Mc Cormack
  */
 public class ProcessingManager {
-    /** Reference to the parser object that owns this ProcessingManager */
+    /** Reference to the parser object that owns this ProcessingManager. */
     IRCParser myParser;
 
     /** Hashtable used to store the different types of IRCProcessor known. */
@@ -52,7 +52,7 @@ public class ProcessingManager {
      *
      * @param parser IRCParser that owns this Processing Manager
      */
-    public ProcessingManager(IRCParser parser) {
+    public ProcessingManager(final IRCParser parser) {
         myParser = parser;
         //------------------------------------------------
         // Add processors
@@ -135,14 +135,14 @@ public class ProcessingManager {
      * @param handles String Array of tokens to add this processor as a hadler for
      */
     public void addProcessor(final String[] handles, final IRCProcessor processor) {
-        doDebug("Adding processor: "+processor.getName());
+        doDebug("Adding processor: " + processor.getName());
 
         for (int i = 0; i < handles.length; ++i) {
             if (processHash.containsKey(handles[i].toLowerCase())) {
                 // New Processors take priority over old ones
                 processHash.remove(handles[i].toLowerCase());
             }
-            doDebug("\t Added handler for: "+handles[i]);
+            doDebug("\t Added handler for: " + handles[i]);
             processHash.put(handles[i].toLowerCase(), processor);
         }
     }
@@ -154,12 +154,12 @@ public class ProcessingManager {
      */
     public void delProcessor(final IRCProcessor processor) {
         IRCProcessor testProcessor;
-        doDebug("Deleting processor: "+processor.getName());
+        doDebug("Deleting processor: " + processor.getName());
         for (String elementName : processHash.keySet()) {
-            doDebug("\t Checking handler for: "+elementName);
+            doDebug("\t Checking handler for: " + elementName);
             testProcessor = processHash.get(elementName);
             if (testProcessor.getName().equalsIgnoreCase(processor.getName())) {
-                doDebug("\t Removed handler for: "+elementName);
+                doDebug("\t Removed handler for: " + elementName);
                 processHash.remove(elementName);
             }
         }
@@ -176,7 +176,7 @@ public class ProcessingManager {
         if (processHash.containsKey(sParam.toLowerCase())) {
             return processHash.get(sParam.toLowerCase());
         } else {
-            throw new ProcessorNotFoundException("No processors will handle "+sParam);
+            throw new ProcessorNotFoundException("No processors will handle " + sParam);
         }
     }
 
@@ -195,7 +195,7 @@ public class ProcessingManager {
         } catch (ProcessorNotFoundException p) {
             throw p;
         } catch (Exception e) {
-            final ParserError ei = new ParserError(ParserError.ERROR_ERROR,"Exception in Processor. ["+messageProcessor+"]: "+e.getMessage(), myParser.getLastLine());
+            final ParserError ei = new ParserError(ParserError.ERROR_ERROR,"Exception in Processor. [" + messageProcessor + "]: " + e.getMessage(), myParser.getLastLine());
             ei.setException(e);
             myParser.callErrorInfo(ei);
         } finally {

src/com/dmdirc/parser/irc/ProcessorNotFoundException.java

@@ -34,7 +34,7 @@ public class ProcessorNotFoundException extends Exception {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    
+
     /**
      * Create a new ProcessorNotFound Exception.
      *

src/com/dmdirc/parser/irc/ServerInfo.java

@@ -58,11 +58,15 @@ public class ServerInfo {
     private String proxyUser = "";
     /** Proxy password if required. */
     private String proxyPass = "";
-    /** URI used to create this ServerInfo if applicable */
+    /** URI used to create this ServerInfo if applicable. */
     private URI uri = null;
 
-    /** Constructor using Default values. */
-    public ServerInfo() { }
+    /**
+     * Constructor using default values.
+     */
+    public ServerInfo() {
+        //Use default values
+    }
 
     /**
      * Constructor using specifed host, port and password, SSL/Proxy must be specifed separately.
@@ -127,7 +131,7 @@ public class ServerInfo {
             // stupid settings to setXXXX()
             // In this case, try to return any given URI, else a blank one.
             try {
-                return (uri != null) ? uri : new URI("");
+                return (uri == null) ? new URI("") : uri;
             } catch (URISyntaxException ex2) {
                 /* This can't ever happen. */
                 return null;
@@ -292,9 +296,15 @@ public class ServerInfo {
         }
 
         String channelString = uri.getPath();
-        if (uri.getRawQuery() != null && !uri.getRawQuery().isEmpty()) { channelString += "?" + uri.getRawQuery(); }
-        if (uri.getRawFragment() != null && !uri.getRawFragment().isEmpty()) { channelString += "#" + uri.getRawFragment(); }
-        if (channelString.startsWith("/")) { channelString = channelString.substring(1); }
+        if (uri.getRawQuery() != null && !uri.getRawQuery().isEmpty()) {
+            channelString += "?" + uri.getRawQuery();
+        }
+        if (uri.getRawFragment() != null && !uri.getRawFragment().isEmpty()) {
+            channelString += "#" + uri.getRawFragment();
+        }
+        if (channelString.startsWith("/")) {
+            channelString = channelString.substring(1);
+        }
 
         return channelString;
     }

src/com/dmdirc/parser/irc/ServerType.java

@@ -65,7 +65,7 @@ public enum ServerType {
     HYBRID7("hybrid7", ".*ircd.hybrid.*", "eI"),
     /** Older versions of Hybrid. */
     HYBRID("hybrid", ".*hybrid.*", "eI"),
-    /** Charybdis */
+    /** Charybdis. */
     CHARYBDIS("charybdis", ".*charybdis.*", "eI"),
     /** Freenodes New IRCD. */
     IRCD_SEVEN("ircd-seven", ".*ircd-seven.*", "eI"),
@@ -203,7 +203,7 @@ public enum ServerType {
     }
 
     /**
-     * Get the MatchType of this ServerType
+     * Get the MatchType of this ServerType.
      *
      * @return The MatchType of this ServerType
      */

src/com/dmdirc/parser/irc/outputqueue/OutputQueue.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
@@ -41,7 +41,7 @@ public class OutputQueue {
     private boolean queueEnabled = true;
 
     /** The output queue! */
-    private BlockingQueue<QueueItem> queue = new PriorityBlockingQueue<QueueItem>();
+    private final BlockingQueue<QueueItem> queue = new PriorityBlockingQueue<QueueItem>();
 
     /** Thread for the sending queue. */
     private QueueHandler queueHandler;
@@ -50,11 +50,6 @@ public class OutputQueue {
     private QueueFactory queueFactory = PriorityQueueHandler.getFactory();
     // private QueueFactory queueFactory = SimpleRateLimitedQueueHandler.getFactory();
 
-    /**
-     * Create a new OutputQueue
-     */
-    public OutputQueue() { }
-
     /**
      * Set the output stream for this queue.
      *

src/com/dmdirc/parser/irc/outputqueue/PriorityQueueHandler.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
@@ -32,12 +32,12 @@ import java.util.concurrent.BlockingQueue;
  */
 public class PriorityQueueHandler extends QueueHandler {
     /**
-     * Get a QueueFactory that produces PriorityQueueHandlers
+     * Get a QueueFactory that produces PriorityQueueHandlers.
      *
      * @return a QueueFactory that produces PrirortyQueueHandlers.
      */
     public static QueueFactory getFactory() {
-        return new QueueFactory(){
+        return new QueueFactory() {
             /** {@inheritDoc} */
             @Override
             public QueueHandler getQueueHandler(final OutputQueue outputQueue, final BlockingQueue<QueueItem> queue, final PrintWriter out) {
@@ -47,7 +47,7 @@ public class PriorityQueueHandler extends QueueHandler {
     }
 
     /**
-     * Create a new PriorityQueueHandler
+     * Create a new PriorityQueueHandler.
      *
      * @param outputQueue Owner of this Queue Handler
      * @param queue Queue to use

src/com/dmdirc/parser/irc/outputqueue/QueueFactory.java

@@ -1,6 +1,23 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ *  Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
  */
 
 package com.dmdirc.parser.irc.outputqueue;

src/com/dmdirc/parser/irc/outputqueue/QueueHandler.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
@@ -43,7 +43,7 @@ public abstract class QueueHandler extends Thread implements Comparator<QueueIte
     protected OutputQueue outputQueue;
 
     /**
-     * Create a new Queue Thread
+     * Create a new Queue Thread.
      *
      * @param outputQueue the OutputQueue that owns us.
      * @param queue Queue to handle
@@ -58,7 +58,7 @@ public abstract class QueueHandler extends Thread implements Comparator<QueueIte
     }
 
     /**
-     * Send the given item
+     * Send the given item.
      *
      * @param line Line to send.
      */
@@ -119,7 +119,7 @@ public abstract class QueueHandler extends Thread implements Comparator<QueueIte
      * This is the main even loop of the queue.
      * It needs to handle pulling items out of the queue and calling
      * sendLine.
-     * 
+     *
      * It also needs to handle any delays in sending that it deems needed.
      */
     @Override

src/com/dmdirc/parser/irc/outputqueue/QueueItem.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
@@ -25,21 +25,21 @@ package com.dmdirc.parser.irc.outputqueue;
 import com.dmdirc.parser.common.QueuePriority;
 
 /**
- * Queued Item
+ * Queued Item.
  *
  * @author shane
  */
 public class QueueItem implements Comparable<QueueItem> {
-    /** Global Item Number*/
+    /** Global Item Number. */
     private static long number = 0L;
 
-    /** Line to send */
+    /** Line to send. */
     private final String line;
 
     /** Time this line was added. */
     private final long time;
 
-    /** Item Number */
+    /** Item Number. */
     private final long itemNumber;
 
     /** What is the priority of this line? */
@@ -49,7 +49,7 @@ public class QueueItem implements Comparable<QueueItem> {
     private final QueueHandler handler;
 
     /**
-     * Get the value of line
+     * Get the value of line.
      *
      * @return the value of line
      */
@@ -58,7 +58,7 @@ public class QueueItem implements Comparable<QueueItem> {
     }
 
     /**
-     * Get the value of time
+     * Get the value of time.
      *
      * @return the value of time
      */
@@ -67,7 +67,7 @@ public class QueueItem implements Comparable<QueueItem> {
     }
 
     /**
-     * Get the number of this item
+     * Get the number of this item.
      *
      * @return the value of itemNumber
      */
@@ -76,7 +76,7 @@ public class QueueItem implements Comparable<QueueItem> {
     }
 
     /**
-     * Get the value of priority
+     * Get the value of priority.
      *
      * @return the value of priority
      */
@@ -85,11 +85,11 @@ public class QueueItem implements Comparable<QueueItem> {
     }
 
     /**
-     * Create a new QueueItem
+     * Create a new QueueItem.
      *
      * @param handler Handler for this QueueItem
      * @param line Line to send
-     * @param priority
+     * @param priority Priority for the queue item
      */
     public QueueItem(final QueueHandler handler, final String line, final QueuePriority priority) {
         this.handler = handler;

src/com/dmdirc/parser/irc/outputqueue/SimpleRateLimitedQueueHandler.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
@@ -36,12 +36,12 @@ import java.util.concurrent.BlockingQueue;
  */
 public class SimpleRateLimitedQueueHandler extends QueueHandler {
     /**
-     * Get a QueueFactory that produces PriorityQueueHandlers
+     * Get a QueueFactory that produces PriorityQueueHandlers.
      *
      * @return a QueueFactory that produces PrirortyQueueHandlers.
      */
     public static QueueFactory getFactory() {
-        return new QueueFactory(){
+        return new QueueFactory() {
             /** {@inheritDoc} */
             @Override
             public QueueHandler getQueueHandler(final OutputQueue outputQueue, final BlockingQueue<QueueItem> queue, final PrintWriter out) {
@@ -72,7 +72,7 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
     private boolean alwaysUpdateTime = true;
 
     /**
-     * Create a new SimpleRateLimitedQueueHandler
+     * Create a new SimpleRateLimitedQueueHandler.
      *
      * @param outputQueue Owner of this Queue Handler
      * @param queue Queue to use
@@ -84,7 +84,7 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
 
     /**
      * Get the number of items needed to activate rate limiting.
-     * 
+     *
      * @return Number of items needed to activate rate limiting.
      */
     public int getItems() {
@@ -159,7 +159,7 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
      *
      * If true, assuming the default settings) items sent at 0, 3, 6, 9 will
      * activate rate limiting, if false it would need to be 0, 1, 2, 3.
-     * 
+     *
      * @param alwaysUpdateTime Should LastItemTime always updated?
      */
     public void setAlwaysUpdateTime(final boolean alwaysUpdateTime) {
@@ -168,7 +168,7 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
 
     /**
      * Are we currently limiting?
-     * 
+     *
      * @return True if limiting is active.
      */
     public boolean isLimiting() {
@@ -183,16 +183,16 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
      */
     @Override
     public int compare(final QueueItem mainObject, final QueueItem otherObject) {
-        if (mainObject.getPriority().compareTo(otherObject.getPriority()) != 0) {
-            return mainObject.getPriority().compareTo(otherObject.getPriority());
-        } else {
+        if (mainObject.getPriority().compareTo(otherObject.getPriority()) == 0) {
             return super.compare(mainObject, otherObject);
+        } else {
+            return mainObject.getPriority().compareTo(otherObject.getPriority());
         }
     }
 
     /** {@inheritDoc} */
     @Override
-    public QueueItem getQueueItem(String line, QueuePriority priority) {
+    public QueueItem getQueueItem(final String line, final QueuePriority priority) {
         // Was the last line added less than limitTime ago?
         synchronized (this) {
             final boolean overTime = (lastItemTime + limitTime > System.currentTimeMillis());
@@ -219,7 +219,7 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
                 lastItemTime = System.currentTimeMillis();
             }
         }
-        
+
         return super.getQueueItem(line, priority);
     }
 
@@ -229,7 +229,7 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
         try {
             while (outputQueue.isQueueEnabled()) {
                 final QueueItem item = queue.take();
-                
+
                 sendLine(item.getLine());
 
                 final boolean doSleep;