Style fixes

Change-Id: Ia1d78711f050f6938753a1e8e1dd5dd8b1457b5d
Reviewed-on: http://gerrit.dmdirc.com/1977
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -72,35 +72,49 @@ public class IRCChannelClientInfo implements ChannelClientInfo {
     }
 
     /** {@inheritDoc} */
-        @Override
-    public Map<Object, Object> getMap() { return myMap; }
+    @Override
+    public Map<Object, Object> getMap() {
+        return myMap;
+    }
 
     /** {@inheritDoc} */
-        @Override
-    public IRCClientInfo getClient() { return cClient; }
+    @Override
+    public IRCClientInfo getClient() {
+        return cClient;
+    }
 
     /** {@inheritDoc} */
-        @Override
-    public ChannelInfo getChannel() { return myChannel; }
+    @Override
+    public ChannelInfo getChannel() {
+        return myChannel;
+    }
+
     /**
      * Get the nickname of the client object represented by this channelclient.
      *
      * @return Nickname of the Client object represented by this channelclient
      */
-    public String getNickname() { return cClient.getNickname(); }
+    public String getNickname() {
+        return cClient.getNickname();
+    }
 
     /**
      * Set the modes this client has (Prefix modes).
      *
      * @param nNewMode integer representing the modes this client has.
      */
-    public void setChanMode(final long nNewMode) { nModes = nNewMode; }
+    public void setChanMode(final long nNewMode) {
+        nModes = nNewMode;
+    }
+
     /**
      * Get the modes this client has (Prefix modes).
      *
      * @return integer representing the modes this client has.
      */
-    public long getChanMode() { return nModes; }
+    public long getChanMode() {
+        return nModes;
+    }
 
     /**
      * Get the modes this client has (Prefix modes) as a string.
@@ -121,7 +135,9 @@ public class IRCChannelClientInfo implements ChannelClientInfo {
                 for (char cTemp : myParser.prefixModes.keySet()) {
                     nTemp = myParser.prefixModes.get(cTemp);
                     if (nTemp == i) {
-                        if (bPrefix) { cTemp = myParser.prefixMap.get(cTemp); }
+                        if (bPrefix) {
+                            cTemp = myParser.prefixMap.get(cTemp);
+                        }
                         sModes = sModes.append(cTemp);
                         break;
                     }
@@ -146,28 +162,33 @@ public class IRCChannelClientInfo implements ChannelClientInfo {
      */
     public long getImportantModeValue() {
         for (long i = myParser.nextKeyPrefix; i > 0; i = i / 2) {
-            if ((nModes & i) == i) { return i; }
+            if ((nModes & i) == i) {
+                return i;
+            }
         }
         return 0;
     }
 
     /** {@inheritDoc} */
-        @Override
+    @Override
     public String getImportantMode() {
         String sModes = this.getChanModeStr(false);
-        if (!sModes.isEmpty()) { sModes = "" + sModes.charAt(0); }
+        if (!sModes.isEmpty()) {
+            sModes = "" + sModes.charAt(0);
+        }
         return sModes;
     }
 
     /** {@inheritDoc} */
-        @Override
+    @Override
     public String getImportantModePrefix() {
         String sModes = this.getChanModeStr(true);
-        if (!sModes.isEmpty()) { sModes = "" + sModes.charAt(0); }
+        if (!sModes.isEmpty()) {
+            sModes = "" + sModes.charAt(0);
+        }
         return sModes;
     }
 
-
     /**
      * Get the String Value of ChannelClientInfo (ie @Nickname).
      *
@@ -179,7 +200,7 @@ public class IRCChannelClientInfo implements ChannelClientInfo {
     }
 
     /** {@inheritDoc} */
-        @Override
+    @Override
     public void kick(final String sReason) {
         myParser.sendString("KICK " + myChannel + " " + this.getNickname() + (sReason.isEmpty() ? sReason : " :" + sReason));
     }
@@ -189,18 +210,18 @@ public class IRCChannelClientInfo implements ChannelClientInfo {
      *
      * @return String Value of user (inc prefix) (ie @+Nickname)
      */
-    public String toFullString() { return this.getChanModeStr(true) + this.getNickname(); }
-
-        /** {@inheritDoc} */
-        @Override
-        public int compareTo(final ChannelClientInfo arg0) {
-            if (arg0 instanceof IRCChannelClientInfo) {
-                final IRCChannelClientInfo other = (IRCChannelClientInfo) arg0;
-                return (int) (getImportantModeValue() - other.getImportantModeValue());
-            }
+    public String toFullString() {
+        return this.getChanModeStr(true) + this.getNickname();
+    }
 
-            return 0;
+    /** {@inheritDoc} */
+    @Override
+    public int compareTo(final ChannelClientInfo arg0) {
+        if (arg0 instanceof IRCChannelClientInfo) {
+            final IRCChannelClientInfo other = (IRCChannelClientInfo) arg0;
+            return (int) (getImportantModeValue() - other.getImportantModeValue());
         }
 
+        return 0;
+    }
 }
-

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

@@ -67,7 +67,7 @@ public class IRCClientInfo implements LocalClientInfo {
     /**
      * Create a new client object from a hostmask.
      *
-      * @param tParser Refernce to parser that owns this channelclient (used for modes)
+     * @param tParser Refernce to parser that owns this channelclient (used for modes)
      * @param sHostmask Hostmask parsed by parseHost to get nickname
      * @see ClientInfo#parseHost
      */
@@ -109,7 +109,8 @@ public class IRCClientInfo implements LocalClientInfo {
      * @return this Object
      */
     public IRCClientInfo setFake(final boolean newValue) {
-        fake = newValue; return this;
+        fake = newValue;
+        return this;
     }
 
     /**
@@ -486,5 +487,4 @@ public class IRCClientInfo implements LocalClientInfo {
     public void setBack() {
         parser.sendRawMessage("AWAY");
     }
-
 }

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

@@ -35,7 +35,6 @@ public enum IRCEncoding {
     STRICT_RFC1459(3),
     /** Standard RFC1459. */
     RFC1459(4);
-
     /** The limit used for this encoding. */
     private final int limit;
 

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

@@ -84,8 +84,6 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
     public static final int DEBUG_PROCESSOR = 4;
     /** List Mode Queue Debug Information. */
     public static final int DEBUG_LMQ = 8;
-    //public static final int DEBUG_SOMETHING = 16; //Next thingy
-
     /** A map of this parser's implementations of common interfaces. */
     public static final Map<Class<?>, Class<?>> IMPL_MAP = new HashMap<Class<?>, Class<?>>();
 
@@ -95,7 +93,6 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
         IMPL_MAP.put(ClientInfo.class, IRCClientInfo.class);
         IMPL_MAP.put(LocalClientInfo.class, IRCClientInfo.class);
     }
-
     /** Attempt to update user host all the time, not just on Who/Add/NickChange. */
     static final boolean ALWAYS_UPDATECLIENT = true;
     /** Byte used to show that a non-boolean mode is a list (b). */
@@ -2231,7 +2228,7 @@ public class IRCParser implements SecureParser, EncodingParser, Runnable {
 
     /**
      * Remove a client from the ClientList.
-    .     * This WILL allow cMyself to be removed from the list
+     * This WILL allow cMyself to be removed from the list
      *
      * @param client Client to remove
      */

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

@@ -38,5 +38,4 @@ class IRCParserException extends Exception {
     public IRCParserException(final String message) {
         super(message);
     }
-
 }

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

@@ -29,18 +29,16 @@ import com.dmdirc.parser.common.QueuePriority;
 /**
  * IRCProcessor.
  * Superclass for all IRCProcessor types.
- *
- * @author Shane Mc Cormack
  */
 public abstract class IRCProcessor {
-    /** Reference to the IRCParser that owns this IRCProcessor. */
-    protected IRCParser myParser;
 
+    /** Reference to the IRCParser that owns this IRCProcessor. */
+    protected final IRCParser parser;
     /** Reference to the Processing in charge of this IRCProcessor. */
-    protected ProcessingManager myManager;
+    protected final ProcessingManager manager;
 
-    // Some functions from the main parser are useful, and having to use myParser.functionName
-    // is annoying, so we also implement them here (calling them again using myParser)
+    // Some functions from the main parser are useful, and having to use parser.functionName
+    // is annoying, so we also implement them here (calling them again using parser)
     /**
      * Create a new instance of the IRCProcessor Object.
      *
@@ -48,8 +46,8 @@ public abstract class IRCProcessor {
      * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
     protected IRCProcessor(final IRCParser parser, final ProcessingManager manager) {
-        this.myParser = parser;
-        this.myManager = manager;
+        this.parser = parser;
+        this.manager = manager;
     }
 
     /**
@@ -60,7 +58,7 @@ public abstract class IRCProcessor {
      * @return true if a method was called, false otherwise
      */
     protected final boolean callErrorInfo(final ParserError errorInfo) {
-        return myParser.callErrorInfo(errorInfo);
+        return parser.callErrorInfo(errorInfo);
     }
 
     /**
@@ -73,7 +71,7 @@ public abstract class IRCProcessor {
      * @return true if a method was called, false otherwise
      */
     protected final boolean callDebugInfo(final int level, final String data, final Object... args) {
-        return myParser.callDebugInfo(level, String.format(data, args));
+        return parser.callDebugInfo(level, String.format(data, args));
     }
 
     /**
@@ -85,7 +83,7 @@ public abstract class IRCProcessor {
      * @return true if a method was called, false otherwise
      */
     protected final boolean callDebugInfo(final int level, final String data) {
-        return myParser.callDebugInfo(level, data);
+        return parser.callDebugInfo(level, data);
     }
 
     /**
@@ -95,7 +93,7 @@ public abstract class IRCProcessor {
      * @return true if name is valid on the current connection, false otherwise. (Always false before noMOTD/MOTDEnd)
      */
     protected final boolean isValidChannelName(final String sChannelName) {
-        return myParser.isValidChannelName(sChannelName);
+        return parser.isValidChannelName(sChannelName);
     }
 
     /**
@@ -105,7 +103,7 @@ public abstract class IRCProcessor {
      * @return ClientInfo Object for the client, or null
      */
     protected final IRCClientInfo getClientInfo(final String sWho) {
-        return myParser.isKnownClient(sWho) ? myParser.getClient(sWho) : null;
+        return parser.isKnownClient(sWho) ? parser.getClient(sWho) : null;
     }
 
     /**
@@ -115,7 +113,7 @@ public abstract class IRCProcessor {
      * @return ChannelInfo Object for the channel, or null
      */
     protected final IRCChannelInfo getChannel(final String name) {
-        return myParser.getChannel(name);
+        return parser.getChannel(name);
     }
 
     /**
@@ -124,7 +122,7 @@ public abstract class IRCProcessor {
      * @return Reference to the CallbackManager
      */
     protected final CallbackManager getCallbackManager() {
-        return myParser.getCallbackManager();
+        return parser.getCallbackManager();
     }
 
     /**
@@ -133,7 +131,7 @@ public abstract class IRCProcessor {
      * @param line Line to send (\r\n termination is added automatically)
      */
     protected final void sendString(final String line) {
-        myParser.sendString(line);
+        parser.sendString(line);
     }
 
     /**
@@ -143,7 +141,7 @@ public abstract class IRCProcessor {
      * @param priority Priority of this line.
      */
     protected final void sendString(final String line, final QueuePriority priority) {
-        myParser.sendString(line, priority);
+        parser.sendString(line, priority);
     }
 
     /**
@@ -186,7 +184,8 @@ public abstract class IRCProcessor {
      * Get the name for this Processor.
      * @return the name of this processor
      */
-        @Override
-    public final String toString() { return this.getName(); }
-
+    @Override
+    public final String toString() {
+        return this.getName();
+    }
 }

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

@@ -28,7 +28,6 @@ import com.dmdirc.parser.interfaces.ProtocolDescription;
  * Provides a description of the IRC protocol.
  *
  * @since 0.6.4
- * @author chris
  */
 public class IRCProtocolDescription implements ProtocolDescription {
 
@@ -43,5 +42,4 @@ public class IRCProtocolDescription implements ProtocolDescription {
     public String[] parseHostmask(final String hostmask) {
         return IRCClientInfo.parseHostFull(hostmask);
     }
-
 }

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

@@ -33,16 +33,13 @@ import java.io.InputStream;
  * protocol and can transcode text appropriately.
  *
  * @since 0.6.5
- * @author chris
  */
 public class IRCReader implements Closeable {
 
     /** Maximum length for an IRC line in bytes. */
     private static final int LINE_LENGTH = 512;
-
     /** The input stream to read input from. */
     private final InputStream stream;
-
     /** The encoder to use to encode lines. */
     private final Encoder encoder;
 
@@ -216,7 +213,5 @@ public class IRCReader implements Closeable {
         public String[] getTokens() {
             return tokens;
         }
-
     }
-
 }

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

@@ -19,6 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 package com.dmdirc.parser.irc;
 
 import com.dmdirc.parser.interfaces.StringConverter;

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

@@ -29,18 +29,18 @@ import java.lang.reflect.Method;
  * Logging using log4j if available.
  */
 public class Logging {
+
     /** Available Log Levels. */
     public enum LogLevel {
+
         TRACE("trace", "isTraceEnabled"),
         DEBUG("debug", "isDebugEnabled"),
         INFO("info", "isInfoEnabled"),
         WARN("warn", "isWarnEnabled"),
         ERROR("error", "isErrorEnabled"),
         FATAL("fatal", "isFatalEnabled");
-
         /** Method name. */
         private final String methodName;
-
         /** Check Method name. */
         private final String checkMethodName;
 
@@ -60,22 +60,23 @@ public class Logging {
          *
          * @return Name of method in log4j to log to
          */
-        public String getMethodName() { return methodName; }
+        public String getMethodName() {
+            return methodName;
+        }
 
         /**
          * Get the Name of the check method in log4j.
          *
          * @return Name of check method in log4j
          */
-        public String getCheckMethodName() { return checkMethodName; }
+        public String getCheckMethodName() {
+            return checkMethodName;
+        }
     };
-
     /** Singleton Instance of Logging. */
     private static Logging me;
-
     /** Is log4j available. */
     private final boolean isAvailable;
-
     /** "Log" object if available. */
     private Object log;
 
@@ -154,7 +155,9 @@ public class Logging {
      * @param throwable Throwable to log alongside message
      */
     public void log(final LogLevel level, final String message, final Throwable throwable) {
-        if (!isAvailable) { return; }
+        if (!isAvailable) {
+            return;
+        }
         try {
             if (throwable == null) {
                 final Method method = log.getClass().getMethod(level.getMethodName(), new Class[]{String.class});

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

@@ -28,29 +28,29 @@ import java.util.TimerTask;
 /**
  * Used by the parser to ping the server at a set interval to check that the
  * server is still alive.
- *
- * @author Shane Mc Cormack
  */
 public class PingTimer extends TimerTask {
+
     /** Owning Parser. */
-    final IRCParser myOwner;
+    private final IRCParser parser;
     /** The Timer that owns this task. */
-    final Timer myTimer;
+    private final Timer timer;
 
     /**
      * Create the PingTimer.
      *
-     * @param control IRCParser that owns this TimerTask.
+     * @param parser IRCParser that owns this TimerTask.
      * @param timer Timer that owns this TimerTask.
      */
-    public PingTimer(final IRCParser control, final Timer timer) {
+    public PingTimer(final IRCParser parser, final Timer timer) {
         super();
-        myOwner = control;
-        myTimer = timer;
+        this.parser = parser;
+        this.timer = timer;
     }
 
     /** Timer has been executed. */
+    @Override
     public void run() {
-        myOwner.pingTimerTask(myTimer);
+        parser.pingTimerTask(timer);
     }
 }

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

@@ -28,6 +28,17 @@ import com.dmdirc.parser.common.ParserError;
  * Process a 001 message.
  */
 public class Process001 extends IRCProcessor {
+
+    /**
+     * 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 Process001(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a 001 message.
      *
@@ -36,40 +47,40 @@ public class Process001 extends IRCProcessor {
      */
     @Override
     public void process(final String sParam, final String[] token) {
-        myParser.got001 = true;
+        parser.got001 = true;
         // << :demon1.uk.quakenet.org 001 Java-Test :Welcome to the QuakeNet IRC Network, Java-Test
-        myParser.serverName = token[0].substring(1, token[0].length());
+        parser.serverName = token[0].substring(1, token[0].length());
         final String sNick = token[2];
 
         // myself will be fake if we havn't recieved a 001 yet
-        if (myParser.getLocalClient().isFake()) {
+        if (parser.getLocalClient().isFake()) {
             // Update stored information
-            myParser.getLocalClient().setUserBits(sNick, true, true);
-            myParser.getLocalClient().setFake(false);
-            myParser.addClient(myParser.getLocalClient());
+            parser.getLocalClient().setUserBits(sNick, true, true);
+            parser.getLocalClient().setFake(false);
+            parser.addClient(parser.getLocalClient());
         } else {
             // Another 001? if nicknames change then we need to update the hashtable
-            if (!myParser.getLocalClient().getNickname().equalsIgnoreCase(sNick)) {
+            if (!parser.getLocalClient().getNickname().equalsIgnoreCase(sNick)) {
                 // Nick changed, remove old me
-                myParser.forceRemoveClient(myParser.getLocalClient());
+                parser.forceRemoveClient(parser.getLocalClient());
                 /// Update stored information
-                myParser.getLocalClient().setUserBits(sNick, true, true);
+                parser.getLocalClient().setUserBits(sNick, true, true);
                 // Check that we don't already know someone by this name
-                if (getClientInfo(myParser.getLocalClient().getNickname()) == null) {
+                if (getClientInfo(parser.getLocalClient().getNickname()) == null) {
                     // And add to list
-                    myParser.addClient(myParser.getLocalClient());
+                    parser.addClient(parser.getLocalClient());
                 } else {
                     // Someone else already know? this is bad!
-                    myParser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL, "001 overwrites existing client?", myParser.getLastLine()));
+                    parser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL, "001 overwrites existing client?", parser.getLastLine()));
                 }
             }
         }
 
-        myParser.startPingTimer();
+        parser.startPingTimer();
 
-        final String channels = myParser.server.getChannels();
+        final String channels = parser.server.getChannels();
         if (channels != null) {
-            myParser.joinChannel(channels);
+            parser.joinChannel(channels);
         }
     }
 
@@ -82,15 +93,4 @@ public class Process001 extends IRCProcessor {
     public String[] handles() {
         return new String[]{"001"};
     }
-
-    /**
-     * 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 Process001(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -33,6 +33,16 @@ import java.util.regex.Pattern;
  */
 public class Process004005 extends IRCProcessor {
 
+    /**
+     * 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 Process004005(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process ISUPPORT lines.
      *
@@ -43,19 +53,19 @@ public class Process004005 extends IRCProcessor {
     public void process(final String sParam, final String[] token) {
         if ("002".equals(sParam)) {
             final Pattern pattern = Pattern.compile("running(?: version)? (.*)$");
-            final Matcher matcher = pattern.matcher(myParser.getLastLine());
+            final Matcher matcher = pattern.matcher(parser.getLastLine());
             if (matcher.find()) {
-                myParser.h005Info.put("002IRCD", matcher.group(1));
+                parser.h005Info.put("002IRCD", matcher.group(1));
             }
         } else if ("003".equals(sParam)) {
-            myParser.h005Info.put("003IRCD", token[token.length - 1]);
+            parser.h005Info.put("003IRCD", token[token.length - 1]);
         } else if ("004".equals(sParam)) {
             // 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++]);
+            parser.h005Info.put("004IRCD", bits[i++]);
 
             if (bits[i].matches("^\\d+$")) {
                 // some IRCDs put a timestamp where the usermodes should be
@@ -64,15 +74,15 @@ public class Process004005 extends IRCProcessor {
                 i++;
             }
 
-            myParser.h005Info.put("USERMODES", bits[i++]);
-            myParser.h005Info.put("USERCHANMODES", bits[i++]);
+            parser.h005Info.put("USERMODES", bits[i++]);
+            parser.h005Info.put("USERCHANMODES", bits[i++]);
 
             if (bits.length > i) {
                 // INSPIRCD includes an extra param
-                myParser.h005Info.put("USERCHANPARAMMODES", bits[i++]);
+                parser.h005Info.put("USERCHANPARAMMODES", bits[i++]);
             }
 
-            myParser.parseUserModes();
+            parser.parseUserModes();
         } else if ("005".equals(sParam)) {
             for (int i = 3; i < token.length; i++) {
                 final String[] bits = token[i].split("=", 2);
@@ -88,13 +98,13 @@ public class Process004005 extends IRCProcessor {
                 callDebugInfo(IRCParser.DEBUG_INFO, "%s => %s", key, value);
 
                 if (isNegation) {
-                    myParser.h005Info.remove(key);
+                    parser.h005Info.remove(key);
                 } else {
-                    myParser.h005Info.put(key, value);
+                    parser.h005Info.put(key, value);
                 }
 
                 if ("NETWORK".equals(key) && !isNegation) {
-                    myParser.networkName = value;
+                    parser.networkName = value;
                     callGotNetwork();
                 } else if ("CASEMAPPING".equals(key) && !isNegation) {
                     IRCEncoding encoding = IRCEncoding.RFC1459;
@@ -102,30 +112,30 @@ public class Process004005 extends IRCProcessor {
                     try {
                         encoding = IRCEncoding.valueOf(value.toUpperCase().replace('-', '_'));
                     } catch (IllegalArgumentException ex) {
-                        myParser.callErrorInfo(new ParserError(
+                        parser.callErrorInfo(new ParserError(
                                 ParserError.ERROR_WARNING,
                                 "Unknown casemapping: '" + value + "' - assuming rfc1459",
-                                myParser.getLastLine()));
+                                parser.getLastLine()));
                     }
 
-                    final boolean encodingChanged = myParser.getStringConverter().getEncoding() != encoding;
-                    myParser.setEncoding(encoding);
+                    final boolean encodingChanged = parser.getStringConverter().getEncoding() != encoding;
+                    parser.setEncoding(encoding);
 
-                    if (encodingChanged && myParser.knownClients() == 1) {
+                    if (encodingChanged && parser.knownClients() == 1) {
                         // This means that the casemapping is not rfc1459
                         // We have only added ourselves so far (from 001)
                         // We can fix the hashtable easily.
-                        myParser.removeClient(myParser.getLocalClient());
-                        myParser.addClient(myParser.getLocalClient());
+                        parser.removeClient(parser.getLocalClient());
+                        parser.addClient(parser.getLocalClient());
                     }
                 } else if ("CHANTYPES".equals(key)) {
-                    myParser.parseChanPrefix();
+                    parser.parseChanPrefix();
                 } else if ("PREFIX".equals(key)) {
-                    myParser.parsePrefixModes();
+                    parser.parsePrefixModes();
                 } else if ("CHANMODES".equals(key)) {
-                    myParser.parseChanModes();
+                    parser.parseChanModes();
                 } else if ("NAMESX".equals(key) || "UHNAMES".equals(key)) {
-                    myParser.sendString("PROTOCTL " + key);
+                    parser.sendString("PROTOCTL " + key);
                 } else if ("LISTMODE".equals(key)) {
                     // Support for potential future decent mode listing in the protocol
                     //
@@ -134,12 +144,13 @@ public class Process004005 extends IRCProcessor {
                     String[] handles = new String[2];
                     handles[0] = value; // List mode item
                     final String endValue = "" + (Integer.parseInt(value) + 1);
-                    myParser.h005Info.put("LISTMODEEND", endValue);
+                    parser.h005Info.put("LISTMODEEND", endValue);
                     handles[1] = endValue; // List mode end
                     // Add listmode handlers
                     try {
-                        myParser.getProcessingManager().addProcessor(handles, myParser.getProcessingManager().getProcessor("__LISTMODE__"));
-                    } catch (ProcessorNotFoundException e) { }
+                        parser.getProcessingManager().addProcessor(handles, parser.getProcessingManager().getProcessor("__LISTMODE__"));
+                    } catch (ProcessorNotFoundException e) {
+                    }
                 }
             }
         }
@@ -163,21 +174,10 @@ public class Process004005 extends IRCProcessor {
      * @return true if a method was called, false otherwise
      */
     protected boolean callGotNetwork() {
-        final String networkName = myParser.networkName;
-        final String ircdVersion = myParser.getServerSoftware();
-        final String ircdType = myParser.getServerSoftwareType();
+        final String networkName = parser.networkName;
+        final String ircdVersion = parser.getServerSoftware();
+        final String ircdType = parser.getServerSoftwareType();
 
         return getCallbackManager().getCallbackType(NetworkDetectedListener.class).call(networkName, ircdVersion, ircdType);
     }
-
-    /**
-     * 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 Process004005(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -28,6 +28,17 @@ import com.dmdirc.parser.interfaces.callbacks.PasswordRequiredListener;
  * Process a 464 message.
  */
 public class Process464 extends IRCProcessor {
+
+    /**
+     * 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(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a 464 message.
      *
@@ -37,8 +48,6 @@ public class Process464 extends IRCProcessor {
     @Override
     public void process(final String sParam, final String[] token) {
         callPasswordRequired();
-//        ParserError ei = new ParserError(ParserError.ERROR_ERROR, "Password Required");
-//        callErrorInfo(ei);
     }
 
     /**
@@ -60,15 +69,4 @@ 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(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -29,6 +29,17 @@ import com.dmdirc.parser.interfaces.callbacks.AwayStateListener;
  * Process an Away/Back message.
  */
 public class ProcessAway extends IRCProcessor {
+
+    /**
+     * 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(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process an Away/Back message.
      *
@@ -43,9 +54,9 @@ public class ProcessAway extends IRCProcessor {
                 iClient.setAwayReason(token[token.length - 1]);
             }
         } else {
-            final AwayState oldState = myParser.getLocalClient().getAwayState();
-            myParser.getLocalClient().setAwayState("306".equals(sParam) ? AwayState.AWAY : AwayState.HERE);
-            callAwayState(oldState, myParser.getLocalClient().getAwayState(), myParser.getLocalClient().getAwayReason());
+            final AwayState oldState = parser.getLocalClient().getAwayState();
+            parser.getLocalClient().setAwayState("306".equals(sParam) ? AwayState.AWAY : AwayState.HERE);
+            callAwayState(oldState, parser.getLocalClient().getAwayState(), parser.getLocalClient().getAwayReason());
         }
     }
 
@@ -71,15 +82,4 @@ public class ProcessAway extends IRCProcessor {
     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(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -28,6 +28,17 @@ import com.dmdirc.parser.interfaces.callbacks.InviteListener;
  * Process an Invite Request.
  */
 public class ProcessInvite extends IRCProcessor {
+
+    /**
+     * 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(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process an Invite Request.
      *
@@ -63,15 +74,4 @@ public class ProcessInvite extends IRCProcessor {
     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(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -34,6 +34,16 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelSelfJoinListener;
  */
 public class ProcessJoin extends IRCProcessor {
 
+    /**
+     * 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(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a channel join.
      *
@@ -42,69 +52,73 @@ public class ProcessJoin extends IRCProcessor {
      */
     @Override
     public void process(final String sParam, final String[] token) {
-        if (sParam.equals("329")) {
-            if (token.length < 5) { return; }
-            final IRCChannelInfo iChannel = myParser.getChannel(token[3]);
+        if ("329".equals(sParam)) {
+            if (token.length < 5) {
+                return;
+            }
+            final IRCChannelInfo iChannel = parser.getChannel(token[3]);
             if (iChannel != null) {
                 try {
                     iChannel.setCreateTime(Integer.parseInt(token[4]));
                 } catch (NumberFormatException nfe) {
-                    /* Oh well, not a normal ircd I guess */
+                    // Oh well, not a normal ircd I guess
                 }
             }
         } else {
             // :nick!ident@host JOIN (:)#Channel
-            if (token.length < 3) { return; }
+            if (token.length < 3) {
+                return;
+            }
             IRCClientInfo iClient;
             IRCChannelInfo iChannel;
             IRCChannelClientInfo iChannelClient;
 
             iClient = getClientInfo(token[0]);
-            iChannel = myParser.getChannel(token[token.length - 1]);
+            iChannel = parser.getChannel(token[token.length - 1]);
 
             if (iClient == null) {
-                iClient = new IRCClientInfo(myParser, token[0]);
-                myParser.addClient(iClient);
+                iClient = new IRCClientInfo(parser, token[0]);
+                parser.addClient(iClient);
             }
             // Check to see if we know the host/ident for this client to facilitate dmdirc Formatter
-            if (iClient.getHostname().isEmpty()) { iClient.setUserBits(token[0], false); }
+            if (iClient.getHostname().isEmpty()) {
+                iClient.setUserBits(token[0], false);
+            }
             if (iChannel != null) {
-                if (iClient == myParser.getLocalClient()) {
+                if (iClient == parser.getLocalClient()) {
                     try {
                         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()));
+                            parser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL, "Joined known channel that we wern't already on..", parser.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);
+                            parser.getProcessingManager().process("PART", token);
                         }
-                    } catch (ProcessorNotFoundException e) { }
-                } else if (iChannel.getChannelClient(iClient) != null) {
-                    // Client joined channel that we already know of.
-                    return;
-                } else {
+                    } catch (ProcessorNotFoundException e) {
+                    }
+                } else if (iChannel.getChannelClient(iClient) == null) {
                     // This is only done if we are already the channel, and it isn't us that
                     // joined.
                     iChannelClient = iChannel.addClient(iClient);
                     callChannelJoin(iChannel, iChannelClient);
                     return;
+                } else {
+                    // Client joined channel that we already know of.
+                    return;
                 }
             }
-            //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(parser, token[token.length - 1]);
             // Add ourself to the channel, this will be overridden by the NAMES reply
             iChannel.addClient(iClient);
-            myParser.addChannel(iChannel);
+            parser.addChannel(iChannel);
             sendString("MODE " + iChannel.getName(), QueuePriority.LOW);
 
             callChannelSelfJoin(iChannel);
         }
     }
 
-
     /**
      * Callback to all objects implementing the ChannelJoin Callback.
      *
@@ -137,15 +151,4 @@ public class ProcessJoin extends IRCProcessor {
     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(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -32,6 +32,16 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelKickListener;
  */
 public class ProcessKick extends IRCProcessor {
 
+    /**
+     * 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(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a channel kick.
      *
@@ -51,7 +61,9 @@ public class ProcessKick extends IRCProcessor {
         iKicker = getClientInfo(token[0]);
         iChannel = getChannel(token[2]);
 
-        if (iClient == null) { return; }
+        if (iClient == null) {
+            return;
+        }
 
         if ((IRCParser.ALWAYS_UPDATECLIENT && iKicker != null)
                 && iKicker.getHostname().isEmpty()) {
@@ -60,8 +72,8 @@ public class ProcessKick extends IRCProcessor {
         }
 
         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()));
+            if (iClient != parser.getLocalClient()) {
+                callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got kick for channel (" + token[2] + ") that I am not on. [User: " + token[3] + "]", parser.getLastLine()));
             }
             return;
         } else {
@@ -70,16 +82,20 @@ public class ProcessKick extends IRCProcessor {
             }
             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()));
+                // callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got kick for channel ("+token[2]+") for a non-existant user. [User: "+token[0]+"]", parser.getLastLine()));
                 return;
             }
             iChannelKicker = iChannel.getChannelClient(token[0]);
-            if (myParser.removeAfterCallback) { callChannelKick(iChannel, iChannelClient, iChannelKicker, sReason, token[0]); }
+            if (parser.removeAfterCallback) {
+                callChannelKick(iChannel, iChannelClient, iChannelKicker, sReason, token[0]);
+            }
             iChannel.delClient(iClient);
-            if (!myParser.removeAfterCallback) { callChannelKick(iChannel, iChannelClient, iChannelKicker, sReason, token[0]); }
-            if (iClient == myParser.getLocalClient()) {
+            if (!parser.removeAfterCallback) {
+                callChannelKick(iChannel, iChannelClient, iChannelKicker, sReason, token[0]);
+            }
+            if (iClient == parser.getLocalClient()) {
                 iChannel.emptyChannel();
-                myParser.removeChannel(iChannel);
+                parser.removeChannel(iChannel);
             }
         }
     }
@@ -108,15 +124,4 @@ public class ProcessKick extends IRCProcessor {
     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(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -55,7 +55,7 @@ public class ProcessListModes extends IRCProcessor {
     @Override
     public void process(final String sParam, final String[] token) {
         final IRCChannelInfo channel = getChannel(token[3]);
-        final ServerType serverType = myParser.getServerType();
+        final ServerType serverType = parser.getServerType();
         String item = "";
         String owner = "";
         byte tokenStart = 4; // Where do the relevent tokens start?
@@ -103,12 +103,12 @@ public class ProcessListModes extends IRCProcessor {
             // Protected User list
             mode = 'a';
             isItem = sParam.equals("389");
-        } else if (sParam.equals(myParser.h005Info.get("LISTMODE")) || sParam.equals(myParser.h005Info.get("LISTMODEEND"))) {
+        } else if (sParam.equals(parser.h005Info.get("LISTMODE")) || sParam.equals(parser.h005Info.get("LISTMODEEND"))) {
             // Support for potential future decent mode listing in the protocol
             //
             // See my proposal: http://shane.dmdirc.com/listmodes.php
             mode = token[4].charAt(0);
-            isItem = sParam.equals(myParser.h005Info.get("LISTMODE"));
+            isItem = sParam.equals(parser.h005Info.get("LISTMODE"));
             tokenStart = 5;
             isCleverMode = true;
         }
@@ -116,13 +116,13 @@ public class ProcessListModes extends IRCProcessor {
         final Queue<Character> listModeQueue = channel.getListModeQueue();
         if (!isCleverMode && listModeQueue != null) {
             if (sParam.equals("482")) {
-                myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "Dropped LMQ mode " + listModeQueue.poll());
+                parser.callDebugInfo(IRCParser.DEBUG_LMQ, "Dropped LMQ mode " + listModeQueue.poll());
                 return;
             } else {
                 if (listModeQueue.peek() != null) {
                     final Character oldMode = mode;
                     mode = listModeQueue.peek();
-                    myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "LMQ says this is " + mode);
+                    parser.callDebugInfo(IRCParser.DEBUG_LMQ, "LMQ says this is " + mode);
 
                     boolean error = true;
 
@@ -136,11 +136,11 @@ public class ProcessListModes extends IRCProcessor {
                         if (mode == 'b') {
                             error = !(oldMode == 'q' || oldMode == 'd');
                             lmq.remove((Character) 'q');
-                            myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "Dropping q from list");
+                            parser.callDebugInfo(IRCParser.DEBUG_LMQ, "Dropping q from list");
                         } else if (mode == 'q') {
                             error = !(oldMode == 'b' || oldMode == 'd');
                             lmq.remove((Character) 'b');
-                            myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "Dropping b from list");
+                            parser.callDebugInfo(IRCParser.DEBUG_LMQ, "Dropping b from list");
                         } else if (mode == 'd') {
                             error = !(oldMode == 'b' || oldMode == 'q');
                         }
@@ -155,7 +155,7 @@ 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);
+                        parser.callDebugInfo(IRCParser.DEBUG_LMQ, "LMQ disagrees with guess. LMQ: " + mode + " Guess: " + oldMode);
                     }
 
                     if (!isItem) {
@@ -186,7 +186,7 @@ public class ProcessListModes extends IRCProcessor {
                 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()));
+                    parser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got list mode: '" + mode + "' - but channel object doesn't agree.", parser.getLastLine()));
                 } else {
                     list.clear();
                     if (ServerTypeGroup.FREENODE.isMember(serverType) && (mode == 'b' || mode == 'q')) {
@@ -197,7 +197,7 @@ public class ProcessListModes extends IRCProcessor {
                             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()));
+                                parser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got list mode: '" + otherMode + "' - but channel object doesn't agree.", parser.getLastLine()));
                             } else {
                                 otherList.clear();
                             }
@@ -233,8 +233,8 @@ public class ProcessListModes extends IRCProcessor {
                 channel.setHasGotListModes(true);
 
                 if (isCleverMode) {
-                    for (Character thisMode : myParser.chanModesOther.keySet()) {
-                        if (myParser.chanModesOther.get(thisMode) == IRCParser.MODE_LIST) {
+                    for (Character thisMode : parser.chanModesOther.keySet()) {
+                        if (parser.chanModesOther.get(thisMode) == IRCParser.MODE_LIST) {
                             callChannelGotListModes(channel, thisMode);
                         }
                     }

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

@@ -31,6 +31,16 @@ import com.dmdirc.parser.interfaces.callbacks.MotdStartListener;
  */
 public class ProcessMOTD extends IRCProcessor {
 
+    /**
+     * 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(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a MOTD Related Line.
      *
@@ -91,15 +101,4 @@ public class ProcessMOTD extends IRCProcessor {
     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(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -56,6 +56,17 @@ import java.util.regex.PatternSyntaxException;
  * Each type has 5 Calls, making 15 callbacks handled here.
  */
 public class ProcessMessage extends IRCProcessor {
+
+    /**
+     * 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 ProcessMessage(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process PRIVMSGs and NOTICEs.
      * This horrible thing handles PRIVMSGs and NOTICES<br>
@@ -71,26 +82,35 @@ public class ProcessMessage extends IRCProcessor {
     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]; }
+        if (token[0].charAt(0) == ':') {
+            sMessage = token[0].substring(1);
+        } else {
+            sMessage = token[0];
+        }
         // We use sMessage to be the users host (first token in the line)
         try {
-            if (myParser.getIgnoreList().matches(sMessage) > -1) { return; }
+            if (parser.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());
-             pe.setException(pse);
-             callErrorInfo(pe);
+            final ParserError pe = new ParserError(ParserError.ERROR_WARNING + ParserError.ERROR_USER, "Error with ignore list regex: " + pse, parser.getLastLine());
+            pe.setException(pse);
+            callErrorInfo(pe);
         }
 
         // Lines such as:
         // "nick!user@host PRIVMSG"
         // are invalid, stop processing.
-        if (token.length < 3) { return; }
+        if (token.length < 3) {
+            return;
+        }
 
         // Is this actually a notice auth?
         if (token[0].indexOf('!') == -1 && token[1].equalsIgnoreCase("NOTICE") && token[2].equalsIgnoreCase("AUTH")) {
             try {
-                myParser.getProcessingManager().process("Notice Auth", token);
-            } catch (ProcessorNotFoundException e) { }
+                parser.getProcessingManager().process("Notice Auth", token);
+            } catch (ProcessorNotFoundException e) {
+            }
             return;
         }
 
@@ -120,13 +140,14 @@ public class ProcessMessage extends IRCProcessor {
                 if (bits.length > 1) {
                     sMessage = bits[1];
                     sMessage = sMessage.substring(0, sMessage.length() - 1);
-                } else { sMessage = ""; }
+                } 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))
-                    .equals(char1)) {
+                    && 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
                 // Some CTCPs have messages and some do not
@@ -150,12 +171,13 @@ public class ProcessMessage extends IRCProcessor {
         }
 
         // Remove the leading : from the host.
-        if (token[0].charAt(0) == ':' && token[0].length() > 1) { token[0] = token[0].substring(1); }
+        if (token[0].charAt(0) == ':' && token[0].length() > 1) {
+            token[0] = token[0].substring(1);
+        }
 
         iClient = getClientInfo(token[0]);
         // Facilitate DMDIRC Formatter
-        if ((IRCParser.ALWAYS_UPDATECLIENT && iClient != null) && iClient
-                .getHostname().isEmpty()) {
+        if ((IRCParser.ALWAYS_UPDATECLIENT && iClient != null) && iClient.getHostname().isEmpty()) {
             iClient.setUserBits(token[0], false);
         }
 
@@ -173,16 +195,18 @@ public class ProcessMessage extends IRCProcessor {
         // handled as if the prefix wasn't used. This can be changed in the future
         // if desired.
         final char modePrefix = token[2].charAt(0);
-        final boolean hasModePrefix =  (myParser.prefixMap.containsKey(modePrefix) && !myParser.prefixModes.containsKey(modePrefix));
+        final boolean hasModePrefix = (parser.prefixMap.containsKey(modePrefix) && !parser.prefixModes.containsKey(modePrefix));
         final String targetName = (hasModePrefix) ? token[2].substring(1) : token[2];
 
         if (isValidChannelName(targetName)) {
             iChannel = getChannel(targetName);
             if (iChannel == null) {
-                // callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got message for channel ("+targetName+") that I am not on.", myParser.getLastLine()));
+                // callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got message for channel ("+targetName+") that I am not on.", parser.getLastLine()));
                 return;
             }
-            if (iClient != null) { iChannelClient = iChannel.getChannelClient(iClient); }
+            if (iClient != null) {
+                iChannelClient = iChannel.getChannelClient(iClient);
+            }
             if (sParam.equalsIgnoreCase("PRIVMSG")) {
                 if (isAction) {
                     callChannelAction(iChannel, iChannelClient, sMessage, token[0]);
@@ -204,7 +228,7 @@ public class ProcessMessage extends IRCProcessor {
                     callChannelNotice(iChannel, iChannelClient, sMessage, token[0]);
                 }
             }
-        } else if (myParser.getStringConverter().equalsIgnoreCase(token[2], myParser.getMyNickname())) {
+        } else if (parser.getStringConverter().equalsIgnoreCase(token[2], parser.getMyNickname())) {
             if (sParam.equalsIgnoreCase("PRIVMSG")) {
                 if (isAction) {
                     callPrivateAction(sMessage, token[0]);
@@ -508,7 +532,6 @@ public class ProcessMessage extends IRCProcessor {
         return getCallbackManager().getCallbackType(UnknownServerNoticeListener.class).call(sMessage, sTarget, sHost);
     }
 
-
     /**
      * What does this IRCProcessor handle.
      *
@@ -518,15 +541,4 @@ public class ProcessMessage extends IRCProcessor {
     public String[] handles() {
         return new String[]{"PRIVMSG", "NOTICE"};
     }
-
-    /**
-     * 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 ProcessMessage(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -41,6 +41,17 @@ import java.util.Calendar;
  * Process a Mode line.
  */
 public class ProcessMode extends IRCProcessor {
+
+    /**
+     * 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 ProcessMode(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a Mode Line.
      *
@@ -114,9 +125,6 @@ public class ProcessMode extends IRCProcessor {
 
         iChannel = getChannel(sChannelName);
         if (iChannel == null) {
-            // callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got modes for channel ("+sChannelName+") that I am not on.", myParser.getLastLine()));
-            // iChannel = new ChannelInfo(myParser, sChannelName);
-            // myParser.addChannel(iChannel);
             return;
         }
         // Get the current channel modes
@@ -126,8 +134,7 @@ public class ProcessMode extends IRCProcessor {
 
         setterCCI = iChannel.getChannelClient(token[0]);
         // Facilitate dmdirc formatter
-        if ((IRCParser.ALWAYS_UPDATECLIENT && setterCCI != null) && setterCCI
-                .getClient().getHostname().isEmpty()) {
+        if ((IRCParser.ALWAYS_UPDATECLIENT && setterCCI != null) && setterCCI.getClient().getHostname().isEmpty()) {
             setterCCI.getClient().setUserBits(token[0], false);
         }
 
@@ -140,48 +147,54 @@ public class ProcessMode extends IRCProcessor {
 
             sNonUserModeStr = sNonUserModeStr + cMode;
             if (cMode.equals("+".charAt(0))) {
-                cPositive = '+'; bPositive = true;
+                cPositive = '+';
+                bPositive = true;
             } else if (cMode.equals("-".charAt(0))) {
-                cPositive = '-'; bPositive = false;
+                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)) {
+                if (parser.chanModesBool.containsKey(cMode)) {
+                    nValue = parser.chanModesBool.get(cMode);
+                    bBooleanMode = true;
+                } else if (parser.chanModesOther.containsKey(cMode)) {
+                    nValue = parser.chanModesOther.get(cMode);
+                    bBooleanMode = false;
+                } else if (parser.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()));
+                        parser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL + ParserError.ERROR_USER, "Broken Modes. Parameter required but not given.", parser.getLastLine()));
                         return;
                     }
                     sModeParam = sModestr[nParam++];
-                    nValue = myParser.prefixModes.get(cMode);
+                    nValue = parser.prefixModes.get(cMode);
                     callDebugInfo(IRCParser.DEBUG_INFO, "User Mode: %c / %d [%s] {Positive: %b}", cMode, nValue, sModeParam, bPositive);
                     iChannelClientInfo = iChannel.getChannelClient(sModeParam);
                     if (iChannelClientInfo == null) {
                         // Client not known?
                         iClient = getClientInfo(sModeParam);
                         if (iClient == null) {
-                            iClient = new IRCClientInfo(myParser, sModeParam);
-                            myParser.addClient(iClient);
+                            iClient = new IRCClientInfo(parser, sModeParam);
+                            parser.addClient(iClient);
                         }
                         iChannelClientInfo = iChannel.addClient(iClient);
                     }
                     callDebugInfo(IRCParser.DEBUG_INFO, "\tOld Mode Value: %d", iChannelClientInfo.getChanMode());
                     if (bPositive) {
-                        iChannelClientInfo.setChanMode(iChannelClientInfo.getChanMode() | nValue); sTemp = "+";
+                        iChannelClientInfo.setChanMode(iChannelClientInfo.getChanMode() | nValue);
+                        sTemp = "+";
                     } else {
-                        iChannelClientInfo.setChanMode(iChannelClientInfo.getChanMode() ^ (iChannelClientInfo.getChanMode() & nValue)); sTemp = "-";
+                        iChannelClientInfo.setChanMode(iChannelClientInfo.getChanMode() ^ (iChannelClientInfo.getChanMode() & nValue));
+                        sTemp = "-";
                     }
                     sTemp = sTemp + cMode;
                     callChannelUserModeChanged(iChannel, iChannelClientInfo, setterCCI, token[0], sTemp);
                     continue;
                 } else {
                     // unknown mode - add as boolean
-                    myParser.chanModesBool.put(cMode, myParser.nextKeyCMBool);
-                    nValue = myParser.nextKeyCMBool;
+                    parser.chanModesBool.put(cMode, parser.nextKeyCMBool);
+                    nValue = parser.nextKeyCMBool;
                     bBooleanMode = true;
-                    myParser.nextKeyCMBool = myParser.nextKeyCMBool * 2;
+                    parser.nextKeyCMBool = parser.nextKeyCMBool * 2;
                 }
 
                 if (bBooleanMode) {
@@ -195,7 +208,7 @@ public class ProcessMode extends IRCProcessor {
                 } else {
 
                     if ((bPositive || nValue == IRCParser.MODE_LIST || ((nValue & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET)) && (sModestr.length <= nParam)) {
-                        myParser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL + ParserError.ERROR_USER, "Broken Modes. Parameter required but not given.", myParser.getLastLine()));
+                        parser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL + ParserError.ERROR_USER, "Broken Modes. Parameter required but not given.", parser.getLastLine()));
                         continue;
                     }
 
@@ -240,7 +253,9 @@ public class ProcessMode extends IRCProcessor {
         }
 
         // Call Callbacks
-        for (int i = 0; i < sModestr.length; ++i) { sFullModeStr.append(sModestr[i]).append(" "); }
+        for (int i = 0; i < sModestr.length; ++i) {
+            sFullModeStr.append(sModestr[i]).append(" ");
+        }
 
         iChannel.setMode(nCurrent);
         if (sParam.equals("324")) {
@@ -266,7 +281,9 @@ public class ProcessMode extends IRCProcessor {
 
         final IRCClientInfo iClient = getClientInfo(token[2]);
 
-        if (iClient == null) { return; }
+        if (iClient == null) {
+            return;
+        }
 
         if (clearOldModes) {
             nCurrent = 0;
@@ -283,14 +300,14 @@ public class ProcessMode extends IRCProcessor {
             } else if (cMode.equals(":".charAt(0))) {
                 continue;
             } else {
-                if (myParser.userModes.containsKey(cMode)) {
-                    nValue = myParser.userModes.get(cMode);
+                if (parser.userModes.containsKey(cMode)) {
+                    nValue = parser.userModes.get(cMode);
                 } else {
                     // Unknown mode
-                    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;
+                    callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got unknown user mode " + cMode + " - Added", parser.getLastLine()));
+                    parser.userModes.put(cMode, parser.nNextKeyUser);
+                    nValue = parser.nNextKeyUser;
+                    parser.nNextKeyUser = parser.nNextKeyUser * 2;
                 }
                 // Usermodes are always boolean
                 callDebugInfo(IRCParser.DEBUG_INFO, "User Mode: %c [%d] {Positive: %b}", cMode, nValue, bPositive);
@@ -373,15 +390,4 @@ public class ProcessMode extends IRCProcessor {
     public String[] handles() {
         return new String[]{"MODE", "324", "221"};
     }
-
-    /**
-     * 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 ProcessMode(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -30,6 +30,17 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
  * Process a Names reply.
  */
 public class ProcessNames extends IRCProcessor {
+
+    /**
+     * 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(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a Names reply.
      *
@@ -42,7 +53,9 @@ public class ProcessNames extends IRCProcessor {
         if ("366".equals(sParam)) {
             // End of names
             iChannel = getChannel(token[3]);
-            if (iChannel == null) { return; }
+            if (iChannel == null) {
+                return;
+            }
 
             if (!iChannel.hadTopic()) {
                 callChannelTopic(iChannel, true);
@@ -52,7 +65,7 @@ public class ProcessNames extends IRCProcessor {
             callChannelGotNames(iChannel);
 
             if (!iChannel.hasAskedForListModes()
-                    && myParser.getAutoListMode()) {
+                    && parser.getAutoListMode()) {
                 iChannel.requestListModes();
             }
         } else {
@@ -63,10 +76,14 @@ public class ProcessNames extends IRCProcessor {
 
             iChannel = getChannel(token[4]);
 
-            if (iChannel == null) { return; }
+            if (iChannel == null) {
+                return;
+            }
 
             // If we are not expecting names, clear the current known names - this is fresh stuff!
-            if (!iChannel.isAddingNames()) { iChannel.emptyChannel(); }
+            if (!iChannel.isAddingNames()) {
+                iChannel.emptyChannel();
+            }
             iChannel.setAddingNames(true);
 
             final String[] sNames = token[token.length - 1].split(" ");
@@ -76,16 +93,18 @@ public class ProcessNames extends IRCProcessor {
             for (int j = 0; j < sNames.length; ++j) {
                 sNameBit = sNames[j];
                 // If name is empty (ie there was an extra space) ignore it.
-                if (sNameBit.isEmpty()) { continue; }
+                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) {
                     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.
-                    if (myParser.prefixMap.containsKey(cMode) && !myParser.prefixModes.containsKey(cMode)) {
+                    if (parser.prefixMap.containsKey(cMode) && !parser.prefixModes.containsKey(cMode)) {
                         sModes.append(cMode);
-                        nPrefix = nPrefix + myParser.prefixModes.get(myParser.prefixMap.get(cMode));
+                        nPrefix = nPrefix + parser.prefixModes.get(parser.prefixMap.get(cMode));
                     } else {
                         sName = sNameBit.substring(i);
                         break;
@@ -94,7 +113,10 @@ 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); }
+                if (iClient == null) {
+                    iClient = new IRCClientInfo(parser, sName);
+                    parser.addClient(iClient);
+                }
                 iClient.setUserBits(sName, false); // Will do nothing if this isn't UHNAMES
                 iChannelClient = iChannel.addClient(iClient);
                 iChannelClient.setChanMode(nPrefix);
@@ -139,15 +161,4 @@ public class ProcessNames extends IRCProcessor {
     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(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -33,6 +33,17 @@ import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;
  * Process a Nick change.
  */
 public class ProcessNick extends IRCProcessor {
+
+    /**
+     * 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(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a Nick change.
      *
@@ -49,24 +60,24 @@ public class ProcessNick extends IRCProcessor {
         if (iClient == null) {
             return;
         }
-        oldNickname = myParser.getStringConverter().toLowerCase(iClient.getNickname());
+        oldNickname = parser.getStringConverter().toLowerCase(iClient.getNickname());
         // Remove the client from the known clients list
-        final boolean isSameNick = myParser.getStringConverter().equalsIgnoreCase(oldNickname, token[token.length - 1]);
+        final boolean isSameNick = parser.getStringConverter().equalsIgnoreCase(oldNickname, token[token.length - 1]);
 
         if (!isSameNick) {
-            myParser.forceRemoveClient(getClientInfo(oldNickname));
+            parser.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()));
+            parser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL + ParserError.ERROR_USER, "Nick change would overwrite existing client", parser.getLastLine()));
         } else {
             if (!isSameNick) {
-                myParser.addClient(iClient);
+                parser.addClient(iClient);
             }
 
-            for (IRCChannelInfo iChannel : myParser.getChannels()) {
+            for (IRCChannelInfo iChannel : parser.getChannels()) {
                 // Find the user (using the old nickname)
                 iChannelClient = iChannel.getChannelClient(oldNickname);
                 if (iChannelClient != null) {
@@ -118,15 +129,4 @@ public class ProcessNick extends IRCProcessor {
     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(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -34,6 +34,17 @@ import com.dmdirc.parser.interfaces.callbacks.NickInUseListener;
  * If this also fails, we will start prepending _ (or the value of me.cPrepend) to the main nickname.
  */
 public class ProcessNickInUse extends IRCProcessor {
+
+    /**
+     * Create a new instance of the ProcessNickInUse Object.
+     *
+     * @param parser IRCParser That owns this object
+     * @param manager ProcessingManager that is in charge of this object
+     */
+    protected ProcessNickInUse(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a NickInUse message.
      * Parser implements handling of this if Pre-001 and no other handler found,
@@ -51,17 +62,17 @@ public class ProcessNickInUse extends IRCProcessor {
         if (!callNickInUse(token[3])) {
             // Manually handle nick in use.
             callDebugInfo(IRCParser.DEBUG_INFO, "No Nick in use Handler.");
-            if (!myParser.got001) {
+            if (!parser.got001) {
                 callDebugInfo(IRCParser.DEBUG_INFO, "Using inbuilt handler");
                 // If this is before 001 we will try and get a nickname, else we will leave the nick as-is
-                if (myParser.triedAlt) {
-                    if (myParser.getStringConverter().equalsIgnoreCase(myParser.thinkNickname, myParser.me.getAltNickname())) {
-                        myParser.thinkNickname = myParser.me.getNickname();
+                if (parser.triedAlt) {
+                    if (parser.getStringConverter().equalsIgnoreCase(parser.thinkNickname, parser.me.getAltNickname())) {
+                        parser.thinkNickname = parser.me.getNickname();
                     }
-                    myParser.getLocalClient().setNickname(myParser.me.getPrependChar() + myParser.thinkNickname);
+                    parser.getLocalClient().setNickname(parser.me.getPrependChar() + parser.thinkNickname);
                 } else {
-                    myParser.getLocalClient().setNickname(myParser.me.getAltNickname());
-                    myParser.triedAlt = true;
+                    parser.getLocalClient().setNickname(parser.me.getAltNickname());
+                    parser.triedAlt = true;
                 }
             }
         }
@@ -87,13 +98,4 @@ public class ProcessNickInUse extends IRCProcessor {
     public String[] handles() {
         return new String[]{"433"};
     }
-
-    /**
-     * Create a new instance of the ProcessNickInUse Object.
-     *
-     * @param parser IRCParser That owns this object
-     * @param manager ProcessingManager that is in charge of this object
-     */
-    protected ProcessNickInUse(final IRCParser parser, final ProcessingManager manager) { super(parser, manager); }
-
 }

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

@@ -28,6 +28,17 @@ import com.dmdirc.parser.interfaces.callbacks.AuthNoticeListener;
  * Process a NoticeAuth message.
  */
 public class ProcessNoticeAuth extends IRCProcessor {
+
+    /**
+     * Create a new instance of the ProcessNoticeAuth Object.
+     *
+     * @param parser IRCParser That owns this object
+     * @param manager ProcessingManager that is in charge of this object
+     */
+    protected ProcessNoticeAuth(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a NoticeAuth message.
      *
@@ -59,13 +70,4 @@ public class ProcessNoticeAuth extends IRCProcessor {
     public String[] handles() {
         return new String[]{"Notice Auth"};
     }
-
-    /**
-     * Create a new instance of the ProcessNoticeAuth Object.
-     *
-     * @param parser IRCParser That owns this object
-     * @param manager ProcessingManager that is in charge of this object
-     */
-    protected ProcessNoticeAuth(final IRCParser parser, final ProcessingManager manager) { super(parser, manager); }
-
 }

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

@@ -32,6 +32,16 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelPartListener;
  */
 public class ProcessPart extends IRCProcessor {
 
+    /**
+     * 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(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a channel part.
      *
@@ -42,7 +52,9 @@ public class ProcessPart extends IRCProcessor {
     public void process(final String sParam, final String[] token) {
         // :nick!ident@host PART #Channel
         // :nick!ident@host PART #Channel :reason
-        if (token.length < 3) { return; }
+        if (token.length < 3) {
+            return;
+        }
         IRCClientInfo iClient;
         IRCChannelInfo iChannel;
         IRCChannelClientInfo iChannelClient;
@@ -50,31 +62,39 @@ public class ProcessPart extends IRCProcessor {
         iClient = getClientInfo(token[0]);
         iChannel = getChannel(token[2]);
 
-        if (iClient == null) { return; }
+        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 (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()));
+            if (iClient != parser.getLocalClient()) {
+                callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got part for channel (" + token[2] + ") that I am not on. [User: " + token[0] + "]", parser.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()));
+                // callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got part for channel ("+token[2]+") for a non-existant user. [User: "+token[0]+"]", parser.getLastLine()));
                 return;
             }
-            if (myParser.removeAfterCallback) { callChannelPart(iChannel, iChannelClient, sReason); }
+            if (parser.removeAfterCallback) {
+                callChannelPart(iChannel, iChannelClient, sReason);
+            }
             callDebugInfo(IRCParser.DEBUG_INFO, "Removing %s from %s", iClient.getNickname(), iChannel.getName());
             iChannel.delClient(iClient);
-            if (!myParser.removeAfterCallback) { callChannelPart(iChannel, iChannelClient, sReason); }
-            if (iClient == myParser.getLocalClient()) {
+            if (!parser.removeAfterCallback) {
+                callChannelPart(iChannel, iChannelClient, sReason);
+            }
+            if (iClient == parser.getLocalClient()) {
                 iChannel.emptyChannel();
-                myParser.removeChannel(iChannel);
+                parser.removeChannel(iChannel);
             }
         }
     }
@@ -101,15 +121,4 @@ public class ProcessPart extends IRCProcessor {
     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(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -35,6 +35,16 @@ import java.util.ArrayList;
  */
 public class ProcessQuit extends IRCProcessor {
 
+    /**
+     * 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(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a Quit message.
      *
@@ -45,42 +55,56 @@ public class ProcessQuit extends IRCProcessor {
     public void process(final String sParam, final String[] token) {
         // :nick!ident@host QUIT
         // :nick!ident@host QUIT :reason
-        if (token.length < 2) { return; }
+        if (token.length < 2) {
+            return;
+        }
         IRCClientInfo iClient;
         IRCChannelClientInfo iChannelClient;
 
         iClient = getClientInfo(token[0]);
 
-        if (iClient == null) { return; }
+        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]; }
+        if (token.length > 2) {
+            sReason = token[token.length - 1];
+        }
 
-        final ArrayList<IRCChannelInfo> channelList = new ArrayList<IRCChannelInfo>(myParser.getChannels());
+        final ArrayList<IRCChannelInfo> channelList = new ArrayList<IRCChannelInfo>(parser.getChannels());
         for (IRCChannelInfo iChannel : channelList) {
             iChannelClient = iChannel.getChannelClient(iClient);
             if (iChannelClient != null) {
-                if (myParser.removeAfterCallback) { callChannelQuit(iChannel, iChannelClient, sReason); }
-                if (iClient == myParser.getLocalClient()) {
+                if (parser.removeAfterCallback) {
+                    callChannelQuit(iChannel, iChannelClient, sReason);
+                }
+                if (iClient == parser.getLocalClient()) {
                     iChannel.emptyChannel();
-                    myParser.removeChannel(iChannel);
+                    parser.removeChannel(iChannel);
                 } else {
                     iChannel.delClient(iClient);
                 }
-                if (!myParser.removeAfterCallback) { callChannelQuit(iChannel, iChannelClient, sReason); }
+                if (!parser.removeAfterCallback) {
+                    callChannelQuit(iChannel, iChannelClient, sReason);
+                }
             }
         }
 
-        if (myParser.removeAfterCallback) { callQuit(iClient, sReason); }
-        if (iClient == myParser.getLocalClient()) {
-            myParser.clearClients();
+        if (parser.removeAfterCallback) {
+            callQuit(iClient, sReason);
+        }
+        if (iClient == parser.getLocalClient()) {
+            parser.clearClients();
         } else {
-            myParser.removeClient(iClient);
+            parser.removeClient(iClient);
+        }
+        if (!parser.removeAfterCallback) {
+            callQuit(iClient, sReason);
         }
-        if (!myParser.removeAfterCallback) { callQuit(iClient, sReason); }
     }
 
     /**
@@ -117,15 +141,4 @@ public class ProcessQuit extends IRCProcessor {
     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(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -29,6 +29,17 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
  * Process a topic change.
  */
 public class ProcessTopic extends IRCProcessor {
+
+    /**
+     * 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(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a topic change.
      *
@@ -40,12 +51,16 @@ public class ProcessTopic extends IRCProcessor {
         IRCChannelInfo iChannel;
         if (sParam.equals("332")) {
             iChannel = getChannel(token[3]);
-            if (iChannel == null) { return; }
+            if (iChannel == null) {
+                return;
+            }
             iChannel.setInternalTopic(token[token.length - 1]);
         } else if (sParam.equals("333")) {
             if (token.length > 3) {
                 iChannel = getChannel(token[3]);
-                if (iChannel == null) { return; }
+                if (iChannel == null) {
+                    return;
+                }
                 if (token.length > 4) {
                     iChannel.setTopicUser(token[4]);
                     if (token.length > 5) {
@@ -62,9 +77,13 @@ public class ProcessTopic extends IRCProcessor {
                 }
             }
             iChannel = getChannel(token[2]);
-            if (iChannel == null) { return; }
+            if (iChannel == null) {
+                return;
+            }
             iChannel.setTopicTime(System.currentTimeMillis() / 1000);
-            if (token[0].charAt(0) == ':') { token[0] = token[0].substring(1); }
+            if (token[0].charAt(0) == ':') {
+                token[0] = token[0].substring(1);
+            }
             iChannel.setTopicUser(token[0]);
             iChannel.setInternalTopic(token[token.length - 1]);
             callChannelTopic(iChannel, false);
@@ -93,15 +112,4 @@ public class ProcessTopic extends IRCProcessor {
     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(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -30,6 +30,17 @@ import com.dmdirc.parser.interfaces.callbacks.WalluserListener;
  * Process a WALLOPS Message.
  */
 public class ProcessWallops extends IRCProcessor {
+
+    /**
+     * 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(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a Wallops Message.
      *
@@ -38,11 +49,15 @@ public class ProcessWallops extends IRCProcessor {
      */
     @Override
     public void process(final String sParam, final String[] token) {
-        if (token.length < 3) { return; }
+        if (token.length < 3) {
+            return;
+        }
 
         String user = token[0];
         final String message = token[token.length - 1];
-        if (user.charAt(0) == ':' && user.length() > 1) { user = user.substring(1); }
+        if (user.charAt(0) == ':' && user.length() > 1) {
+            user = user.substring(1);
+        }
         final String[] bits = message.split(" ", 2);
 
         if (bits.length > 1) {
@@ -93,7 +108,6 @@ public class ProcessWallops extends IRCProcessor {
         return getCallbackManager().getCallbackType(WallDesyncListener.class).call(message, host);
     }
 
-
     /**
      * What does this IRCProcessor handle.
      *
@@ -103,15 +117,4 @@ public class ProcessWallops extends IRCProcessor {
     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(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -34,6 +34,17 @@ import com.dmdirc.parser.interfaces.callbacks.OtherAwayStateListener;
  * Process a /who reply.
  */
 public class ProcessWho extends IRCProcessor {
+
+    /**
+     * 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(final IRCParser parser, final ProcessingManager manager) {
+        super(parser, manager);
+    }
+
     /**
      * Process a /who reply.
      *
@@ -66,13 +77,13 @@ public class ProcessWho extends IRCProcessor {
             if (client.getAwayState() != isAway) {
                 final AwayState oldState = client.getAwayState();
                 client.setAwayState(isAway);
-                if (client == myParser.getLocalClient()) {
+                if (client == parser.getLocalClient()) {
                     callAwayState(oldState, client.getAwayState(), client.getAwayReason());
                 } else {
                     callAwayStateOther(client, oldState, isAway);
 
                     ChannelClientInfo iChannelClient;
-                    for (ChannelInfo iChannel : myParser.getChannels()) {
+                    for (ChannelInfo iChannel : parser.getChannels()) {
                         iChannelClient = iChannel.getChannelClient(client);
                         if (iChannelClient != null) {
                             callChannelAwayStateOther(iChannel, iChannelClient, oldState, isAway);
@@ -132,15 +143,4 @@ public class ProcessWho extends IRCProcessor {
     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(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager);
-    }
-
 }

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

@@ -33,76 +33,69 @@ import java.util.Map;
  * Manages adding/removing/calling processing stuff.
  */
 public class ProcessingManager {
-    /** Reference to the parser object that owns this ProcessingManager. */
-    IRCParser myParser;
 
+    /** Reference to the parser object that owns this ProcessingManager. */
+    private final IRCParser parser;
     /** Hashtable used to store the different types of IRCProcessor known. */
     private final Map<String, IRCProcessor> processHash = new HashMap<String, IRCProcessor>();
 
-    /**
-     * Debugging Data to the console.
-     */
-    private void doDebug(final String line, final Object... args) {
-        myParser.callDebugInfo(IRCParser.DEBUG_PROCESSOR, line, args);
-    }
-
     /**
      * Constructor to create a ProcessingManager.
      *
      * @param parser IRCParser that owns this Processing Manager
      */
     public ProcessingManager(final IRCParser parser) {
-        myParser = parser;
+        this.parser = parser;
         //------------------------------------------------
         // Add processors
         //------------------------------------------------
         // NOTICE AUTH
-        addProcessor(new ProcessNoticeAuth(myParser, this));
+        addProcessor(new ProcessNoticeAuth(parser, this));
         // 001
-        addProcessor(new Process001(myParser, this));
+        addProcessor(new Process001(parser, this));
         // 004
         // 005
-        addProcessor(new Process004005(myParser, this));
+        addProcessor(new Process004005(parser, this));
         // 464
-        addProcessor(new Process464(myParser, this));
+        addProcessor(new Process464(parser, this));
         // 301
         // 305
         // 306
-        addProcessor(new ProcessAway(myParser, this));
+        addProcessor(new ProcessAway(parser, this));
         // 352
-        addProcessor(new ProcessWho(myParser, this));
+        addProcessor(new ProcessWho(parser, this));
         // INVITE
-        addProcessor(new ProcessInvite(myParser, this));
+        addProcessor(new ProcessInvite(parser, this));
         // JOIN
-        addProcessor(new ProcessJoin(myParser, this));
+        addProcessor(new ProcessJoin(parser, this));
         // KICK
-        addProcessor(new ProcessKick(myParser, this));
+        addProcessor(new ProcessKick(parser, this));
         // PRIVMSG
         // NOTICE
-        addProcessor(new ProcessMessage(myParser, this));
+        addProcessor(new ProcessMessage(parser, this));
         // MODE
         // 324
-        addProcessor(new ProcessMode(myParser, this));
+        addProcessor(new ProcessMode(parser, this));
         // 372
         // 375
         // 376
         // 422
-        addProcessor(new ProcessMOTD(myParser, this));
+        addProcessor(new ProcessMOTD(parser, this));
         // 353
         // 366
-        addProcessor(new ProcessNames(myParser, this));
+        addProcessor(new ProcessNames(parser, this));
         // 433
-        addProcessor(new ProcessNickInUse(myParser, this));
+        addProcessor(new ProcessNickInUse(parser, this));
         // NICK
-        addProcessor(new ProcessNick(myParser, this));
+        addProcessor(new ProcessNick(parser, this));
         // PART
-        addProcessor(new ProcessPart(myParser, this));
+        addProcessor(new ProcessPart(parser, this));
         // QUIT
-        addProcessor(new ProcessQuit(myParser, this));
+        addProcessor(new ProcessQuit(parser, this));
         // TOPIC
         // 332
         // 333
-        addProcessor(new ProcessTopic(myParser, this));
+        addProcessor(new ProcessTopic(parser, this));
         // 344
         // 345
         // 346
@@ -111,9 +104,16 @@ public class ProcessingManager {
         // 349
         // 367
         // 368
-        addProcessor(new ProcessListModes(myParser, this));
+        addProcessor(new ProcessListModes(parser, this));
         // WALLOPS
-        addProcessor(new ProcessWallops(myParser, this));
+        addProcessor(new ProcessWallops(parser, this));
+    }
+
+    /**
+     * Debugging Data to the console.
+     */
+    private void doDebug(final String line, final Object... args) {
+        parser.callDebugInfo(IRCParser.DEBUG_PROCESSOR, line, args);
     }
 
     /**
@@ -194,15 +194,16 @@ 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(), parser.getLastLine());
             ei.setException(e);
-            myParser.callErrorInfo(ei);
+            parser.callErrorInfo(ei);
         } finally {
             // Try to call callNumeric. We don't want this to work if sParam is a non
             // integer param, hense the empty catch
             try {
                 callNumeric(Integer.parseInt(sParam), token);
-            } catch (NumberFormatException e) { }
+            } catch (NumberFormatException e) {
+            }
         }
     }
 
@@ -215,8 +216,6 @@ public class ProcessingManager {
      * @return true if a method was called, false otherwise
      */
     protected boolean callNumeric(final int numeric, final String[] token) {
-        return myParser.getCallbackManager().getCallbackType(NumericListener.class).call(numeric, token);
+        return parser.getCallbackManager().getCallbackType(NumericListener.class).call(numeric, token);
     }
-
 }
-

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

@@ -24,10 +24,9 @@ package com.dmdirc.parser.irc;
 
 /**
  * IRC Parser Processor Not Found Exception.
- *
- * @author Shane Mc Cormack
  */
 public class ProcessorNotFoundException extends Exception {
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
@@ -40,6 +39,7 @@ public class ProcessorNotFoundException extends Exception {
      *
      * @param message Reason for exception
      */
-    public ProcessorNotFoundException(final String message) { super(message); }
-
+    public ProcessorNotFoundException(final String message) {
+        super(message);
+    }
 }

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

@@ -38,7 +38,6 @@ public class ServerInfo {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-
     /** Are we using a socks proxy (Default: false). */
     private boolean useSocksProxy = false;
     /** Proxy server to connect to (Default: "127.0.0.1"). */
@@ -138,70 +137,90 @@ public class ServerInfo {
      *
      * @param newValue true if we are using socks, else false
      */
-    public void setUseSocks(final boolean newValue) { useSocksProxy = newValue; }
+    public void setUseSocks(final boolean newValue) {
+        useSocksProxy = newValue;
+    }
 
     /**
      * Get if we are connecting via a socks proxy.
      *
      * @return true if we are using socks, else false
      */
-    public boolean getUseSocks() { return useSocksProxy; }
+    public boolean getUseSocks() {
+        return useSocksProxy;
+    }
 
     /**
      * Set the Proxy hostname.
      *
      * @param newValue Value to set to.
      */
-    public void setProxyHost(final String newValue) { proxyHost = newValue; }
+    public void setProxyHost(final String newValue) {
+        proxyHost = newValue;
+    }
 
     /**
      * Get the Proxy hostname.
      *
      * @return Current Proxy hostname
      */
-    public String getProxyHost() { return proxyHost; }
+    public String getProxyHost() {
+        return proxyHost;
+    }
 
     /**
      * Set the Proxy port.
      *
      * @param newValue Value to set to.
      */
-    public void setProxyPort(final int newValue) { proxyPort = newValue; }
+    public void setProxyPort(final int newValue) {
+        proxyPort = newValue;
+    }
 
     /**
      * Get the Proxy port.
      *
      * @return Current Proxy port
      */
-    public int getProxyPort() { return proxyPort; }
+    public int getProxyPort() {
+        return proxyPort;
+    }
 
     /**
      * Set the Proxy username.
      *
      * @param newValue Value to set to.
      */
-    public void setProxyUser(final String newValue) { proxyUser = newValue; }
+    public void setProxyUser(final String newValue) {
+        proxyUser = newValue;
+    }
 
     /**
      * Get the Proxy username.
      *
      * @return Current Proxy username
      */
-    public String getProxyUser() { return proxyUser; }
+    public String getProxyUser() {
+        return proxyUser;
+    }
 
     /**
      * Set the Proxy password.
      *
      * @param newValue Value to set to.
      */
-    public void setProxyPass(final String newValue) { proxyPass = newValue; }
+    public void setProxyPass(final String newValue) {
+        proxyPass = newValue;
+    }
 
     /**
      * Get the Proxy password.
      *
      * @return Current Proxy password
      */
-    public String getProxyPass() { return proxyPass; }
+    public String getProxyPass() {
+        return proxyPass;
+    }
 
     /**
      * Retrieves a String describing any channels included in this ServerInfo's
@@ -231,4 +250,3 @@ public class ServerInfo {
         return channelString;
     }
 }
-

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

@@ -24,15 +24,14 @@ package com.dmdirc.parser.irc;
 
 /**
  * This defines server types.
- * ServerTypes define a regex that will be matched against a lower-cased verison
+ * ServerTypes define a regex that will be matched against a lower-cased version
  * of the input, an array of modes that only ops can request, and what they are
  * matching against.
  * Lowercaseing will be handled using javas built in toLowercase() rather than
- * usig the Server-Specific one.
- *
- * @author shane
+ * using the Server-Specific one.
  */
 public enum ServerType {
+
     /** Unreal IRCD prior to version 4. */
     UNREAL("unreal", ".*unreal[^4-9].*"),
     /** Unreal IRCD after version 4 (inspircd based). */
@@ -132,6 +131,7 @@ public enum ServerType {
 
     /** Define what this ServerType should match on. */
     private enum MatchType {
+
         /** Match using the ircd version from 004. */
         VERSION,
         /** Match using the network name. */
@@ -143,16 +143,12 @@ public enum ServerType {
         /** Never Match (Used by generic). */
         NEVER;
     }
-
     /** Type of for this ServerType. */
     private final String type;
-
     /** Regex for this ServerType. */
     private final String regex;
-
     /** String of chars that only ops can access. */
     private final String opOnly;
-
     /** What does this ServerType match? */
     private final MatchType matchType;
 
@@ -166,7 +162,6 @@ public enum ServerType {
         this(type, regex, null);
     }
 
-
     /**
      * Create a new server type.
      *
@@ -257,16 +252,24 @@ public enum ServerType {
         for (ServerType type : ServerType.values()) {
             switch (type.getMatchType()) {
                 case VERSION:
-                    if (version.matches(type.getRegex())) { return type; }
+                    if (version.matches(type.getRegex())) {
+                        return type;
+                    }
                     break;
                 case NETWORK:
-                    if (network.matches(type.getRegex())) { return type; }
+                    if (network.matches(type.getRegex())) {
+                        return type;
+                    }
                     break;
                 case RAW003:
-                    if (raw003.matches(type.getRegex())) { return type; }
+                    if (raw003.matches(type.getRegex())) {
+                        return type;
+                    }
                     break;
                 case RAW002:
-                    if (raw002.matches(type.getRegex())) { return type; }
+                    if (raw002.matches(type.getRegex())) {
+                        return type;
+                    }
                     break;
                 case NEVER:
                     break;

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

@@ -29,6 +29,7 @@ import java.util.List;
  * Groups of servers do things the same way as each other.
  */
 public enum ServerTypeGroup {
+
     /**
      * Freenode Group.
      */
@@ -47,10 +48,8 @@ public enum ServerTypeGroup {
      * rather than as a channel user mode.
      */
     PROTECTED_388("Protected List", new ServerType[]{ServerType.SWIFTIRC, ServerType.AUSTHEX8});
-
     /** Name of the group. */
     final String name;
-
     /** Group Members. */
     final List<ServerType> members;
 

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

@@ -26,7 +26,6 @@ package com.dmdirc.parser.irc;
  * An enumeration of possible states of an IRC Parser's socket.
  *
  * @since 0.6.3m1
- * @author chris
  */
 public enum SocketState {
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.irc.outputqueue;
 
 import com.dmdirc.parser.common.QueuePriority;
+
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.concurrent.BlockingQueue;
@@ -30,25 +31,19 @@ import java.util.concurrent.PriorityBlockingQueue;
 
 /**
  * This class handles the Parser output Queue.
- *
- * @author shane
  */
 public class OutputQueue {
-    /** PrintWriter for sending output. */
-    private PrintWriter out = null;
 
+    /** PrintWriter for sending output. */
+    private PrintWriter out;
     /** Is queueing enabled? */
     private boolean queueEnabled = true;
-
     /** The output queue! */
     private final BlockingQueue<QueueItem> queue = new PriorityBlockingQueue<QueueItem>();
-
     /** Thread for the sending queue. */
     private QueueHandler queueHandler;
-
     /** The QueueFactory for this OutputQueue. */
     private QueueFactory queueFactory = PriorityQueueHandler.getFactory();
-    // private QueueFactory queueFactory = SimpleRateLimitedQueueHandler.getFactory();
 
     /**
      * Set the output stream for this queue.

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

@@ -27,10 +27,9 @@ import java.util.concurrent.BlockingQueue;
 
 /**
  * This does no rate limiting, and just sends based on priority.
- *
- * @author shane
  */
 public class PriorityQueueHandler extends QueueHandler {
+
     /**
      * Get a QueueFactory that produces PriorityQueueHandlers.
      *
@@ -38,6 +37,7 @@ public class PriorityQueueHandler extends QueueHandler {
      */
     public static QueueFactory getFactory() {
         return new QueueFactory() {
+
             /** {@inheritDoc} */
             @Override
             public QueueHandler getQueueHandler(final OutputQueue outputQueue, final BlockingQueue<QueueItem> queue, final PrintWriter out) {

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

@@ -27,8 +27,6 @@ import java.util.concurrent.BlockingQueue;
 
 /**
  * A QueueFactory produces QueueHandlers for OutputQueue.
- *
- * @author shane
  */
 public interface QueueFactory {
 
@@ -42,5 +40,4 @@ public interface QueueFactory {
      */
     QueueHandler getQueueHandler(final OutputQueue outputQueue,
             final BlockingQueue<QueueItem> queue, final PrintWriter out);
-
 }

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

@@ -23,22 +23,20 @@
 package com.dmdirc.parser.irc.outputqueue;
 
 import com.dmdirc.parser.common.QueuePriority;
+
 import java.io.PrintWriter;
 import java.util.Comparator;
 import java.util.concurrent.BlockingQueue;
 
 /**
  * Sending queue.
- *
- * @author shane
  */
 public abstract class QueueHandler extends Thread implements Comparator<QueueItem> {
+
     /** Queue we are handling. */
     protected final BlockingQueue<QueueItem> queue;
-
     /** Where to send the output. */
     private final PrintWriter out;
-
     /** The output queue that owns us. */
     protected OutputQueue outputQueue;
 

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

@@ -26,25 +26,19 @@ import com.dmdirc.parser.common.QueuePriority;
 
 /**
  * Queued Item.
- *
- * @author shane
  */
 public class QueueItem implements Comparable<QueueItem> {
+
     /** Global Item Number. */
     private static long number = 0L;
-
     /** Line to send. */
     private final String line;
-
     /** Time this line was added. */
     private final long time;
-
     /** Item Number. */
     private final long itemNumber;
-
     /** What is the priority of this line? */
     private final QueuePriority priority;
-
     /** Our handler. */
     private final QueueHandler handler;
 

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

@@ -31,10 +31,9 @@ import java.util.concurrent.BlockingQueue;
  * If more than 4 items are added in 4 seconds it will start limiting.
  * The first 4 items will be sent un-limited and then limiting will commence at
  * a rate of 1 per second.
- *
- * @author shane
  */
 public class SimpleRateLimitedQueueHandler extends QueueHandler {
+
     /**
      * Get a QueueFactory that produces PriorityQueueHandlers.
      *
@@ -42,6 +41,7 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
      */
     public static QueueFactory getFactory() {
         return new QueueFactory() {
+
             /** {@inheritDoc} */
             @Override
             public QueueHandler getQueueHandler(final OutputQueue outputQueue, final BlockingQueue<QueueItem> queue, final PrintWriter out) {
@@ -49,25 +49,18 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
             }
         };
     }
-
     /** Current count. */
-    private int count = 0;
-
+    private int count;
     /** Time last item was added. */
-    private long lastItemTime = 0L;
-
+    private long lastItemTime;
     /** Are we limiting? */
-    private boolean isLimiting = false;
-
+    private boolean isLimiting;
     /** How many items are allowed before limiting? */
     private int items = 4;
-
     /** How many microseconds do we care about when checking for items? */
     private int limitTime = 4000;
-
     /** How long to wait in between each item when limiting? */
     private int waitTime = 3000;
-
     /** Always update the lastItemTime or only if its been > limitTime? */
     private boolean alwaysUpdateTime = true;