Apply most inspections to the processors package.

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

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

@@ -25,6 +25,8 @@ package com.dmdirc.parser.irc.processors;
 import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.common.QueuePriority;
+import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
+import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
@@ -57,7 +59,7 @@ public abstract class IRCProcessor {
     /**
      * Callback to all objects implementing the IErrorInfo Interface.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener
+     * @see ErrorInfoListener
      * @param errorInfo ParserError object representing the error.
      */
     protected final void callErrorInfo(final ParserError errorInfo) {
@@ -67,7 +69,7 @@ public abstract class IRCProcessor {
     /**
      * Callback to all objects implementing the DebugInfo Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.DebugInfoListener
+     * @see DebugInfoListener
      * @param level Debugging Level (DEBUG_INFO, ndSocket etc)
      * @param data Debugging Information
      * @param args Formatting String Options
@@ -79,7 +81,7 @@ public abstract class IRCProcessor {
     /**
      * Callback to all objects implementing the DebugInfo Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.DebugInfoListener
+     * @see DebugInfoListener
      * @param level Debugging Level (DEBUG_INFO, ndSocket etc)
      * @param data Debugging Information
      */
@@ -151,7 +153,7 @@ public abstract class IRCProcessor {
      * @param sParam Type of line to process ("005", "PRIVMSG" etc)
      * @param token IRCTokenised line to process
      */
-    public abstract void process(final String sParam, final String[] token);
+    public abstract void process(final String sParam, final String... token);
 
     /**
      * What does this IRCProcessor handle.
@@ -165,12 +167,12 @@ public abstract class IRCProcessor {
      * @return the name of this processor
      */
     public final String getName() {
-        final Package thisPackage = this.getClass().getPackage();
+        final Package thisPackage = getClass().getPackage();
         int packageLength = 0;
         if (thisPackage != null) {
             packageLength = thisPackage.getName().length() + 1;
         }
-        return this.getClass().getName().substring(packageLength);
+        return getClass().getName().substring(packageLength);
     }
 
     /**
@@ -178,7 +180,7 @@ public abstract class IRCProcessor {
      * @return lower case name of this processor
      */
     public final String getLowerName() {
-        return this.getName().toLowerCase();
+        return getName().toLowerCase();
     }
 
     /**
@@ -187,6 +189,6 @@ public abstract class IRCProcessor {
      */
     @Override
     public final String toString() {
-        return this.getName();
+        return getName();
     }
 }

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

@@ -27,6 +27,8 @@ import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
+import java.util.Collection;
+
 /**
  * Process a 001 message.
  */
@@ -49,7 +51,7 @@ public class Process001 extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         parser.got001 = true;
         // << :demon1.uk.quakenet.org 001 Java-Test :Welcome to the QuakeNet IRC Network, Java-Test
         parser.updateServerName(token[0].substring(1, token[0].length()));
@@ -80,7 +82,9 @@ public class Process001 extends IRCProcessor {
         }
 
         parser.startPingTimer();
-        parser.joinChannels(parser.extractChannels(parser.getURI()).toArray(new ChannelJoinRequest[0]));
+        final Collection<? extends ChannelJoinRequest> requests = parser.extractChannels(
+                parser.getURI());
+        parser.joinChannels(requests.toArray(new ChannelJoinRequest[requests.size()]));
     }
 
     /**

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

@@ -56,7 +56,7 @@ public class Process004005 extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         switch (sParam) {
             case "002":
                 process002();
@@ -114,7 +114,7 @@ public class Process004005 extends IRCProcessor {
      *
      * @param token The tokenised line.
      */
-    private void process003(final String[] token) {
+    private void process003(final String... token) {
         parser.h005Info.put("003IRCD", token[token.length - 1]);
     }
 
@@ -123,7 +123,7 @@ public class Process004005 extends IRCProcessor {
      *
      * @param token The tokenised line.
      */
-    private void process004(final String[] token) {
+    private void process004(final String... token) {
         final boolean multiParam = token.length > 4;
         int i = multiParam ? 4 : 1;
         final String[] bits = multiParam ? token : token[3].split(" ");
@@ -159,7 +159,7 @@ public class Process004005 extends IRCProcessor {
      *
      * @param token The tokenised line.
      */
-    private void process005(final String[] token) {
+    private void process005(final String... token) {
         for (int i = 3; i < token.length; i++) {
             final String[] bits = token[i].split("=", 2);
 

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

@@ -48,7 +48,7 @@ public class Process464 extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         callPasswordRequired();
     }
 
@@ -65,10 +65,9 @@ public class Process464 extends IRCProcessor {
     /**
      * Callback to all objects implementing the PasswordRequired Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.PasswordRequiredListener
-     * @return true if a method was called, false otherwise
+     * @see PasswordRequiredListener
      */
-    protected boolean callPasswordRequired() {
-        return getCallbackManager().getCallbackType(PasswordRequiredListener.class).call();
+    protected void callPasswordRequired() {
+        getCallbackManager().getCallbackType(PasswordRequiredListener.class).call();
     }
 }

src/com/dmdirc/parser/irc/processors/ProcessAccount.java

@@ -48,7 +48,7 @@ public class ProcessAccount extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         // :nick!user@host ACCOUNT accountname
         final IRCClientInfo iClient = getClientInfo(token[0]);
         if (iClient != null) {

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

@@ -49,7 +49,7 @@ public class ProcessAway extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         final IRCClientInfo iClient = getClientInfo(token[0]);
         switch (sParam) {
             case "AWAY":
@@ -83,14 +83,14 @@ public class ProcessAway extends IRCProcessor {
     /**
      * Callback to all objects implementing the onAwayState Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.AwayStateListener
+     * @see AwayStateListener
      * @param oldState Old Away State
      * @param currentState Current Away State
      * @param reason Best guess at away reason
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callAwayState(final AwayState oldState, final AwayState currentState, final String reason) {
-        return getCallbackManager().getCallbackType(AwayStateListener.class).call(oldState, currentState, reason);
+    protected void callAwayState(final AwayState oldState, final AwayState currentState,
+            final String reason) {
+        getCallbackManager().getCallbackType(AwayStateListener.class).call(oldState, currentState, reason);
     }
 
     /**

src/com/dmdirc/parser/irc/processors/ProcessCap.java

@@ -28,8 +28,8 @@ import com.dmdirc.parser.irc.ProcessingManager;
 import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
-import java.util.List;
 
 /**
  * Process CAP extension.
@@ -45,9 +45,9 @@ import java.util.List;
  */
 public class ProcessCap extends TimestampedIRCProcessor {
     /** Have we handled the pre-connect cap request? */
-    private boolean hasCapped = false;
+    private boolean hasCapped;
     /** List of supported capabilities. */
-    private final List<String> supportedCapabilities = new ArrayList<>();
+    private final Collection<String> supportedCapabilities = new ArrayList<>();
 
     /**
      * Create a new instance of the IRCProcessor Object.
@@ -79,16 +79,16 @@ public class ProcessCap extends TimestampedIRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final Date date, final String sParam, final String[] token) {
+    public void process(final Date date, final String sParam, final String... token) {
         // We will only automatically handle the first ever pre-001 CAP LS
         // response.
         // After that, the user may be sending stuff themselves so we do
         // nothing.
-        if (!hasCapped && !parser.got001 && token.length > 4 && token[3].equalsIgnoreCase("LS")) {
+        if (!hasCapped && !parser.got001 && token.length > 4 && "LS".equalsIgnoreCase(token[3])) {
             final String[] caps = token[token.length - 1].split(" ");
             for (final String cap : caps) {
                 if (cap.isEmpty()) { continue; }
-                final String capability = (cap.charAt(0) == '=') ? cap.substring(1).toLowerCase() : cap.toLowerCase();
+                final String capability = cap.charAt(0) == '=' ? cap.substring(1).toLowerCase() : cap.toLowerCase();
 
                 parser.addCapability(capability);
 
@@ -106,19 +106,19 @@ public class ProcessCap extends TimestampedIRCProcessor {
             //     :DFBnc.Server CAP Dataforce LS
             // but not:
             //     :DFBnc.Server CAP Dataforce LS *
-            if (token.length == 4 || (token.length == 5 && !token[4].equals("*"))) {
+            if (token.length == 4 || token.length == 5 && !"*".equals(token[4])) {
                 hasCapped = true;
                 parser.sendRawMessage("CAP END");
             }
-        } else if (token[3].equalsIgnoreCase("ACK") || token[3].equalsIgnoreCase("CLEAR")) {
+        } else if ("ACK".equalsIgnoreCase(token[3]) || "CLEAR".equalsIgnoreCase(token[3])) {
             // Process the list.
             final String[] caps = token[token.length - 1].split(" ");
             for (final String cap : caps) {
                 if (cap.isEmpty()) { continue; }
                 final CapabilityState modifier = CapabilityState.fromModifier(cap.charAt(0));
 
-                final String capability = (modifier == CapabilityState.INVALID) ? cap.toLowerCase() : cap.substring(1).toLowerCase();
-                final CapabilityState state = (modifier == CapabilityState.INVALID) ? CapabilityState.ENABLED : modifier;
+                final String capability = modifier == CapabilityState.INVALID ? cap.toLowerCase() : cap.substring(1).toLowerCase();
+                final CapabilityState state = modifier == CapabilityState.INVALID ? CapabilityState.ENABLED : modifier;
 
                 if (state == CapabilityState.NEED_ACK) {
                     parser.sendRawMessage("CAP ACK :" + capability);

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

@@ -48,7 +48,7 @@ public class ProcessInvite extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         // :Tobavaj!shane@Tobavaj.users.quakenet.org INVITE Dataforce #dataforceisgod 1188846462
         if (token.length > 2) {
             callInvite(token[0].substring(1), token[3]);
@@ -58,13 +58,12 @@ public class ProcessInvite extends IRCProcessor {
     /**
      * Callback to all objects implementing the Invite Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.InviteListener
+     * @see InviteListener
      * @param userHost The hostname of the person who invited us
      * @param channel The name of the channel we were invited to
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callInvite(final String userHost, final String channel) {
-        return getCallbackManager().getCallbackType(InviteListener.class).call(userHost, channel);
+    protected void callInvite(final String userHost, final String channel) {
+        getCallbackManager().getCallbackType(InviteListener.class).call(userHost, channel);
     }
 
     /**

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

@@ -77,7 +77,7 @@ public class ProcessJoin extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         callDebugInfo(IRCParser.DEBUG_INFO, "processJoin: %s | %s", sParam, Arrays.toString(token));
 
         if ("329".equals(sParam)) {
@@ -97,15 +97,13 @@ public class ProcessJoin extends IRCProcessor {
             if (token.length < 3) {
                 return;
             }
-            IRCClientInfo iClient;
-            IRCChannelInfo iChannel;
-            final IRCChannelClientInfo iChannelClient;
-            final String channelName;
             final boolean extendedJoin = parser.getCapabilityState("extended-join") == CapabilityState.ENABLED;
-            final String accountName;
-            final String realName;
 
-            iClient = getClientInfo(token[0]);
+
+            IRCClientInfo iClient = getClientInfo(token[0]);
+            final String realName;
+            final String accountName;
+            final String channelName;
             if (extendedJoin) {
                 // :nick!ident@host JOIN #Channel accountName :Real Name
                 channelName = token[2];
@@ -116,7 +114,7 @@ public class ProcessJoin extends IRCProcessor {
                 accountName = "*";
                 realName = "";
             }
-            iChannel = parser.getChannel(token[2]);
+            IRCChannelInfo iChannel = parser.getChannel(token[2]);
 
             callDebugInfo(IRCParser.DEBUG_INFO, "processJoin: client: %s", iClient);
             callDebugInfo(IRCParser.DEBUG_INFO, "processJoin: channel: %s", iChannel);
@@ -153,7 +151,7 @@ public class ProcessJoin extends IRCProcessor {
                     // This is only done if we are already the channel, and it isn't us that
                     // joined.
                     callDebugInfo(IRCParser.DEBUG_INFO, "processJoin: Adding client to channel.");
-                    iChannelClient = iChannel.addClient(iClient);
+                    final IRCChannelClientInfo iChannelClient = iChannel.addClient(iClient);
                     callChannelJoin(iChannel, iChannelClient);
                     callDebugInfo(IRCParser.DEBUG_INFO, "processJoin: Added client to channel.");
                     return;
@@ -178,24 +176,23 @@ public class ProcessJoin extends IRCProcessor {
     /**
      * Callback to all objects implementing the ChannelJoin Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelJoinListener
+     * @see ChannelJoinListener
      * @param cChannel Channel Object
      * @param cChannelClient ChannelClient object for new person
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelJoin(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient) {
-        return getCallbackManager().getCallbackType(ChannelJoinListener.class).call(cChannel, cChannelClient);
+    protected void callChannelJoin(final ChannelInfo cChannel,
+            final ChannelClientInfo cChannelClient) {
+        getCallbackManager().getCallbackType(ChannelJoinListener.class).call(cChannel, cChannelClient);
     }
 
     /**
      * Callback to all objects implementing the ChannelSelfJoin Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelSelfJoinListener
+     * @see ChannelSelfJoinListener
      * @param cChannel Channel Object
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelSelfJoin(final ChannelInfo cChannel) {
-        return getCallbackManager().getCallbackType(ChannelSelfJoinListener.class).call(cChannel);
+    protected void callChannelSelfJoin(final ChannelInfo cChannel) {
+        getCallbackManager().getCallbackType(ChannelSelfJoinListener.class).call(cChannel);
     }
 
     /**

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

@@ -56,44 +56,39 @@ public class ProcessKick extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         callDebugInfo(IRCParser.DEBUG_INFO, "processKick: %s | %s", sParam, Arrays.toString(token));
 
-        final IRCChannelClientInfo iChannelClient;
-        final IRCChannelClientInfo iChannelKicker;
-        final IRCChannelInfo iChannel;
-        final IRCClientInfo iClient;
-        final IRCClientInfo iKicker;
-        String sReason = "";
-
-        iClient = getClientInfo(token[3]);
-        iKicker = getClientInfo(token[0]);
-        iChannel = getChannel(token[2]);
+        final IRCClientInfo iClient = getClientInfo(token[3]);
+        final IRCClientInfo iKicker = getClientInfo(token[0]);
+        final IRCChannelInfo iChannel = getChannel(token[2]);
 
         if (iClient == null) {
             return;
         }
 
-        if ((IRCParser.ALWAYS_UPDATECLIENT && iKicker != null) && iKicker.getHostname().isEmpty()) {
+        if (IRCParser.ALWAYS_UPDATECLIENT && iKicker != null && iKicker.getHostname().isEmpty()) {
             // To facilitate dmdirc formatter, get user information
             iKicker.setUserBits(token[0], false);
         }
 
         if (iChannel == null) {
             if (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()));
+                callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got kick for channel (" + token[2] + ") that I am not on. [User: " + token[3] +
+
+                        ']', parser.getLastLine()));
             }
-            return;
         } else {
+            String sReason = "";
             if (token.length > 4) {
                 sReason = token[token.length - 1];
             }
-            iChannelClient = iChannel.getChannelClient(iClient);
+            final IRCChannelClientInfo 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]+"]", parser.getLastLine()));
                 return;
             }
-            iChannelKicker = iChannel.getChannelClient(token[0]);
+            final IRCChannelClientInfo iChannelKicker = iChannel.getChannelClient(token[0]);
             if (parser.getRemoveAfterCallback()) {
                 callDebugInfo(IRCParser.DEBUG_INFO, "processKick: calling kick before. {%s | %s | %s | %s | %s}", iChannel, iChannelClient, iChannelKicker, sReason, token[0]);
                 callChannelKick(iChannel, iChannelClient, iChannelKicker, sReason, token[0]);
@@ -115,16 +110,17 @@ public class ProcessKick extends IRCProcessor {
     /**
      * Callback to all objects implementing the ChannelKick Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelKickListener
+     * @see ChannelKickListener
      * @param cChannel Channel where the kick took place
      * @param cKickedClient ChannelClient that got kicked
      * @param cKickedByClient ChannelClient that did the kicking (may be null if server)
      * @param sReason Reason for kick (may be "")
      * @param sKickedByHost Hostname of Kicker (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelKick(final ChannelInfo cChannel, final ChannelClientInfo cKickedClient, final ChannelClientInfo cKickedByClient, final String sReason, final String sKickedByHost) {
-        return getCallbackManager().getCallbackType(ChannelKickListener.class).call(cChannel, cKickedClient, cKickedByClient, sReason, sKickedByHost);
+    protected void callChannelKick(final ChannelInfo cChannel,
+            final ChannelClientInfo cKickedClient, final ChannelClientInfo cKickedByClient,
+            final String sReason, final String sKickedByHost) {
+        getCallbackManager().getCallbackType(ChannelKickListener.class).call(cChannel, cKickedClient, cKickedByClient, sReason, sKickedByHost);
     }
 
     /**

src/com/dmdirc/parser/irc/processors/ProcessList.java

@@ -50,7 +50,7 @@ public class ProcessList extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         // :port80b.se.quakenet.org 321 MD87 Channel :Users  Name
         // :port80b.se.quakenet.org 322 MD87 #DMDirc 10 :
         // :port80b.se.quakenet.org 323 MD87 :End of /LIST

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

@@ -57,20 +57,17 @@ public class ProcessListModes extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         final IRCChannelInfo channel = getChannel(token[3]);
         final ServerType serverType = parser.getServerType();
-        String item = "";
-        String owner = "";
-        byte tokenStart = 4; // Where do the relevent tokens start?
-        boolean isCleverMode = false;
-        long time = 0;
-        char mode = ' ';
-        boolean isItem = true; // true if item listing, false if "end of .." item
         if (channel == null) {
             return;
         }
 
+        boolean isItem = true; // true if item listing, false if "end of .." item
+        char mode = ' ';
+        boolean isCleverMode = false;
+        byte tokenStart = 4; // Where do the relevent tokens start?
         if ("367".equals(sParam) || "368".equals(sParam)) {
             // Ban List/Item.
             // (Also used for +d and +q on dancer/hyperion... -_-)
@@ -81,23 +78,25 @@ public class ProcessListModes extends IRCProcessor {
             // Except / Exempt List etc
             mode = 'e';
             isItem = "348".equals(sParam);
-        } else if (sParam.equals("346") || sParam.equals("347")) {
+        } else if ("346".equals(sParam) || "347".equals(sParam)) {
             // Invite List
             mode = 'I';
-            isItem = sParam.equals("346");
-        } else if (sParam.equals("940") || sParam.equals("941")) {
+            isItem = "346".equals(sParam);
+        } else if ("940".equals(sParam) || "941".equals(sParam)) {
             // Censored words List
             mode = 'g';
-            isItem = sParam.equals("941");
-        } else if ((serverType == ServerType.INSPIRCD) && (sParam.equals("910") || sParam.equals("911"))) {
+            isItem = "941".equals(sParam);
+        } else if (serverType == ServerType.INSPIRCD && ("910".equals(sParam) ||
+                "911".equals(sParam))) {
             // Channel Access List
             mode = 'w';
-            isItem = sParam.equals("910");
-        } else if ((serverType == ServerType.INSPIRCD) && (sParam.equals("954") || sParam.equals("953"))) {
+            isItem = "910".equals(sParam);
+        } else if (serverType == ServerType.INSPIRCD && ("954".equals(sParam) ||
+                "953".equals(sParam))) {
             // Channel exemptchanops List
             mode = 'X';
-            isItem = sParam.equals("954");
-        } else if (sParam.equals("344") || sParam.equals("345")) {
+            isItem = "954".equals(sParam);
+        } else if ("344".equals(sParam) || "345".equals(sParam)) {
             // Reop List, or bad words list, or quiet list. god damn.
             if (serverType == ServerType.EUIRCD) {
                 mode = 'w';
@@ -106,15 +105,17 @@ public class ProcessListModes extends IRCProcessor {
             } else {
                 mode = 'R';
             }
-            isItem = sParam.equals("344");
-        } else if (ServerTypeGroup.OWNER_386.isMember(serverType) && (sParam.equals("386") || sParam.equals("387"))) {
+            isItem = "344".equals(sParam);
+        } else if (ServerTypeGroup.OWNER_386.isMember(serverType) && ("386".equals(sParam) ||
+                "387".equals(sParam))) {
             // Channel Owner list
             mode = 'q';
-            isItem = sParam.equals("387");
-        } else if (ServerTypeGroup.PROTECTED_388.isMember(serverType) && (sParam.equals("388") || sParam.equals("389"))) {
+            isItem = "387".equals(sParam);
+        } else if (ServerTypeGroup.PROTECTED_388.isMember(serverType) && ("388".equals(sParam) ||
+                "389".equals(sParam))) {
             // Protected User list
             mode = 'a';
-            isItem = sParam.equals("389");
+            isItem = "389".equals(sParam);
         } else if (sParam.equals(parser.h005Info.get("LISTMODE")) || sParam.equals(parser.h005Info.get("LISTMODEEND"))) {
             // Support for potential future decent mode listing in the protocol
             //
@@ -190,7 +191,7 @@ public class ProcessListModes extends IRCProcessor {
                 final int identstart = token[tokenStart].indexOf('!');
                 final int hoststart = token[tokenStart].indexOf('@');
                 // Check that ! and @ are both in the string - as required by +b and +q
-                if ((identstart >= 0) && (identstart < hoststart)) {
+                if (identstart >= 0 && identstart < hoststart) {
                     if (serverType == ServerType.HYPERION && token[tokenStart].charAt(0) == '%') {
                         mode = 'q';
                     } else {
@@ -208,7 +209,7 @@ public class ProcessListModes extends IRCProcessor {
                     list.clear();
                     if (ServerTypeGroup.FREENODE.isMember(serverType) && (mode == 'b' || mode == 'q')) {
                         // Also clear the other list if b or q.
-                        final Character otherMode = (mode == 'b') ? 'q' : 'b';
+                        final Character otherMode = mode == 'b' ? 'q' : 'b';
 
                         if (!channel.getAddState(otherMode)) {
                             callDebugInfo(IRCParser.DEBUG_INFO, "New List Mode Batch (" + mode + "): Clearing!");
@@ -224,16 +225,19 @@ public class ProcessListModes extends IRCProcessor {
                 channel.setAddState(mode, true);
             }
 
-            if (token.length > (tokenStart + 2)) {
+            long time = 0;
+            if (token.length > tokenStart + 2) {
                 try {
                     time = Long.parseLong(token[tokenStart + 2]);
                 } catch (NumberFormatException e) {
                     time = 0;
                 }
             }
-            if (token.length > (tokenStart + 1)) {
+            String owner = "";
+            if (token.length > tokenStart + 1) {
                 owner = token[tokenStart + 1];
             }
+            String item = "";
             if (token.length > tokenStart) {
                 item = token[tokenStart];
             }
@@ -285,12 +289,11 @@ public class ProcessListModes extends IRCProcessor {
     /**
      * Callback to all objects implementing the ChannelGotListModes Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelListModeListener
+     * @see ChannelListModeListener
      * @param cChannel Channel which the ListModes reply is for
      * @param mode the mode that we got list modes for.
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelGotListModes(final ChannelInfo cChannel, final char mode) {
-        return getCallbackManager().getCallbackType(ChannelListModeListener.class).call(cChannel, mode);
+    protected void callChannelGotListModes(final ChannelInfo cChannel, final char mode) {
+        getCallbackManager().getCallbackType(ChannelListModeListener.class).call(cChannel, mode);
     }
 }

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

@@ -50,7 +50,7 @@ public class ProcessMOTD extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         switch (sParam) {
             case "375":
                 callMOTDStart(token[token.length - 1]);
@@ -69,33 +69,30 @@ public class ProcessMOTD extends IRCProcessor {
      *
      * @param noMOTD Was this an MOTDEnd or NoMOTD
      * @param data The contents of the line (incase of language changes or so)
-     * @see com.dmdirc.parser.interfaces.callbacks.MotdEndListener
-     * @return true if a method was called, false otherwise
+     * @see MotdEndListener
      */
-    protected boolean callMOTDEnd(final boolean noMOTD, final String data) {
-        return getCallbackManager().getCallbackType(MotdEndListener.class).call(noMOTD, data);
+    protected void callMOTDEnd(final boolean noMOTD, final String data) {
+        getCallbackManager().getCallbackType(MotdEndListener.class).call(noMOTD, data);
     }
 
     /**
      * Callback to all objects implementing the MOTDLine Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.MotdLineListener
+     * @see MotdLineListener
      * @param data Incomming Line.
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callMOTDLine(final String data) {
-        return getCallbackManager().getCallbackType(MotdLineListener.class).call(data);
+    protected void callMOTDLine(final String data) {
+        getCallbackManager().getCallbackType(MotdLineListener.class).call(data);
     }
 
     /**
      * Callback to all objects implementing the MOTDStart Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.MotdStartListener
+     * @see MotdStartListener
      * @param data Incomming Line.
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callMOTDStart(final String data) {
-        return getCallbackManager().getCallbackType(MotdStartListener.class).call(data);
+    protected void callMOTDStart(final String data) {
+        getCallbackManager().getCallbackType(MotdStartListener.class).call(data);
     }
 
     /**

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

@@ -94,7 +94,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final Date date, final String sParam, final String[] token) {
+    public void process(final Date date, final String sParam, final String... token) {
         // Ignore people!
         String sMessage;
         if (token[0].charAt(0) == ':') {
@@ -121,7 +121,8 @@ public class ProcessMessage extends TimestampedIRCProcessor {
         }
 
         // Is this actually a notice auth?
-        if (token[0].indexOf('!') == -1 && token[1].equalsIgnoreCase("NOTICE") && token[2].equalsIgnoreCase("AUTH")) {
+        if (token[0].indexOf('!') == -1 && "NOTICE".equalsIgnoreCase(token[1]) &&
+                "AUTH".equalsIgnoreCase(token[2])) {
             try {
                 parser.getProcessingManager().process(date, "Notice Auth", token);
             } catch (ProcessorNotFoundException e) {
@@ -129,9 +130,6 @@ public class ProcessMessage extends TimestampedIRCProcessor {
             return;
         }
 
-        IRCChannelClientInfo iChannelClient = null;
-        final IRCChannelInfo iChannel;
-        final IRCClientInfo iClient;
         // "nick!user@host PRIVMSG #Channel" should be processed as "nick!user@host PRIVMSG #Channel :"
         if (token.length < 4) {
             sMessage = "";
@@ -139,7 +137,6 @@ public class ProcessMessage extends TimestampedIRCProcessor {
             sMessage = token[token.length - 1];
         }
         String[] bits = sMessage.split(" ", 2);
-        final Character char1 = (char) 1;
         String sCTCP = "";
         boolean isAction = false;
         boolean isCTCP = false;
@@ -148,7 +145,8 @@ public class ProcessMessage extends TimestampedIRCProcessor {
             // Actions are special CTCPs
             // Bits is the message been split into 2 parts
             //         the first word and the rest
-            if (sParam.equalsIgnoreCase("PRIVMSG") && bits[0].equalsIgnoreCase(char1 + "ACTION") && Character.valueOf(sMessage.charAt(sMessage.length() - 1)).equals(char1)) {
+            final Character char1 = (char) 1;
+            if ("PRIVMSG".equalsIgnoreCase(sParam) && bits[0].equalsIgnoreCase(char1 + "ACTION") && Character.valueOf(sMessage.charAt(sMessage.length() - 1)).equals(char1)) {
                 isAction = true;
                 if (bits.length > 1) {
                     sMessage = bits[1];
@@ -183,14 +181,17 @@ public class ProcessMessage extends TimestampedIRCProcessor {
         }
 
         // Remove the leading : from the host.
+        final String firstToken;
         if (token[0].charAt(0) == ':' && token[0].length() > 1) {
-            token[0] = token[0].substring(1);
+            firstToken = token[0].substring(1);
+        } else {
+            firstToken = token[0];
         }
 
-        iClient = getClientInfo(token[0]);
+        final IRCClientInfo iClient = getClientInfo(token[0]);
         // Facilitate DMDIRC Formatter
-        if ((IRCParser.ALWAYS_UPDATECLIENT && iClient != null) && iClient.getHostname().isEmpty()) {
-            iClient.setUserBits(token[0], false);
+        if (IRCParser.ALWAYS_UPDATECLIENT && iClient != null && iClient.getHostname().isEmpty()) {
+            iClient.setUserBits(firstToken, false);
         }
 
         // Fire the appropriate callbacks.
@@ -211,77 +212,78 @@ public class ProcessMessage extends TimestampedIRCProcessor {
         final String targetName = hasModePrefix ? token[2].substring(1) : token[2];
 
         if (isValidChannelName(targetName)) {
-            iChannel = getChannel(targetName);
+            final IRCChannelInfo iChannel = getChannel(targetName);
             if (iChannel == null) {
                 // callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got message for channel ("+targetName+") that I am not on.", parser.getLastLine()));
                 return;
             }
+            IRCChannelClientInfo iChannelClient = null;
             if (iClient != null) {
                 iChannelClient = iChannel.getChannelClient(iClient);
             }
-            if (sParam.equalsIgnoreCase("PRIVMSG")) {
+            if ("PRIVMSG".equalsIgnoreCase(sParam)) {
                 if (isAction) {
-                    callChannelAction(date, iChannel, iChannelClient, sMessage, token[0]);
+                    callChannelAction(date, iChannel, iChannelClient, sMessage, firstToken);
                 } else {
                     if (isCTCP) {
-                        callChannelCTCP(date, iChannel, iChannelClient, sCTCP, sMessage, token[0]);
+                        callChannelCTCP(date, iChannel, iChannelClient, sCTCP, sMessage, firstToken);
                     } else if (hasModePrefix) {
-                        callChannelModeMessage(date, modePrefix, iChannel, iChannelClient, sMessage, token[0]);
+                        callChannelModeMessage(date, modePrefix, iChannel, iChannelClient, sMessage, firstToken);
                     } else {
-                        callChannelMessage(date, iChannel, iChannelClient, sMessage, token[0]);
+                        callChannelMessage(date, iChannel, iChannelClient, sMessage, firstToken);
                     }
                 }
-            } else if (sParam.equalsIgnoreCase("NOTICE")) {
+            } else if ("NOTICE".equalsIgnoreCase(sParam)) {
                 if (isCTCP) {
-                    callChannelCTCPReply(date, iChannel, iChannelClient, sCTCP, sMessage, token[0]);
+                    callChannelCTCPReply(date, iChannel, iChannelClient, sCTCP, sMessage, firstToken);
                 } else if (hasModePrefix) {
-                    callChannelModeNotice(date, modePrefix, iChannel, iChannelClient, sMessage, token[0]);
+                    callChannelModeNotice(date, modePrefix, iChannel, iChannelClient, sMessage, firstToken);
                 } else {
-                    callChannelNotice(date, iChannel, iChannelClient, sMessage, token[0]);
+                    callChannelNotice(date, iChannel, iChannelClient, sMessage, firstToken);
                 }
             }
         } else if (parser.getStringConverter().equalsIgnoreCase(token[2], parser.getMyNickname())) {
-            if (sParam.equalsIgnoreCase("PRIVMSG")) {
+            if ("PRIVMSG".equalsIgnoreCase(sParam)) {
                 if (isAction) {
-                    callPrivateAction(date, sMessage, token[0]);
+                    callPrivateAction(date, sMessage, firstToken);
                 } else {
                     if (isCTCP) {
-                        callPrivateCTCP(date, sCTCP, sMessage, token[0]);
+                        callPrivateCTCP(date, sCTCP, sMessage, firstToken);
                     } else {
-                        callPrivateMessage(date, sMessage, token[0]);
+                        callPrivateMessage(date, sMessage, firstToken);
                     }
                 }
-            } else if (sParam.equalsIgnoreCase("NOTICE")) {
+            } else if ("NOTICE".equalsIgnoreCase(sParam)) {
                 if (isCTCP) {
-                    callPrivateCTCPReply(date, sCTCP, sMessage, token[0]);
+                    callPrivateCTCPReply(date, sCTCP, sMessage, firstToken);
                 } else {
-                    if (token[0].indexOf('@') == -1) {
-                        callServerNotice(date, sMessage, token[0]);
+                    if (firstToken.indexOf('@') == -1) {
+                        callServerNotice(date, sMessage, firstToken);
                     } else {
-                        callPrivateNotice(date, sMessage, token[0]);
+                        callPrivateNotice(date, sMessage, firstToken);
                     }
                 }
             }
         } else {
-            callDebugInfo(IRCParser.DEBUG_INFO, "Message for Other (" + token[2] + ")");
-            if (sParam.equalsIgnoreCase("PRIVMSG")) {
+            callDebugInfo(IRCParser.DEBUG_INFO, "Message for Other (" + token[2] + ')');
+            if ("PRIVMSG".equalsIgnoreCase(sParam)) {
                 if (isAction) {
-                    callUnknownAction(date, sMessage, token[2], token[0]);
+                    callUnknownAction(date, sMessage, token[2], firstToken);
                 } else {
                     if (isCTCP) {
-                        callUnknownCTCP(date, sCTCP, sMessage, token[2], token[0]);
+                        callUnknownCTCP(date, sCTCP, sMessage, token[2], firstToken);
                     } else {
-                        callUnknownMessage(date, sMessage, token[2], token[0]);
+                        callUnknownMessage(date, sMessage, token[2], firstToken);
                     }
                 }
-            } else if (sParam.equalsIgnoreCase("NOTICE")) {
+            } else if ("NOTICE".equalsIgnoreCase(sParam)) {
                 if (isCTCP) {
-                    callUnknownCTCPReply(date, sCTCP, sMessage, token[2], token[0]);
+                    callUnknownCTCPReply(date, sCTCP, sMessage, token[2], firstToken);
                 } else {
-                    if (token[0].indexOf('@') == -1) {
-                        callUnknownServerNotice(date, sMessage, token[2], token[0]);
+                    if (firstToken.indexOf('@') == -1) {
+                        callUnknownServerNotice(date, sMessage, token[2], firstToken);
                     } else {
-                        callUnknownNotice(date, sMessage, token[2], token[0]);
+                        callUnknownNotice(date, sMessage, token[2], firstToken);
                     }
                 }
             }
@@ -291,276 +293,276 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     /**
      * Callback to all objects implementing the ChannelAction Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelActionListener
+     * @see ChannelActionListener
      * @param date The date of this line
      * @param cChannel Channel where the action was sent to
      * @param cChannelClient ChannelClient who sent the action (may be null if server)
      * @param sMessage action contents
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelAction(final Date date, final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
-        return getCallbackManager().getCallbackType(ChannelActionListener.class).call(date, cChannel, cChannelClient, sMessage, sHost);
+    protected void callChannelAction(final Date date, final ChannelInfo cChannel,
+            final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
+        getCallbackManager().getCallbackType(ChannelActionListener.class).call(date, cChannel, cChannelClient, sMessage, sHost);
     }
 
     /**
      * Callback to all objects implementing the ChannelCTCP Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelCtcpListener
+     * @see ChannelCtcpListener
      * @param date The date of this line
      * @param cChannel Channel where CTCP was sent
      * @param cChannelClient ChannelClient who sent the message (may be null if server)
      * @param sType Type of CTCP (VERSION, TIME etc)
      * @param sMessage Additional contents
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelCTCP(final Date date, final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sType, final String sMessage, final String sHost) {
-        return getCallbackManager().getCallbackType(ChannelCtcpListener.class).call(date, cChannel, cChannelClient, sType, sMessage, sHost);
+    protected void callChannelCTCP(final Date date, final ChannelInfo cChannel,
+            final ChannelClientInfo cChannelClient, final String sType, final String sMessage,
+            final String sHost) {
+        getCallbackManager().getCallbackType(ChannelCtcpListener.class).call(date, cChannel, cChannelClient, sType, sMessage, sHost);
     }
 
     /**
      * Callback to all objects implementing the ChannelCTCPReply Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelCtcpReplyListener
+     * @see ChannelCtcpReplyListener
      * @param date The date of this line
      * @param cChannel Channel where CTCPReply was sent
      * @param cChannelClient ChannelClient who sent the message (may be null if server)
      * @param sType Type of CTCPRReply (VERSION, TIME etc)
      * @param sMessage Reply Contents
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelCTCPReply(final Date date, final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sType, final String sMessage, final String sHost) {
-        return getCallbackManager().getCallbackType(ChannelCtcpReplyListener.class).call(date, cChannel, cChannelClient, sType, sMessage, sHost);
+    protected void callChannelCTCPReply(final Date date, final ChannelInfo cChannel,
+            final ChannelClientInfo cChannelClient, final String sType, final String sMessage,
+            final String sHost) {
+        getCallbackManager().getCallbackType(ChannelCtcpReplyListener.class).call(date, cChannel, cChannelClient, sType, sMessage, sHost);
     }
 
     /**
      * Callback to all objects implementing the ChannelMessage Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelMessageListener
+     * @see ChannelMessageListener
      * @param date The date of this line
      * @param cChannel Channel where the message was sent to
      * @param cChannelClient ChannelClient who sent the message (may be null if server)
      * @param sMessage Message contents
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelMessage(final Date date, final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
-        return getCallbackManager().getCallbackType(ChannelMessageListener.class).call(date, cChannel, cChannelClient, sMessage, sHost);
+    protected void callChannelMessage(final Date date, final ChannelInfo cChannel,
+            final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
+        getCallbackManager().getCallbackType(ChannelMessageListener.class).call(date, cChannel, cChannelClient, sMessage, sHost);
     }
 
     /**
      * Callback to all objects implementing the ChannelNotice Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelNoticeListener
+     * @see ChannelNoticeListener
      * @param date The date of this line
      * @param cChannel Channel where the notice was sent to
      * @param cChannelClient ChannelClient who sent the notice (may be null if server)
      * @param sMessage notice contents
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelNotice(final Date date, final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
-        return getCallbackManager().getCallbackType(ChannelNoticeListener.class).call(date, cChannel, cChannelClient, sMessage, sHost);
+    protected void callChannelNotice(final Date date, final ChannelInfo cChannel,
+            final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
+        getCallbackManager().getCallbackType(ChannelNoticeListener.class).call(date, cChannel, cChannelClient, sMessage, sHost);
     }
 
     /**
      * Callback to all objects implementing the ChannelModeNotice Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelModeNoticeListener
+     * @see ChannelModeNoticeListener
      * @param date The date of this line
      * @param prefix Prefix that was used to send this notice.
      * @param cChannel Channel where the notice was sent to
      * @param cChannelClient ChannelClient who sent the notice (may be null if server)
      * @param sMessage notice contents
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelModeNotice(final Date date, final char prefix, final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
-        return getCallbackManager().getCallbackType(ChannelModeNoticeListener.class).call(date, cChannel, prefix, cChannelClient, sMessage, sHost);
+    protected void callChannelModeNotice(final Date date, final char prefix,
+            final ChannelInfo cChannel, final ChannelClientInfo cChannelClient,
+            final String sMessage, final String sHost) {
+        getCallbackManager().getCallbackType(ChannelModeNoticeListener.class).call(date, cChannel, prefix, cChannelClient, sMessage, sHost);
     }
 
     /**
      * Callback to all objects implementing the ChannelModeMessage Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelModeMessageListener
+     * @see ChannelModeMessageListener
      * @param date The date of this line
      * @param prefix Prefix that was used to send this notice.
      * @param cChannel Channel where the notice was sent to
      * @param cChannelClient ChannelClient who sent the notice (may be null if server)
      * @param sMessage message contents
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelModeMessage(final Date date, final char prefix, final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
-        return getCallbackManager().getCallbackType(ChannelModeMessageListener.class).call(date, cChannel, prefix, cChannelClient, sMessage, sHost);
+    protected void callChannelModeMessage(final Date date, final char prefix,
+            final ChannelInfo cChannel, final ChannelClientInfo cChannelClient,
+            final String sMessage, final String sHost) {
+        getCallbackManager().getCallbackType(ChannelModeMessageListener.class).call(date, cChannel, prefix, cChannelClient, sMessage, sHost);
     }
 
     /**
      * Callback to all objects implementing the PrivateAction Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.PrivateActionListener
+     * @see PrivateActionListener
      * @param date The date of this line
      * @param sMessage action contents
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callPrivateAction(final Date date, final String sMessage, final String sHost) {
-        return getCallbackManager().getCallbackType(PrivateActionListener.class).call(date, sMessage, sHost);
+    protected void callPrivateAction(final Date date, final String sMessage, final String sHost) {
+        getCallbackManager().getCallbackType(PrivateActionListener.class).call(date, sMessage, sHost);
     }
 
     /**
      * Callback to all objects implementing the PrivateCTCP Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.PrivateCtcpListener
+     * @see PrivateCtcpListener
      * @param date The date of this line
      * @param sType Type of CTCP (VERSION, TIME etc)
      * @param sMessage Additional contents
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callPrivateCTCP(final Date date, final String sType, final String sMessage, final String sHost) {
-        return getCallbackManager().getCallbackType(PrivateCtcpListener.class).call(date, sType, sMessage, sHost);
+    protected void callPrivateCTCP(final Date date, final String sType, final String sMessage,
+            final String sHost) {
+        getCallbackManager().getCallbackType(PrivateCtcpListener.class).call(date, sType, sMessage, sHost);
     }
 
     /**
      * Callback to all objects implementing the PrivateCTCPReply Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.PrivateCtcpReplyListener
+     * @see PrivateCtcpReplyListener
      * @param date The date of this line
      * @param sType Type of CTCPRReply (VERSION, TIME etc)
      * @param sMessage Reply Contents
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callPrivateCTCPReply(final Date date, final String sType, final String sMessage, final String sHost) {
-        return getCallbackManager().getCallbackType(PrivateCtcpReplyListener.class).call(date, sType, sMessage, sHost);
+    protected void callPrivateCTCPReply(final Date date, final String sType, final String sMessage,
+            final String sHost) {
+        getCallbackManager().getCallbackType(PrivateCtcpReplyListener.class).call(date, sType, sMessage, sHost);
     }
 
     /**
      * Callback to all objects implementing the PrivateMessage Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener
+     * @see PrivateMessageListener
      * @param date The date of this line
      * @param sMessage Message contents
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callPrivateMessage(final Date date, final String sMessage, final String sHost) {
-        return getCallbackManager().getCallbackType(PrivateMessageListener.class).call(date, sMessage, sHost);
+    protected void callPrivateMessage(final Date date, final String sMessage, final String sHost) {
+        getCallbackManager().getCallbackType(PrivateMessageListener.class).call(date, sMessage, sHost);
     }
 
     /**
      * Callback to all objects implementing the PrivateNotice Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.PrivateNoticeListener
+     * @see PrivateNoticeListener
      * @param date The date of this line
      * @param sMessage Notice contents
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callPrivateNotice(final Date date, final String sMessage, final String sHost) {
-        return getCallbackManager().getCallbackType(PrivateNoticeListener.class).call(date, sMessage, sHost);
+    protected void callPrivateNotice(final Date date, final String sMessage, final String sHost) {
+        getCallbackManager().getCallbackType(PrivateNoticeListener.class).call(date, sMessage, sHost);
     }
 
     /**
      * Callback to all objects implementing the ServerNotice Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ServerNoticeListener
+     * @see ServerNoticeListener
      * @param date The date of this line
      * @param sMessage Notice contents
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callServerNotice(final Date date, final String sMessage, final String sHost) {
-        return getCallbackManager().getCallbackType(ServerNoticeListener.class).call(date, sMessage, sHost);
+    protected void callServerNotice(final Date date, final String sMessage, final String sHost) {
+        getCallbackManager().getCallbackType(ServerNoticeListener.class).call(date, sMessage, sHost);
     }
 
     /**
      * Callback to all objects implementing the UnknownAction Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.UnknownActionListener
+     * @see UnknownActionListener
      * @param date The date of this line
      * @param sMessage Action contents
      * @param sTarget Actual target of action
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callUnknownAction(final Date date, final String sMessage, final String sTarget, final String sHost) {
-        return getCallbackManager().getCallbackType(UnknownActionListener.class).call(date, sMessage, sTarget, sHost);
+    protected void callUnknownAction(final Date date, final String sMessage, final String sTarget,
+            final String sHost) {
+        getCallbackManager().getCallbackType(UnknownActionListener.class).call(date, sMessage, sTarget, sHost);
     }
 
     /**
      * Callback to all objects implementing the UnknownCTCP Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.UnknownCtcpListener
+     * @see UnknownCtcpListener
      * @param date The date of this line
      * @param sType Type of CTCP (VERSION, TIME etc)
      * @param sMessage Additional contents
      * @param sTarget Actual Target of CTCP
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callUnknownCTCP(final Date date, final String sType, final String sMessage, final String sTarget, final String sHost) {
-        return getCallbackManager().getCallbackType(UnknownCtcpListener.class).call(date, sType, sMessage, sTarget, sHost);
+    protected void callUnknownCTCP(final Date date, final String sType, final String sMessage,
+            final String sTarget, final String sHost) {
+        getCallbackManager().getCallbackType(UnknownCtcpListener.class).call(date, sType, sMessage, sTarget, sHost);
     }
 
     /**
      * Callback to all objects implementing the UnknownCTCPReply Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.UnknownCtcpReplyListener
+     * @see UnknownCtcpReplyListener
      * @param date The date of this line
      * @param sType Type of CTCPRReply (VERSION, TIME etc)
      * @param sMessage Reply Contents
      * @param sTarget Actual Target of CTCPReply
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callUnknownCTCPReply(final Date date, final String sType, final String sMessage, final String sTarget, final String sHost) {
-        return getCallbackManager().getCallbackType(UnknownCtcpReplyListener.class).call(date, sType, sMessage, sTarget, sHost);
+    protected void callUnknownCTCPReply(final Date date, final String sType, final String sMessage,
+            final String sTarget, final String sHost) {
+        getCallbackManager().getCallbackType(UnknownCtcpReplyListener.class).call(date, sType, sMessage, sTarget, sHost);
     }
 
     /**
      * Callback to all objects implementing the UnknownMessage Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.UnknownMessageListener
+     * @see UnknownMessageListener
      * @param date The date of this line
      * @param sMessage Message contents
      * @param sTarget Actual target of message
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callUnknownMessage(final Date date, final String sMessage, final String sTarget, final String sHost) {
-        return getCallbackManager().getCallbackType(UnknownMessageListener.class).call(date, sMessage, sTarget, sHost);
+    protected void callUnknownMessage(final Date date, final String sMessage, final String sTarget,
+            final String sHost) {
+        getCallbackManager().getCallbackType(UnknownMessageListener.class).call(date, sMessage, sTarget, sHost);
     }
 
     /**
      * Callback to all objects implementing the UnknownNotice Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.UnknownNoticeListener
+     * @see UnknownNoticeListener
      * @param date The date of this line
      * @param sMessage Notice contents
      * @param sTarget Actual target of notice
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callUnknownNotice(final Date date, final String sMessage, final String sTarget, final String sHost) {
-        return getCallbackManager().getCallbackType(UnknownNoticeListener.class).call(date, sMessage, sTarget, sHost);
+    protected void callUnknownNotice(final Date date, final String sMessage, final String sTarget,
+            final String sHost) {
+        getCallbackManager().getCallbackType(UnknownNoticeListener.class).call(date, sMessage, sTarget, sHost);
     }
 
     /**
      * Callback to all objects implementing the UnknownNotice Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.UnknownServerNoticeListener
+     * @see UnknownServerNoticeListener
      * @param date The date of this line
      * @param sMessage Notice contents
      * @param sTarget Actual target of notice
      * @param sHost Hostname of sender (or servername)
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callUnknownServerNotice(final Date date, final String sMessage, final String sTarget, final String sHost) {
-        return getCallbackManager().getCallbackType(UnknownServerNoticeListener.class).call(date, sMessage, sTarget, sHost);
+    protected void callUnknownServerNotice(final Date date, final String sMessage,
+            final String sTarget, final String sHost) {
+        getCallbackManager().getCallbackType(UnknownServerNoticeListener.class).call(date, sMessage, sTarget, sHost);
     }
 
     /**

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

@@ -81,7 +81,7 @@ public class ProcessMode extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         final String[] sModestr;
         final String sChannelName;
         switch (sParam) {
@@ -127,17 +127,6 @@ public class ProcessMode extends IRCProcessor {
      */
     public void processChanMode(final String sParam, final String[] token, final String[] sModestr, final String sChannelName) {
         final StringBuilder sFullModeStr = new StringBuilder();
-        String sNonUserModeStr = "";
-        String sNonUserModeStrParams = "";
-        String sModeParam;
-        String sTemp;
-        int nParam = 1;
-        long nTemp, nValue = 0;
-        boolean bPositive = true, bBooleanMode;
-        char cPositive = '+';
-        final IRCChannelInfo iChannel;
-        IRCChannelClientInfo iChannelClientInfo;
-        final IRCChannelClientInfo setterCCI;
 
         CallbackObject cbSingle = null;
         CallbackObject cbNonUser = null;
@@ -147,7 +136,7 @@ public class ProcessMode extends IRCProcessor {
             cbNonUser = getCallbackManager().getCallbackType(ChannelNonUserModeChangeListener.class);
         }
 
-        iChannel = getChannel(sChannelName);
+        final IRCChannelInfo iChannel = getChannel(sChannelName);
         if (iChannel == null) {
             return;
         }
@@ -157,20 +146,26 @@ public class ProcessMode extends IRCProcessor {
             nCurrent = iChannel.getMode();
         }
 
-        setterCCI = iChannel.getChannelClient(token[0]);
+        final IRCChannelClientInfo setterCCI = iChannel.getChannelClient(token[0]);
         // Facilitate dmdirc formatter
         if (IRCParser.ALWAYS_UPDATECLIENT && setterCCI != null && setterCCI.getClient().getHostname().isEmpty()) {
             setterCCI.getClient().setUserBits(token[0], false);
         }
 
         // Loop through the mode string, and add/remove modes/params where they are needed
+        char cPositive = '+';
+        boolean bPositive = true;
+        long nValue = 0;
+        int nParam = 1;
+        final StringBuilder sNonUserModeStrParams = new StringBuilder();
+        final StringBuilder sNonUserModeStr = new StringBuilder();
         for (int i = 0; i < sModestr[0].length(); ++i) {
             final Character cMode = sModestr[0].charAt(i);
             if (cMode.equals(":".charAt(0))) {
                 continue;
             }
 
-            sNonUserModeStr += cMode;
+            sNonUserModeStr.append(cMode);
             if (cMode.equals("+".charAt(0))) {
                 cPositive = '+';
                 bPositive = true;
@@ -178,6 +173,8 @@ public class ProcessMode extends IRCProcessor {
                 cPositive = '-';
                 bPositive = false;
             } else {
+                final boolean bBooleanMode;
+                final String sModeParam;
                 if (chanModeManager.isMode(cMode)) {
                     bBooleanMode = true;
                 } else if (parser.chanModesOther.containsKey(cMode)) {
@@ -192,7 +189,7 @@ public class ProcessMode extends IRCProcessor {
                     sModeParam = sModestr[nParam++];
                     callDebugInfo(IRCParser.DEBUG_INFO, "User Mode: %c / %s {Positive: %b}",
                             cMode, sModeParam, bPositive);
-                    iChannelClientInfo = iChannel.getChannelClient(sModeParam);
+                    final IRCChannelClientInfo iChannelClientInfo = iChannel.getChannelClient(sModeParam);
                     if (iChannelClientInfo == null) {
                         // Client not known?
                         callDebugInfo(IRCParser.DEBUG_INFO, "User Mode for client not on channel." +
@@ -203,13 +200,11 @@ public class ProcessMode extends IRCProcessor {
                             iChannelClientInfo.getAllModes());
                     if (bPositive) {
                         iChannelClientInfo.addMode(cMode);
-                        sTemp = "+";
                     } else {
                         iChannelClientInfo.removeMode(cMode);
-                        sTemp = "-";
                     }
-                    sTemp += cMode;
-                    callChannelUserModeChanged(iChannel, iChannelClientInfo, setterCCI, token[0], sTemp);
+                    callChannelUserModeChanged(iChannel, iChannelClientInfo, setterCCI, token[0],
+                            (bPositive ? "+" : "-") + cMode);
                     continue;
                 } else {
                     // unknown mode - add as boolean
@@ -237,8 +232,8 @@ public class ProcessMode extends IRCProcessor {
                     if (nValue == IRCParser.MODE_LIST) {
                         // List Mode
                         sModeParam = sModestr[nParam++];
-                        sNonUserModeStrParams = sNonUserModeStrParams + ' ' + sModeParam;
-                        nTemp = Calendar.getInstance().getTimeInMillis() / 1000;
+                        sNonUserModeStrParams.append(' ').append(sModeParam);
+                        final long nTemp = Calendar.getInstance().getTimeInMillis() / 1000;
                         iChannel.setListModeParam(cMode, new ChannelListModeItem(sModeParam, token[0], nTemp), bPositive);
                         callDebugInfo(IRCParser.DEBUG_INFO, "List Mode: %c [%s] {Positive: %b}", cMode, sModeParam, bPositive);
                         if (cbSingle != null) {
@@ -249,7 +244,7 @@ public class ProcessMode extends IRCProcessor {
                         if (bPositive) {
                             // +Mode - always needs a parameter to set
                             sModeParam = sModestr[nParam++];
-                            sNonUserModeStrParams = sNonUserModeStrParams + ' ' + sModeParam;
+                            sNonUserModeStrParams.append(' ').append(sModeParam);
                             callDebugInfo(IRCParser.DEBUG_INFO, "Set Mode: %c [%s] {Positive: %b}", cMode, sModeParam, bPositive);
                             iChannel.setModeParam(cMode, sModeParam);
                             if (cbSingle != null) {
@@ -259,7 +254,7 @@ public class ProcessMode extends IRCProcessor {
                             // -Mode - parameter isn't always needed, we need to check
                             if ((nValue & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET) {
                                 sModeParam = sModestr[nParam++];
-                                sNonUserModeStrParams = sNonUserModeStrParams + ' ' + sModeParam;
+                                sNonUserModeStrParams.append(' ').append(sModeParam);
                             } else {
                                 sModeParam = "";
                             }
@@ -286,7 +281,8 @@ public class ProcessMode extends IRCProcessor {
             callChannelModeChanged(iChannel, setterCCI, token[0], sFullModeStr.toString().trim());
         }
         if (cbNonUser != null) {
-            cbNonUser.call(iChannel, setterCCI, token[0], trim(sNonUserModeStr + sNonUserModeStrParams));
+            cbNonUser.call(iChannel, setterCCI, token[0],
+                    trim(sNonUserModeStr.toString() + sNonUserModeStrParams));
         }
     }
 
@@ -350,10 +346,10 @@ public class ProcessMode extends IRCProcessor {
      * @param cChannelClient Client chaning the modes (null if server)
      * @param sHost Host doing the mode changing (User host or server name)
      * @param sModes Exact String parsed
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelModeChanged(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sHost, final String sModes) {
-        return getCallbackManager().getCallbackType(ChannelModeChangeListener.class).call(cChannel, cChannelClient, sHost, sModes);
+    protected void callChannelModeChanged(final ChannelInfo cChannel,
+            final ChannelClientInfo cChannelClient, final String sHost, final String sModes) {
+        getCallbackManager().getCallbackType(ChannelModeChangeListener.class).call(cChannel, cChannelClient, sHost, sModes);
     }
 
     /**
@@ -363,12 +359,13 @@ public class ProcessMode extends IRCProcessor {
      * @param cChannel Channel where modes were changed
      * @param cChangedClient Client being changed
      * @param cSetByClient Client chaning the modes (null if server)
-     * @param sMode String representing mode change (ie +o)
      * @param sHost Host doing the mode changing (User host or server name)
-     * @return true if a method was called, false otherwise
+     * @param sMode String representing mode change (ie +o)
      */
-    protected boolean callChannelUserModeChanged(final ChannelInfo cChannel, final ChannelClientInfo cChangedClient, final ChannelClientInfo cSetByClient, final String sHost, final String sMode) {
-        return getCallbackManager().getCallbackType(ChannelUserModeChangeListener.class).call(cChannel, cChangedClient, cSetByClient, sHost, sMode);
+    protected void callChannelUserModeChanged(final ChannelInfo cChannel,
+            final ChannelClientInfo cChangedClient, final ChannelClientInfo cSetByClient,
+            final String sHost, final String sMode) {
+        getCallbackManager().getCallbackType(ChannelUserModeChangeListener.class).call(cChannel, cChangedClient, cSetByClient, sHost, sMode);
     }
 
     /**
@@ -378,10 +375,10 @@ public class ProcessMode extends IRCProcessor {
      * @param cClient Client that had the mode changed (almost always us)
      * @param sSetby Host that set the mode (us or servername)
      * @param sModes The modes set.
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callUserModeChanged(final ClientInfo cClient, final String sSetby, final String sModes) {
-        return getCallbackManager().getCallbackType(UserModeChangeListener.class).call(cClient, sSetby, sModes);
+    protected void callUserModeChanged(final ClientInfo cClient, final String sSetby,
+            final String sModes) {
+        getCallbackManager().getCallbackType(UserModeChangeListener.class).call(cClient, sSetby, sModes);
     }
 
     /**
@@ -390,10 +387,9 @@ public class ProcessMode extends IRCProcessor {
      * @see UserModeDiscoveryListener
      * @param cClient Client that had the mode changed (almost always us)
      * @param sModes The modes set.
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callUserModeDiscovered(final ClientInfo cClient, final String sModes) {
-        return getCallbackManager().getCallbackType(UserModeDiscoveryListener.class).call(cClient, sModes);
+    protected void callUserModeDiscovered(final ClientInfo cClient, final String sModes) {
+        getCallbackManager().getCallbackType(UserModeDiscoveryListener.class).call(cClient, sModes);
     }
 
     /**

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

@@ -65,7 +65,7 @@ public class ProcessNames extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         final IRCChannelInfo iChannel;
         if ("366".equals(sParam)) {
             // End of names
@@ -142,11 +142,10 @@ public class ProcessNames extends IRCProcessor {
      * @see ChannelTopicListener
      * @param cChannel Channel that topic was set on
      * @param bIsJoinTopic True when getting topic on join, false if set by user/server
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
+    protected void callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
         ((IRCChannelInfo) cChannel).setHadTopic();
-        return getCallbackManager().getCallbackType(ChannelTopicListener.class).call(cChannel, bIsJoinTopic);
+        getCallbackManager().getCallbackType(ChannelTopicListener.class).call(cChannel, bIsJoinTopic);
     }
 
     /**
@@ -154,10 +153,9 @@ public class ProcessNames extends IRCProcessor {
      *
      * @see ChannelNamesListener
      * @param cChannel Channel which the names reply is for
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelGotNames(final ChannelInfo cChannel) {
-        return getCallbackManager().getCallbackType(ChannelNamesListener.class).call(cChannel);
+    protected void callChannelGotNames(final ChannelInfo cChannel) {
+        getCallbackManager().getCallbackType(ChannelNamesListener.class).call(cChannel);
     }
 
     /**

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

@@ -56,16 +56,13 @@ public class ProcessNick extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
-        final IRCClientInfo iClient;
-        IRCChannelClientInfo iChannelClient;
-        final String oldNickname;
+    public void process(final String sParam, final String... token) {
 
-        iClient = getClientInfo(token[0]);
+        final IRCClientInfo iClient = getClientInfo(token[0]);
         if (iClient == null) {
             return;
         }
-        oldNickname = parser.getStringConverter().toLowerCase(iClient.getNickname());
+        final String oldNickname = parser.getStringConverter().toLowerCase(iClient.getNickname());
         // Remove the client from the known clients list
         final boolean isSameNick = parser.getStringConverter().equalsIgnoreCase(oldNickname, token[token.length - 1]);
 
@@ -84,7 +81,7 @@ public class ProcessNick extends IRCProcessor {
 
             for (IRCChannelInfo iChannel : parser.getChannels()) {
                 // Find the user (using the old nickname)
-                iChannelClient = iChannel.getChannelClient(oldNickname);
+                final IRCChannelClientInfo iChannelClient = iChannel.getChannelClient(oldNickname);
                 if (iChannelClient != null) {
                     // Rename them. This uses the old nickname (the key in the hashtable)
                     // and the channelClient object has access to the new nickname (by way
@@ -103,26 +100,25 @@ public class ProcessNick extends IRCProcessor {
     /**
      * Callback to all objects implementing the ChannelNickChanged Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelNickChangeListener
+     * @see ChannelNickChangeListener
      * @param cChannel One of the channels that the user is on
      * @param cChannelClient Client changing nickname
      * @param sOldNick Nickname before change
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelNickChanged(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sOldNick) {
-        return getCallbackManager().getCallbackType(ChannelNickChangeListener.class).call(cChannel, cChannelClient, sOldNick);
+    protected void callChannelNickChanged(final ChannelInfo cChannel,
+            final ChannelClientInfo cChannelClient, final String sOldNick) {
+        getCallbackManager().getCallbackType(ChannelNickChangeListener.class).call(cChannel, cChannelClient, sOldNick);
     }
 
     /**
      * Callback to all objects implementing the NickChanged Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.NickChangeListener
+     * @see NickChangeListener
      * @param cClient Client changing nickname
      * @param sOldNick Nickname before change
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callNickChanged(final ClientInfo cClient, final String sOldNick) {
-        return getCallbackManager().getCallbackType(NickChangeListener.class).call(cClient, sOldNick);
+    protected void callNickChanged(final ClientInfo cClient, final String sOldNick) {
+        getCallbackManager().getCallbackType(NickChangeListener.class).call(cClient, sOldNick);
     }
 
     /**

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

@@ -61,7 +61,7 @@ public class ProcessNickInUse extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         if (!callNickInUse(token[3])) {
             // Manually handle nick in use.
             callDebugInfo(IRCParser.DEBUG_INFO, "No Nick in use Handler.");
@@ -87,7 +87,7 @@ public class ProcessNickInUse extends IRCProcessor {
      * Callback to all objects implementing the NickInUse Callback.
      *
      * @param nickname Nickname that was wanted.
-     * @see com.dmdirc.parser.interfaces.callbacks.NickInUseListener
+     * @see NickInUseListener
      * @return true if a method was called, false otherwise
      */
     protected boolean callNickInUse(final String nickname) {

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

@@ -48,19 +48,18 @@ public class ProcessNoticeAuth extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         callNoticeAuth(token[token.length - 1]);
     }
 
     /**
      * Callback to all objects implementing the NoticeAuth Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.AuthNoticeListener
+     * @see AuthNoticeListener
      * @param data Incomming Line.
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callNoticeAuth(final String data) {
-        return getCallbackManager().getCallbackType(AuthNoticeListener.class).call(data);
+    protected void callNoticeAuth(final String data) {
+        getCallbackManager().getCallbackType(AuthNoticeListener.class).call(data);
     }
 
     /**

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

@@ -54,18 +54,15 @@ public class ProcessPart extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    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;
         }
-        final IRCClientInfo iClient;
-        final IRCChannelInfo iChannel;
-        final IRCChannelClientInfo iChannelClient;
 
-        iClient = getClientInfo(token[0]);
-        iChannel = getChannel(token[2]);
+        final IRCClientInfo iClient = getClientInfo(token[0]);
+        final IRCChannelInfo iChannel = getChannel(token[2]);
 
         if (iClient == null) {
             return;
@@ -76,15 +73,16 @@ public class ProcessPart extends IRCProcessor {
         }
         if (iChannel == null) {
             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()));
+                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];
             }
-            iChannelClient = iChannel.getChannelClient(iClient);
+            final IRCChannelClientInfo 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]+"]", parser.getLastLine()));
                 return;
@@ -107,14 +105,14 @@ public class ProcessPart extends IRCProcessor {
     /**
      * Callback to all objects implementing the ChannelPart Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelPartListener
+     * @see ChannelPartListener
      * @param cChannel Channel that the user parted
      * @param cChannelClient Client that parted
      * @param sReason Reason given for parting (May be "")
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelPart(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sReason) {
-        return getCallbackManager().getCallbackType(ChannelPartListener.class).call(cChannel, cChannelClient, sReason);
+    protected void callChannelPart(final ChannelInfo cChannel,
+            final ChannelClientInfo cChannelClient, final String sReason) {
+        getCallbackManager().getCallbackType(ChannelPartListener.class).call(cChannel, cChannelClient, sReason);
     }
 
     /**

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

@@ -34,7 +34,6 @@ import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Process a Quit message.
@@ -58,16 +57,14 @@ public class ProcessQuit extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         // :nick!ident@host QUIT
         // :nick!ident@host QUIT :reason
         if (token.length < 2) {
             return;
         }
-        final IRCClientInfo iClient;
-        IRCChannelClientInfo iChannelClient;
 
-        iClient = getClientInfo(token[0]);
+        final IRCClientInfo iClient = getClientInfo(token[0]);
 
         if (iClient == null) {
             return;
@@ -81,9 +78,9 @@ public class ProcessQuit extends IRCProcessor {
             sReason = token[token.length - 1];
         }
 
-        final List<IRCChannelInfo> channelList = new ArrayList<>(parser.getChannels());
+        final Iterable<IRCChannelInfo> channelList = new ArrayList<>(parser.getChannels());
         for (IRCChannelInfo iChannel : channelList) {
-            iChannelClient = iChannel.getChannelClient(iClient);
+            final IRCChannelClientInfo iChannelClient = iChannel.getChannelClient(iClient);
             if (iChannelClient != null) {
                 if (parser.getRemoveAfterCallback()) {
                     callChannelQuit(iChannel, iChannelClient, sReason);
@@ -116,26 +113,25 @@ public class ProcessQuit extends IRCProcessor {
     /**
      * Callback to all objects implementing the ChannelQuit Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelQuitListener
+     * @see ChannelQuitListener
      * @param cChannel Channel that user was on
      * @param cChannelClient User thats quitting
      * @param sReason Quit reason
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelQuit(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sReason) {
-        return getCallbackManager().getCallbackType(ChannelQuitListener.class).call(cChannel, cChannelClient, sReason);
+    protected void callChannelQuit(final ChannelInfo cChannel,
+            final ChannelClientInfo cChannelClient, final String sReason) {
+        getCallbackManager().getCallbackType(ChannelQuitListener.class).call(cChannel, cChannelClient, sReason);
     }
 
     /**
      * Callback to all objects implementing the Quit Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.QuitListener
+     * @see QuitListener
      * @param cClient Client Quitting
      * @param sReason Reason for quitting (may be "")
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callQuit(final ClientInfo cClient, final String sReason) {
-        return getCallbackManager().getCallbackType(QuitListener.class).call(cClient, sReason);
+    protected void callQuit(final ClientInfo cClient, final String sReason) {
+        getCallbackManager().getCallbackType(QuitListener.class).call(cClient, sReason);
     }
 
     /**

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

@@ -51,7 +51,7 @@ public class ProcessTopic extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         final IRCChannelInfo iChannel;
         switch (sParam) {
             case "332":
@@ -86,10 +86,7 @@ public class ProcessTopic extends IRCProcessor {
                     return;
                 }
                 iChannel.setTopicTime(System.currentTimeMillis() / 1000);
-                if (token[0].charAt(0) == ':') {
-                    token[0] = token[0].substring(1);
-                }
-                iChannel.setTopicUser(token[0]);
+                iChannel.setTopicUser(token[0].charAt(0) == ':' ? token[0].substring(1) : token[0]);
                 iChannel.setInternalTopic(token[token.length - 1]);
                 callChannelTopic(iChannel, false);
                 break;
@@ -99,14 +96,13 @@ public class ProcessTopic extends IRCProcessor {
     /**
      * Callback to all objects implementing the ChannelTopic Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener
+     * @see ChannelTopicListener
      * @param cChannel Channel that topic was set on
      * @param bIsJoinTopic True when getting topic on join, false if set by user/server
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
+    protected void callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
         ((IRCChannelInfo) cChannel).setHadTopic();
-        return getCallbackManager().getCallbackType(ChannelTopicListener.class).call(cChannel, bIsJoinTopic);
+        getCallbackManager().getCallbackType(ChannelTopicListener.class).call(cChannel, bIsJoinTopic);
     }
 
     /**

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

@@ -50,7 +50,7 @@ public class ProcessWallops extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         if (token.length < 3) {
             return;
         }
@@ -77,37 +77,34 @@ public class ProcessWallops extends IRCProcessor {
     /**
      * Callback to all objects implementing the Wallop Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.WallopListener
-     * @param host Host of the user who sent the wallop
+     * @see WallopListener
      * @param message The message
-     * @return true if a method was called, false otherwise
+     * @param host Host of the user who sent the wallop
      */
-    protected boolean callWallop(final String message, final String host) {
-        return getCallbackManager().getCallbackType(WallopListener.class).call(message, host);
+    protected void callWallop(final String message, final String host) {
+        getCallbackManager().getCallbackType(WallopListener.class).call(message, host);
     }
 
     /**
      * Callback to all objects implementing the Walluser Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.WalluserListener
-     * @param host Host of the user who sent the walluser
+     * @see WalluserListener
      * @param message The message
-     * @return true if a method was called, false otherwise
+     * @param host Host of the user who sent the walluser
      */
-    protected boolean callWalluser(final String message, final String host) {
-        return getCallbackManager().getCallbackType(WalluserListener.class).call(message, host);
+    protected void callWalluser(final String message, final String host) {
+        getCallbackManager().getCallbackType(WalluserListener.class).call(message, host);
     }
 
     /**
      * Callback to all objects implementing the WallDesync Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.WallDesyncListener
-     * @param host Host of the user who sent the WallDesync
+     * @see WallDesyncListener
      * @param message The message
-     * @return true if a method was called, false otherwise
+     * @param host Host of the user who sent the WallDesync
      */
-    protected boolean callWallDesync(final String message, final String host) {
-        return getCallbackManager().getCallbackType(WallDesyncListener.class).call(message, host);
+    protected void callWallDesync(final String message, final String host) {
+        getCallbackManager().getCallbackType(WallDesyncListener.class).call(message, host);
     }
 
     /**

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

@@ -55,7 +55,7 @@ public class ProcessWho extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String[] token) {
+    public void process(final String sParam, final String... token) {
         // :blueyonder2.uk.quakenet.org 352 Dataforce #mdbot shane Tobavaj.users.quakenet.org *.quakenet.org Tobavaj G+x :3 Tobavaj - http://shane.dmdirc.com/scriptbot.php
         //              0               1      2        3     4              5                      6           7     8        9
         // :blueyonder2.uk.quakenet.org 352 Dataforce #mdbot ~Dataforce ResNetUser-BrynDinas-147.143.246.102.bangor.ac.uk *.quakenet.org Dataforce H@ :0 Dataforce
@@ -68,7 +68,7 @@ public class ProcessWho extends IRCProcessor {
         final IRCClientInfo client = getClientInfo(token[7]);
         if (client != null) {
             // Update ident/host
-            client.setUserBits(token[7] + "!" + token[4] + "@" + token[5], false);
+            client.setUserBits(token[7] + '!' + token[4] + '@' + token[5], false);
             // Update real name
             if (client.getRealname().isEmpty()) {
                 final String name = token[9].split(" ", 2)[1];
@@ -76,7 +76,7 @@ public class ProcessWho extends IRCProcessor {
             }
             // Update away state
             final String mode = token[8];
-            final AwayState isAway = (mode.indexOf('G') == -1) ? AwayState.HERE : AwayState.AWAY;
+            final AwayState isAway = mode.indexOf('G') == -1 ? AwayState.HERE : AwayState.AWAY;
             if (client.getAwayState() != isAway) {
                 final AwayState oldState = client.getAwayState();
                 client.setAwayState(isAway);
@@ -85,9 +85,8 @@ public class ProcessWho extends IRCProcessor {
                 } else {
                     callAwayStateOther(client, oldState, isAway);
 
-                    ChannelClientInfo iChannelClient;
                     for (ChannelInfo iChannel : parser.getChannels()) {
-                        iChannelClient = iChannel.getChannelClient(client);
+                        final ChannelClientInfo iChannelClient = iChannel.getChannelClient(client);
                         if (iChannelClient != null) {
                             callChannelAwayStateOther(iChannel, iChannelClient, oldState, isAway);
                         }
@@ -100,41 +99,41 @@ public class ProcessWho extends IRCProcessor {
     /**
      * Callback to all objects implementing the onAwayState Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.AwayStateListener
+     * @see AwayStateListener
      * @param oldState Old Away State
      * @param currentState Current Away State
      * @param reason Best guess at away reason
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callAwayState(final AwayState oldState, final AwayState currentState, final String reason) {
-        return getCallbackManager().getCallbackType(AwayStateListener.class).call(oldState, currentState, reason);
+    protected void callAwayState(final AwayState oldState, final AwayState currentState,
+            final String reason) {
+        getCallbackManager().getCallbackType(AwayStateListener.class).call(oldState, currentState, reason);
     }
 
     /**
      * Callback to all objects implementing the onAwayStateOther Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.OtherAwayStateListener
+     * @see OtherAwayStateListener
      * @param client Client this is for
      * @param oldState Old Away State
      * @param state Current Away State
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callAwayStateOther(final ClientInfo client, final AwayState oldState, final AwayState state) {
-        return getCallbackManager().getCallbackType(OtherAwayStateListener.class).call(client, oldState, state);
+    protected void callAwayStateOther(final ClientInfo client, final AwayState oldState,
+            final AwayState state) {
+        getCallbackManager().getCallbackType(OtherAwayStateListener.class).call(client, oldState, state);
     }
 
     /**
      * Callback to all objects implementing the onChannelAwayStateOther Callback.
      *
-     * @see com.dmdirc.parser.interfaces.callbacks.ChannelOtherAwayStateListener
+     * @see ChannelOtherAwayStateListener
      * @param channel Channel this is for
      * @param channelClient ChannelClient this is for
      * @param oldState Old Away State
      * @param state Current Away State
-     * @return true if a method was called, false otherwise
      */
-    protected boolean callChannelAwayStateOther(final ChannelInfo channel, final ChannelClientInfo channelClient, final AwayState oldState, final AwayState state) {
-        return getCallbackManager().getCallbackType(ChannelOtherAwayStateListener.class).call(channel, channelClient, oldState, state);
+    protected void callChannelAwayStateOther(final ChannelInfo channel,
+            final ChannelClientInfo channelClient, final AwayState oldState, final AwayState state) {
+        getCallbackManager().getCallbackType(ChannelOtherAwayStateListener.class).call(channel, channelClient, oldState, state);
     }
 
     /**