Merge pull request #47 from csmith/master

Tidy up callbacks some more.

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

@@ -24,13 +24,78 @@ package com.dmdirc.parser.common;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
-import com.dmdirc.parser.interfaces.callbacks.*; //NOPMD
+import com.dmdirc.parser.interfaces.callbacks.AuthNoticeListener;
+import com.dmdirc.parser.interfaces.callbacks.AwayStateListener;
+import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
+import com.dmdirc.parser.interfaces.callbacks.ChannelActionListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelCtcpListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelCtcpReplyListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelJoinListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelKickListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelListModeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelMessageListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelModeChangeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelModeMessageListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelModeNoticeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelNamesListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelNickChangeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelNonUserModeChangeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelNoticeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelOtherAwayStateListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelPartListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelQuitListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelSelfJoinListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelSingleModeChangeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelUserModeChangeListener;
+import com.dmdirc.parser.interfaces.callbacks.CompositionStateChangeListener;
+import com.dmdirc.parser.interfaces.callbacks.ConnectErrorListener;
+import com.dmdirc.parser.interfaces.callbacks.DataInListener;
+import com.dmdirc.parser.interfaces.callbacks.DataOutListener;
+import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
+import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
+import com.dmdirc.parser.interfaces.callbacks.GroupListEndListener;
+import com.dmdirc.parser.interfaces.callbacks.GroupListEntryListener;
+import com.dmdirc.parser.interfaces.callbacks.GroupListStartListener;
+import com.dmdirc.parser.interfaces.callbacks.InviteListener;
+import com.dmdirc.parser.interfaces.callbacks.MotdEndListener;
+import com.dmdirc.parser.interfaces.callbacks.MotdLineListener;
+import com.dmdirc.parser.interfaces.callbacks.MotdStartListener;
+import com.dmdirc.parser.interfaces.callbacks.NetworkDetectedListener;
+import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;
+import com.dmdirc.parser.interfaces.callbacks.NickInUseListener;
+import com.dmdirc.parser.interfaces.callbacks.NumericListener;
+import com.dmdirc.parser.interfaces.callbacks.OtherAwayStateListener;
+import com.dmdirc.parser.interfaces.callbacks.PasswordRequiredListener;
+import com.dmdirc.parser.interfaces.callbacks.PingFailureListener;
+import com.dmdirc.parser.interfaces.callbacks.PingSentListener;
+import com.dmdirc.parser.interfaces.callbacks.PingSuccessListener;
+import com.dmdirc.parser.interfaces.callbacks.PrivateActionListener;
+import com.dmdirc.parser.interfaces.callbacks.PrivateCtcpListener;
+import com.dmdirc.parser.interfaces.callbacks.PrivateCtcpReplyListener;
+import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
+import com.dmdirc.parser.interfaces.callbacks.PrivateNoticeListener;
+import com.dmdirc.parser.interfaces.callbacks.QuitListener;
+import com.dmdirc.parser.interfaces.callbacks.ServerErrorListener;
+import com.dmdirc.parser.interfaces.callbacks.ServerNoticeListener;
+import com.dmdirc.parser.interfaces.callbacks.ServerReadyListener;
+import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
+import com.dmdirc.parser.interfaces.callbacks.UnknownActionListener;
+import com.dmdirc.parser.interfaces.callbacks.UnknownCtcpListener;
+import com.dmdirc.parser.interfaces.callbacks.UnknownCtcpReplyListener;
+import com.dmdirc.parser.interfaces.callbacks.UnknownMessageListener;
+import com.dmdirc.parser.interfaces.callbacks.UnknownNoticeListener;
+import com.dmdirc.parser.interfaces.callbacks.UnknownServerNoticeListener;
+import com.dmdirc.parser.interfaces.callbacks.UserModeChangeListener;
+import com.dmdirc.parser.interfaces.callbacks.UserModeDiscoveryListener;
+import com.dmdirc.parser.interfaces.callbacks.WallDesyncListener;
+import com.dmdirc.parser.interfaces.callbacks.WallopListener;
+import com.dmdirc.parser.interfaces.callbacks.WalluserListener;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -302,15 +367,7 @@ public class CallbackManager {
 
         @Override
         public Object invoke(final Object proxy, final Method method, final Object[] args) {
-            final Object[] modifiedArgs = new Object[args.length - 2];
-            System.arraycopy(args, 2, modifiedArgs, 0, args.length - 2);
-
-            if (args[1] == null) {
-                getCallbackType(callback).call(modifiedArgs);
-            } else {
-                getCallbackType(callback).call((Date) args[1], modifiedArgs);
-            }
-
+            getCallbackType(callback).call(args);
             return null;
         }
 

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

@@ -103,7 +103,7 @@ public class CallbackObject {
      * @param errorInfo ParserError object to pass as error.
      */
     protected final void callErrorInfo(final ParserError errorInfo) {
-        myManager.getCallback(ErrorInfoListener.class).onErrorInfo(null, null, errorInfo);
+        myManager.getCallback(ErrorInfoListener.class).onErrorInfo(myParser, new Date(), errorInfo);
     }
 
     /**
@@ -139,33 +139,13 @@ public class CallbackObject {
      * specified in the callback's interface, or an error will be raised.
      *
      * @param args The arguments to pass to the callback implementation
-     * @return True if a method was called, false otherwise
      */
-    public boolean call(final Object... args) {
-        return call(new Date(), args);
-    }
-
-    /**
-     * Actually calls this callback. The specified arguments must match those
-     * specified in the callback's interface, or an error will be raised.
-     *
-     * @param date The date/time at which the event occured
-     * @param args The arguments to pass to the callback implementation
-     * @return True if a method was called, false otherwise
-     */
-    public boolean call(final Date date, final Object... args) {
-        boolean bResult = false;
-
-        final Object[] newArgs = new Object[args.length + 2];
-        System.arraycopy(args, 0, newArgs, 2, args.length);
-        newArgs[0] = myParser;
-        newArgs[1] = date;
-
-        createFakeArgs(newArgs);
+    public void call(final Object... args) {
+        createFakeArgs(args);
 
         for (CallbackInterface iface : callbackInfo) {
             try {
-                type.getMethods()[0].invoke(iface, newArgs);
+                type.getMethods()[0].invoke(iface, args);
             } catch (SecurityException | IllegalAccessException |
                     IllegalArgumentException | InvocationTargetException e) {
                 if (getType().equals(ErrorInfoListener.class)) {
@@ -179,10 +159,7 @@ public class CallbackObject {
                     callErrorInfo(ei);
                 }
             }
-            bResult = true;
         }
-
-        return bResult;
     }
 
     /**

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

@@ -28,7 +28,6 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
 import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -136,40 +135,31 @@ public class CallbackObjectSpecific extends CallbackObject {
     }
 
     @Override
-    public boolean call(final Date date, final Object... args) {
-        boolean bResult = false;
-
-        final Object[] newArgs = new Object[args.length + 2];
-        System.arraycopy(args, 0, newArgs, 2, args.length);
-        newArgs[0] = myParser;
-        newArgs[1] = date;
-
-        createFakeArgs(newArgs);
+    public void call(final Object... args) {
+        createFakeArgs(args);
 
         for (CallbackInterface iface : new ArrayList<>(callbackInfo)) {
             if (type.isAnnotationPresent(SpecificCallback.class)
-                    && ((args[0] instanceof ClientInfo
-                    && !isValidUser(iface, ((ClientInfo) args[0]).getHostname()))
-                    || (args[0] instanceof ChannelInfo
-                    && !isValidChan(iface, (ChannelInfo) args[0]))
-                    || (!(args[0] instanceof ClientInfo
-                    || args[0] instanceof ChannelInfo)
+                    && (args[2] instanceof ClientInfo
+                    && !isValidUser(iface, ((ClientInfo) args[2]).getHostname())
+                    || args[2] instanceof ChannelInfo
+                    && !isValidChan(iface, (ChannelInfo) args[2])
+                    || !(args[2] instanceof ClientInfo
+                    || args[2] instanceof ChannelInfo)
                     && args[args.length - 1] instanceof String
-                    && !isValidUser(iface, (String) args[args.length - 1])))) {
+                    && !isValidUser(iface, (String) args[args.length - 1]))) {
                 continue;
             }
 
             try {
-                type.getMethods()[0].invoke(iface, newArgs);
+                type.getMethods()[0].invoke(iface, args);
             } catch (ReflectiveOperationException e) {
                 final ParserError ei = new ParserError(ParserError.ERROR_ERROR,
-                        "Exception in callback (" + e.getMessage() + ")",
+                        "Exception in callback (" + e.getMessage() + ')',
                         myParser.getLastLine());
                 ei.setException(e);
                 callErrorInfo(ei);
             }
-            bResult = true;
         }
-        return bResult;
     }
 }

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

@@ -537,7 +537,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @param message The error message
      */
     protected void callServerError(final String message) {
-        getCallback(ServerErrorListener.class).onServerError(null, null, message);
+        getCallback(ServerErrorListener.class).onServerError(this, new Date(), message);
     }
 
     /**
@@ -547,7 +547,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @param data Incoming Line.
      */
     protected void callDataIn(final String data) {
-        getCallback(DataInListener.class).onDataIn(null, null, data);
+        getCallback(DataInListener.class).onDataIn(this, new Date(), data);
     }
 
     /**
@@ -558,7 +558,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @see DataOutListener
      */
     protected void callDataOut(final String data, final boolean fromParser) {
-        getCallback(DataOutListener.class).onDataOut(null, null, data, fromParser);
+        getCallback(DataOutListener.class).onDataOut(this, new Date(), data, fromParser);
     }
 
     /**
@@ -581,7 +581,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @param data Debugging Information
      */
     protected void callDebugInfo(final int level, final String data) {
-        getCallback(DebugInfoListener.class).onDebugInfo(null, null, level, data);
+        getCallback(DebugInfoListener.class).onDebugInfo(this, new Date(), level, data);
     }
 
     /**
@@ -591,7 +591,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @param errorInfo ParserError object representing the error.
      */
     public void callErrorInfo(final ParserError errorInfo) {
-        getCallback(ErrorInfoListener.class).onErrorInfo(null, null, errorInfo);
+        getCallback(ErrorInfoListener.class).onErrorInfo(this, new Date(), errorInfo);
     }
 
     /**
@@ -601,7 +601,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @param errorInfo ParserError object representing the error.
      */
     protected void callConnectError(final ParserError errorInfo) {
-        getCallback(ConnectErrorListener.class).onConnectError(null, null, errorInfo);
+        getCallback(ConnectErrorListener.class).onConnectError(this, new Date(), errorInfo);
     }
 
     /**
@@ -610,7 +610,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @see SocketCloseListener
      */
     protected void callSocketClosed() {
-        getCallback(SocketCloseListener.class).onSocketClosed(null, null);
+        getCallback(SocketCloseListener.class).onSocketClosed(this, new Date());
     }
 
     /**
@@ -619,7 +619,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @see PingFailureListener
      */
     protected void callPingFailed() {
-        getCallbackManager().getCallback(PingFailureListener.class).onPingFailed(null, null);
+        getCallbackManager().getCallback(PingFailureListener.class).onPingFailed(this, new Date());
     }
 
     /**
@@ -628,7 +628,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @see PingSentListener
      */
     protected void callPingSent() {
-        getCallback(PingSentListener.class).onPingSent(null, null);
+        getCallback(PingSentListener.class).onPingSent(this, new Date());
     }
 
     /**
@@ -637,7 +637,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @see PingSuccessListener
      */
     protected void callPingSuccess() {
-        getCallback(PingSuccessListener.class).onPingSuccess(null, null);
+        getCallback(PingSuccessListener.class).onPingSuccess(this, new Date());
     }
 
     /**
@@ -662,7 +662,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
             parseChanModes();
         }
 
-        getCallback(ServerReadyListener.class).onServerReady(null, null);
+        getCallback(ServerReadyListener.class).onServerReady(this, new Date());
     }
 
     //---------------------------------------------------------------------------

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

@@ -273,6 +273,6 @@ public class ProcessingManager {
      */
     protected void callNumeric(final int numeric, final String... token) {
         parser.getCallbackManager().getCallback(NumericListener.class)
-                .onNumeric(null, null, numeric, token);
+                .onNumeric(parser, new Date(), numeric, token);
     }
 }

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

@@ -31,6 +31,7 @@ import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
 
+import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -95,7 +96,7 @@ public class Process004005 extends IRCProcessor {
         final String ircdType = parser.getServerSoftwareType();
 
         getCallback(NetworkDetectedListener.class)
-                .onGotNetwork(null, null, networkName, ircdVersion, ircdType);
+                .onGotNetwork(parser, new Date(), networkName, ircdVersion, ircdType);
     }
 
     /**

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

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.callbacks.PasswordRequiredListener;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
+import java.util.Date;
+
 /**
  * Process a 464 message.
  */
@@ -68,6 +70,6 @@ public class Process464 extends IRCProcessor {
      * @see PasswordRequiredListener
      */
     protected void callPasswordRequired() {
-        getCallback(PasswordRequiredListener.class).onPasswordRequired(null, null);
+        getCallback(PasswordRequiredListener.class).onPasswordRequired(parser, new Date());
     }
 }

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

@@ -27,6 +27,8 @@ import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
+import java.util.Date;
+
 /**
  * Process an Away/Back message.
  */
@@ -91,7 +93,7 @@ public class ProcessAway extends IRCProcessor {
     protected void callAwayState(final AwayState oldState, final AwayState currentState,
             final String reason) {
         getCallback(AwayStateListener.class)
-                .onAwayState(null, null, oldState, currentState, reason);
+                .onAwayState(parser, new Date(), oldState, currentState, reason);
     }
 
     /**

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

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.callbacks.InviteListener;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
+import java.util.Date;
+
 /**
  * Process an Invite Request.
  */
@@ -63,7 +65,7 @@ public class ProcessInvite extends IRCProcessor {
      * @param channel The name of the channel we were invited to
      */
     protected void callInvite(final String userHost, final String channel) {
-        getCallback(InviteListener.class).onInvite(null, null, userHost, channel);
+        getCallback(InviteListener.class).onInvite(parser, new Date(), userHost, channel);
     }
 
     /**

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

@@ -39,6 +39,7 @@ import com.dmdirc.parser.irc.ProcessingManager;
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
 
 import java.util.Arrays;
+import java.util.Date;
 
 /**
  * Process a channel join.
@@ -182,7 +183,8 @@ public class ProcessJoin extends IRCProcessor {
      */
     protected void callChannelJoin(final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient) {
-        getCallback(ChannelJoinListener.class).onChannelJoin(null, null, cChannel, cChannelClient);
+        getCallback(ChannelJoinListener.class).onChannelJoin(parser, new Date(), cChannel,
+                cChannelClient);
     }
 
     /**
@@ -192,7 +194,7 @@ public class ProcessJoin extends IRCProcessor {
      * @param cChannel Channel Object
      */
     protected void callChannelSelfJoin(final ChannelInfo cChannel) {
-        getCallback(ChannelSelfJoinListener.class).onChannelSelfJoin(null, null, cChannel);
+        getCallback(ChannelSelfJoinListener.class).onChannelSelfJoin(parser, new Date(), cChannel);
     }
 
     /**

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

@@ -33,6 +33,7 @@ import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Arrays;
+import java.util.Date;
 
 /**
  * Process a channel kick.
@@ -121,8 +122,8 @@ public class ProcessKick extends IRCProcessor {
             final ChannelClientInfo cKickedClient, final ChannelClientInfo cKickedByClient,
             final String sReason, final String sKickedByHost) {
         getCallback(ChannelKickListener.class)
-                .onChannelKick(null, null, cChannel, cKickedClient, cKickedByClient, sReason,
-                        sKickedByHost);
+                .onChannelKick(parser, new Date(), cChannel, cKickedClient, cKickedByClient,
+                        sReason, sKickedByHost);
     }
 
     /**

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

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.callbacks.GroupListStartListener;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
+import java.util.Date;
+
 /**
  * Process a list response.
  */
@@ -56,15 +58,15 @@ public class ProcessList extends IRCProcessor {
         // :port80b.se.quakenet.org 323 MD87 :End of /LIST
         switch (sParam) {
             case "321":
-                getCallback(GroupListStartListener.class).onGroupListStart(null, null);
+                getCallback(GroupListStartListener.class).onGroupListStart(parser, new Date());
                 break;
             case "322":
                 getCallback(GroupListEntryListener.class)
-                        .onGroupListEntry(null, null, token[3], Integer.parseInt(token[4]),
+                        .onGroupListEntry(parser, new Date(), token[3], Integer.parseInt(token[4]),
                                 token[5]);
                 break;
             case "323":
-                getCallback(GroupListEndListener.class).onGroupListEnd(null, null);
+                getCallback(GroupListEndListener.class).onGroupListEnd(parser, new Date());
                 break;
         }
     }

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

@@ -33,6 +33,7 @@ import com.dmdirc.parser.irc.ServerTypeGroup;
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Date;
 import java.util.Queue;
 
 /**
@@ -295,6 +296,6 @@ public class ProcessListModes extends IRCProcessor {
      */
     protected void callChannelGotListModes(final ChannelInfo cChannel, final char mode) {
         getCallback(ChannelListModeListener.class)
-                .onChannelGotListModes(null, null, cChannel, mode);
+                .onChannelGotListModes(parser, new Date(), cChannel, mode);
     }
 }

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

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.callbacks.MotdStartListener;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
+import java.util.Date;
+
 /**
  * Process a MOTD Related Line.
  */
@@ -72,7 +74,7 @@ public class ProcessMOTD extends IRCProcessor {
      * @see MotdEndListener
      */
     protected void callMOTDEnd(final boolean noMOTD, final String data) {
-        getCallback(MotdEndListener.class).onMOTDEnd(null, null, noMOTD, data);
+        getCallback(MotdEndListener.class).onMOTDEnd(parser, new Date(), noMOTD, data);
     }
 
     /**
@@ -82,7 +84,7 @@ public class ProcessMOTD extends IRCProcessor {
      * @param data Incomming Line.
      */
     protected void callMOTDLine(final String data) {
-        getCallback(MotdLineListener.class).onMOTDLine(null, null, data);
+        getCallback(MotdLineListener.class).onMOTDLine(parser, new Date(), data);
     }
 
     /**
@@ -92,7 +94,7 @@ public class ProcessMOTD extends IRCProcessor {
      * @param data Incomming Line.
      */
     protected void callMOTDStart(final String data) {
-        getCallback(MotdStartListener.class).onMOTDStart(null, null, data);
+        getCallback(MotdStartListener.class).onMOTDStart(parser, new Date(), data);
     }
 
     /**

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

@@ -303,7 +303,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callChannelAction(final Date date, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
         getCallback(ChannelActionListener.class)
-                .onChannelAction(null, date, cChannel, cChannelClient, sMessage, sHost);
+                .onChannelAction(parser, date, cChannel, cChannelClient, sMessage, sHost);
     }
 
     /**
@@ -321,7 +321,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
             final ChannelClientInfo cChannelClient, final String sType, final String sMessage,
             final String sHost) {
         getCallback(ChannelCtcpListener.class)
-                .onChannelCTCP(null, date, cChannel, cChannelClient, sType, sMessage, sHost);
+                .onChannelCTCP(parser, date, cChannel, cChannelClient, sType, sMessage, sHost);
     }
 
     /**
@@ -339,7 +339,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
             final ChannelClientInfo cChannelClient, final String sType, final String sMessage,
             final String sHost) {
         getCallback(ChannelCtcpReplyListener.class)
-                .onChannelCTCPReply(null, date, cChannel, cChannelClient, sType, sMessage, sHost);
+                .onChannelCTCPReply(parser, date, cChannel, cChannelClient, sType, sMessage, sHost);
     }
 
     /**
@@ -355,7 +355,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callChannelMessage(final Date date, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
         getCallback(ChannelMessageListener.class)
-                .onChannelMessage(null, date, cChannel, cChannelClient, sMessage, sHost);
+                .onChannelMessage(parser, date, cChannel, cChannelClient, sMessage, sHost);
     }
 
     /**
@@ -371,7 +371,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callChannelNotice(final Date date, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
         getCallback(ChannelNoticeListener.class)
-                .onChannelNotice(null, date, cChannel, cChannelClient, sMessage, sHost);
+                .onChannelNotice(parser, date, cChannel, cChannelClient, sMessage, sHost);
     }
 
     /**
@@ -389,7 +389,8 @@ public class ProcessMessage extends TimestampedIRCProcessor {
             final ChannelInfo cChannel, final ChannelClientInfo cChannelClient,
             final String sMessage, final String sHost) {
         getCallback(ChannelModeNoticeListener.class)
-                .onChannelModeNotice(null, date, cChannel, prefix, cChannelClient, sMessage, sHost);
+                .onChannelModeNotice(parser, date, cChannel, prefix, cChannelClient, sMessage,
+                        sHost);
     }
 
     /**
@@ -407,7 +408,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
             final ChannelInfo cChannel, final ChannelClientInfo cChannelClient,
             final String sMessage, final String sHost) {
         getCallback(ChannelModeMessageListener.class)
-                .onChannelModeMessage(null, date, cChannel, prefix, cChannelClient, sMessage,
+                .onChannelModeMessage(parser, date, cChannel, prefix, cChannelClient, sMessage,
                         sHost);
     }
 
@@ -421,7 +422,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callPrivateAction(final Date date, final String sMessage, final String sHost) {
         getCallback(PrivateActionListener.class)
-                .onPrivateAction(null, date, sMessage, sHost);
+                .onPrivateAction(parser, date, sMessage, sHost);
     }
 
     /**
@@ -436,7 +437,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callPrivateCTCP(final Date date, final String sType, final String sMessage,
             final String sHost) {
         getCallback(PrivateCtcpListener.class)
-                .onPrivateCTCP(null, date, sType, sMessage, sHost);
+                .onPrivateCTCP(parser, date, sType, sMessage, sHost);
     }
 
     /**
@@ -451,7 +452,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callPrivateCTCPReply(final Date date, final String sType, final String sMessage,
             final String sHost) {
         getCallback(PrivateCtcpReplyListener.class)
-                .onPrivateCTCPReply(null, date, sType, sMessage, sHost);
+                .onPrivateCTCPReply(parser, date, sType, sMessage, sHost);
     }
 
     /**
@@ -464,7 +465,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callPrivateMessage(final Date date, final String sMessage, final String sHost) {
         getCallback(PrivateMessageListener.class)
-                .onPrivateMessage(null, date, sMessage, sHost);
+                .onPrivateMessage(parser, date, sMessage, sHost);
     }
 
     /**
@@ -477,7 +478,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callPrivateNotice(final Date date, final String sMessage, final String sHost) {
         getCallback(PrivateNoticeListener.class)
-                .onPrivateNotice(null, date, sMessage, sHost);
+                .onPrivateNotice(parser, date, sMessage, sHost);
     }
 
     /**
@@ -490,7 +491,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callServerNotice(final Date date, final String sMessage, final String sHost) {
         getCallback(ServerNoticeListener.class)
-                .onServerNotice(null, date, sMessage, sHost);
+                .onServerNotice(parser, date, sMessage, sHost);
     }
 
     /**
@@ -505,7 +506,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callUnknownAction(final Date date, final String sMessage, final String sTarget,
             final String sHost) {
         getCallback(UnknownActionListener.class)
-                .onUnknownAction(null, date, sMessage, sTarget, sHost);
+                .onUnknownAction(parser, date, sMessage, sTarget, sHost);
     }
 
     /**
@@ -521,7 +522,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callUnknownCTCP(final Date date, final String sType, final String sMessage,
             final String sTarget, final String sHost) {
         getCallback(UnknownCtcpListener.class)
-                .onUnknownCTCP(null, date, sType, sMessage, sTarget, sHost);
+                .onUnknownCTCP(parser, date, sType, sMessage, sTarget, sHost);
     }
 
     /**
@@ -537,7 +538,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callUnknownCTCPReply(final Date date, final String sType, final String sMessage,
             final String sTarget, final String sHost) {
         getCallback(UnknownCtcpReplyListener.class)
-                .onUnknownCTCPReply(null, date, sType, sMessage, sTarget, sHost);
+                .onUnknownCTCPReply(parser, date, sType, sMessage, sTarget, sHost);
     }
 
     /**
@@ -552,7 +553,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callUnknownMessage(final Date date, final String sMessage, final String sTarget,
             final String sHost) {
         getCallback(UnknownMessageListener.class)
-                .onUnknownMessage(null, date, sMessage, sTarget, sHost);
+                .onUnknownMessage(parser, date, sMessage, sTarget, sHost);
     }
 
     /**
@@ -567,7 +568,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callUnknownNotice(final Date date, final String sMessage, final String sTarget,
             final String sHost) {
         getCallback(UnknownNoticeListener.class)
-                .onUnknownNotice(null, date, sMessage, sTarget, sHost);
+                .onUnknownNotice(parser, date, sMessage, sTarget, sHost);
     }
 
     /**
@@ -582,7 +583,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callUnknownServerNotice(final Date date, final String sMessage,
             final String sTarget, final String sHost) {
         getCallback(UnknownServerNoticeListener.class)
-                .onUnknownServerNotice(null, date, sMessage, sTarget, sHost);
+                .onUnknownServerNotice(parser, date, sMessage, sTarget, sHost);
     }
 
     /**

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

@@ -42,6 +42,7 @@ import com.dmdirc.parser.irc.PrefixModeManager;
 import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Calendar;
+import java.util.Date;
 
 /**
  * Process a Mode line.
@@ -229,8 +230,9 @@ public class ProcessMode extends IRCProcessor {
                         callDebugInfo(IRCParser.DEBUG_INFO, "List Mode: %c [%s] {Positive: %b}", cMode, sModeParam, bPositive);
                         if (!"324".equals(sParam)) {
                             getCallback(ChannelSingleModeChangeListener.class)
-                                    .onChannelSingleModeChanged(null, null, iChannel, setterCCI,
-                                            token[0], cPositive + cMode + " " + sModeParam);
+                                    .onChannelSingleModeChanged(parser, new Date(), iChannel,
+                                            setterCCI, token[0], cPositive + cMode + " " +
+                                                    sModeParam);
                         }
                     } else {
                         // Mode with a parameter
@@ -242,8 +244,9 @@ public class ProcessMode extends IRCProcessor {
                             iChannel.setModeParam(cMode, sModeParam);
                             if (!"324".equals(sParam)) {
                                 getCallback(ChannelSingleModeChangeListener.class)
-                                        .onChannelSingleModeChanged(null, null, iChannel, setterCCI,
-                                            token[0], cPositive + cMode + " " + sModeParam);
+                                        .onChannelSingleModeChanged(parser, new Date(), iChannel,
+                                                setterCCI, token[0], cPositive + cMode + " " +
+                                                        sModeParam);
                             }
                         } else {
                             // -Mode - parameter isn't always needed, we need to check
@@ -257,8 +260,9 @@ public class ProcessMode extends IRCProcessor {
                             iChannel.setModeParam(cMode, "");
                             if (!"324".equals(sParam)) {
                                 getCallback(ChannelSingleModeChangeListener.class)
-                                        .onChannelSingleModeChanged(null, null, iChannel, setterCCI,
-                                            token[0], trim(cPositive + cMode + " " + sModeParam));
+                                        .onChannelSingleModeChanged(parser, new Date(), iChannel,
+                                                setterCCI, token[0], trim(cPositive + cMode + " "
+                                                        + sModeParam));
                             }
                         }
                     }
@@ -277,7 +281,7 @@ public class ProcessMode extends IRCProcessor {
         } else {
             callChannelModeChanged(iChannel, setterCCI, token[0], sFullModeStr.toString().trim());
             getCallback(ChannelNonUserModeChangeListener.class)
-                    .onChannelNonUserModeChanged(null, null, iChannel, setterCCI, token[0],
+                    .onChannelNonUserModeChanged(parser, new Date(), iChannel, setterCCI, token[0],
                             trim(sNonUserModeStr.toString() + sNonUserModeStrParams));
         }
     }
@@ -289,7 +293,8 @@ public class ProcessMode extends IRCProcessor {
      * @param token IRCTokenised Array of the incomming line
      * @param clearOldModes Clear old modes before applying these modes (used by 221)
      */
-    private void processUserMode(final String sParam, final String[] token, final String[] sModestr, final boolean clearOldModes) {
+    private void processUserMode(final String sParam, final String[] token, final String[] sModestr,
+            final boolean clearOldModes) {
         final IRCClientInfo iClient = getClientInfo(token[2]);
 
         if (iClient == null) {
@@ -346,7 +351,7 @@ public class ProcessMode extends IRCProcessor {
     protected void callChannelModeChanged(final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sHost, final String sModes) {
         getCallback(ChannelModeChangeListener.class)
-                .onChannelModeChanged(null, null, cChannel, cChannelClient, sHost, sModes);
+                .onChannelModeChanged(parser, new Date(), cChannel, cChannelClient, sHost, sModes);
     }
 
     /**
@@ -363,8 +368,8 @@ public class ProcessMode extends IRCProcessor {
             final ChannelClientInfo cChangedClient, final ChannelClientInfo cSetByClient,
             final String sHost, final String sMode) {
         getCallback(ChannelUserModeChangeListener.class)
-                .onChannelUserModeChanged(null, null, cChannel, cChangedClient, cSetByClient,
-                        sHost, sMode);
+                .onChannelUserModeChanged(parser, new Date(), cChannel, cChangedClient,
+                        cSetByClient, sHost, sMode);
     }
 
     /**
@@ -378,7 +383,7 @@ public class ProcessMode extends IRCProcessor {
     protected void callUserModeChanged(final ClientInfo cClient, final String sSetby,
             final String sModes) {
         getCallback(UserModeChangeListener.class)
-                .onUserModeChanged(null, null, cClient, sSetby, sModes);
+                .onUserModeChanged(parser, new Date(), cClient, sSetby, sModes);
     }
 
     /**
@@ -390,7 +395,7 @@ public class ProcessMode extends IRCProcessor {
      */
     protected void callUserModeDiscovered(final ClientInfo cClient, final String sModes) {
         getCallback(UserModeDiscoveryListener.class)
-                .onUserModeDiscovered(null, null, cClient, sModes);
+                .onUserModeDiscovered(parser, new Date(), cClient, sModes);
     }
 
     /**

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

@@ -33,6 +33,8 @@ import com.dmdirc.parser.irc.ModeManager;
 import com.dmdirc.parser.irc.PrefixModeManager;
 import com.dmdirc.parser.irc.ProcessingManager;
 
+import java.util.Date;
+
 /**
  * Process a Names reply.
  */
@@ -146,7 +148,7 @@ public class ProcessNames extends IRCProcessor {
     protected void callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
         ((IRCChannelInfo) cChannel).setHadTopic();
         getCallback(ChannelTopicListener.class)
-                .onChannelTopic(null, null, cChannel, bIsJoinTopic);
+                .onChannelTopic(parser, new Date(), cChannel, bIsJoinTopic);
     }
 
     /**
@@ -157,7 +159,7 @@ public class ProcessNames extends IRCProcessor {
      */
     protected void callChannelGotNames(final ChannelInfo cChannel) {
         getCallback(ChannelNamesListener.class)
-                .onChannelGotNames(null, null, cChannel);
+                .onChannelGotNames(parser, new Date(), cChannel);
     }
 
     /**

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

@@ -34,6 +34,8 @@ import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
+import java.util.Date;
+
 /**
  * Process a Nick change.
  */
@@ -108,7 +110,7 @@ public class ProcessNick extends IRCProcessor {
     protected void callChannelNickChanged(final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sOldNick) {
         getCallback(ChannelNickChangeListener.class)
-                .onChannelNickChanged(null, null, cChannel, cChannelClient, sOldNick);
+                .onChannelNickChanged(parser, new Date(), cChannel, cChannelClient, sOldNick);
     }
 
     /**
@@ -120,7 +122,7 @@ public class ProcessNick extends IRCProcessor {
      */
     protected void callNickChanged(final ClientInfo cClient, final String sOldNick) {
         getCallback(NickChangeListener.class)
-                .onNickChanged(null, null, cClient, sOldNick);
+                .onNickChanged(parser, new Date(), cClient, sOldNick);
     }
 
     /**

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

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.callbacks.NickInUseListener;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
+import java.util.Date;
+
 /**
  * Process a NickInUse message.
  * Parser implements handling of this if Pre-001 and no other handler found,
@@ -72,7 +74,7 @@ public class ProcessNickInUse extends IRCProcessor {
      */
     protected void callNickInUse(final String nickname) {
         getCallback(NickInUseListener.class)
-                .onNickInUse(null, null, nickname);
+                .onNickInUse(parser, new Date(), nickname);
     }
 
     /**

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

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.callbacks.AuthNoticeListener;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
+import java.util.Date;
+
 /**
  * Process a NoticeAuth message.
  */
@@ -59,7 +61,7 @@ public class ProcessNoticeAuth extends IRCProcessor {
      * @param data Incomming Line.
      */
     protected void callNoticeAuth(final String data) {
-        getCallback(AuthNoticeListener.class).onNoticeAuth(null, null, data);
+        getCallback(AuthNoticeListener.class).onNoticeAuth(parser, new Date(), data);
     }
 
     /**

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

@@ -32,6 +32,8 @@ import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
+import java.util.Date;
+
 /**
  * Process a channel part.
  */
@@ -113,7 +115,7 @@ public class ProcessPart extends IRCProcessor {
     protected void callChannelPart(final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sReason) {
         getCallback(ChannelPartListener.class)
-                .onChannelPart(null, null, cChannel, cChannelClient, sReason);
+                .onChannelPart(parser, new Date(), cChannel, cChannelClient, sReason);
     }
 
     /**

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

@@ -34,6 +34,7 @@ import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.ArrayList;
+import java.util.Date;
 
 /**
  * Process a Quit message.
@@ -121,7 +122,7 @@ public class ProcessQuit extends IRCProcessor {
     protected void callChannelQuit(final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sReason) {
         getCallback(ChannelQuitListener.class)
-                .onChannelQuit(null, null, cChannel, cChannelClient, sReason);
+                .onChannelQuit(parser, new Date(), cChannel, cChannelClient, sReason);
     }
 
     /**
@@ -133,7 +134,7 @@ public class ProcessQuit extends IRCProcessor {
      */
     protected void callQuit(final ClientInfo cClient, final String sReason) {
         getCallback(QuitListener.class)
-                .onQuit(null, null, cClient, sReason);
+                .onQuit(parser, new Date(), cClient, sReason);
     }
 
     /**

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

@@ -29,6 +29,8 @@ import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
+import java.util.Date;
+
 /**
  * Process a topic change.
  */
@@ -103,7 +105,7 @@ public class ProcessTopic extends IRCProcessor {
     protected void callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
         ((IRCChannelInfo) cChannel).setHadTopic();
         getCallback(ChannelTopicListener.class)
-                .onChannelTopic(null, null, cChannel, bIsJoinTopic);
+                .onChannelTopic(parser, new Date(), cChannel, bIsJoinTopic);
     }
 
     /**

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

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.callbacks.WalluserListener;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
+import java.util.Date;
+
 /**
  * Process a WALLOPS Message.
  */
@@ -82,7 +84,7 @@ public class ProcessWallops extends IRCProcessor {
      * @param host Host of the user who sent the wallop
      */
     protected void callWallop(final String message, final String host) {
-        getCallback(WallopListener.class).onWallop(null, null, message, host);
+        getCallback(WallopListener.class).onWallop(parser, new Date(), message, host);
     }
 
     /**
@@ -94,7 +96,7 @@ public class ProcessWallops extends IRCProcessor {
      */
     protected void callWalluser(final String message, final String host) {
         getCallback(WalluserListener.class)
-                .onWalluser(null, null, message, host);
+                .onWalluser(parser, new Date(), message, host);
     }
 
     /**
@@ -106,7 +108,7 @@ public class ProcessWallops extends IRCProcessor {
      */
     protected void callWallDesync(final String message, final String host) {
         getCallback(WallDesyncListener.class)
-                .onWallDesync(null, null, message, host);
+                .onWallDesync(parser, new Date(), message, host);
     }
 
     /**

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

@@ -33,6 +33,8 @@ import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
+import java.util.Date;
+
 /**
  * Process a /who reply.
  */
@@ -107,7 +109,7 @@ public class ProcessWho extends IRCProcessor {
     protected void callAwayState(final AwayState oldState, final AwayState currentState,
             final String reason) {
         getCallback(AwayStateListener.class)
-                .onAwayState(null, null, oldState, currentState, reason);
+                .onAwayState(parser, new Date(), oldState, currentState, reason);
     }
 
     /**
@@ -121,7 +123,7 @@ public class ProcessWho extends IRCProcessor {
     protected void callAwayStateOther(final ClientInfo client, final AwayState oldState,
             final AwayState state) {
         getCallback(OtherAwayStateListener.class)
-                .onAwayStateOther(null, null, client, oldState, state);
+                .onAwayStateOther(parser, new Date(), client, oldState, state);
     }
 
     /**
@@ -136,7 +138,8 @@ public class ProcessWho extends IRCProcessor {
     protected void callChannelAwayStateOther(final ChannelInfo channel,
             final ChannelClientInfo channelClient, final AwayState oldState, final AwayState state) {
         getCallback(ChannelOtherAwayStateListener.class)
-                .onChannelAwayStateOther(null, null, channel, channelClient, oldState, state);
+                .onChannelAwayStateOther(parser, new Date(), channel, channelClient, oldState,
+                        state);
     }
 
     /**

irc/test/com/dmdirc/parser/irc/IRCParserTest.java

@@ -22,12 +22,10 @@
 
 package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.common.MyInfo;
-import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.AuthNoticeListener;
 import com.dmdirc.parser.common.CallbackNotFoundException;
+import com.dmdirc.parser.common.MyInfo;
+import com.dmdirc.parser.interfaces.callbacks.AuthNoticeListener;
 import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
 import com.dmdirc.parser.interfaces.callbacks.ChannelKickListener;
 import com.dmdirc.parser.interfaces.callbacks.ConnectErrorListener;
@@ -39,13 +37,21 @@ import com.dmdirc.parser.interfaces.callbacks.ServerReadyListener;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
-import java.util.Date;
 
 import javax.net.ssl.TrustManager;
 
 import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.anyObject;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.same;
+import static org.mockito.Mockito.verify;
 
 public class IRCParserTest {
 
@@ -70,8 +76,7 @@ public class IRCParserTest {
         myParser.injectConnectionStrings();
         myParser.injectLine(":nick2!ident@host NICK :nick");
 
-        verify(error, never()).onErrorInfo(same(myParser), (Date) anyObject(),
-                (ParserError) anyObject());
+        verify(error, never()).onErrorInfo(same(myParser), anyObject(), anyObject());
     }
 
     @Test
@@ -152,7 +157,7 @@ public class IRCParserTest {
         parser.getCallbackManager().addCallback(ServerErrorListener.class, test);
         parser.injectLine("ERROR :You smell of cheese");
 
-        verify(test).onServerError(same(parser), (Date) anyObject(), eq("You smell of cheese"));
+        verify(test).onServerError(same(parser), anyObject(), eq("You smell of cheese"));
     }
 
     @Test
@@ -163,7 +168,7 @@ public class IRCParserTest {
         parser.sendConnectionStrings();
 
         parser.injectLine("NOTICE AUTH :Random auth notice?");
-        verify(test).onNoticeAuth(same(parser), (Date) anyObject(), eq("Random auth notice?"));
+        verify(test).onNoticeAuth(same(parser), anyObject(), eq("Random auth notice?"));
     }
 
     @Test
@@ -174,7 +179,7 @@ public class IRCParserTest {
         parser.sendConnectionStrings();
 
         parser.injectLine(":us.ircnet.org 020 * :Stupid notice");
-        verify(test).onNoticeAuth(same(parser), (Date) anyObject(), eq("Stupid notice"));
+        verify(test).onNoticeAuth(same(parser), anyObject(), eq("Stupid notice"));
     }
 
     @Test
@@ -185,7 +190,7 @@ public class IRCParserTest {
         parser.sendConnectionStrings();
         parser.injectLine(":chris!@ NICK :user2");
 
-        verify(test, never()).onNoticeAuth((Parser) anyObject(), (Date) anyObject(), anyString());
+        verify(test, never()).onNoticeAuth(anyObject(), anyObject(), anyString());
     }
 
     @Test
@@ -196,7 +201,7 @@ public class IRCParserTest {
 
         parser.injectLine(":server 001 nick :Hi there, nick");
 
-        verify(test).onNumeric(same(parser), (Date) anyObject(), eq(1),
+        verify(test).onNumeric(same(parser), anyObject(), eq(1),
                 eq(new String[]{":server", "001", "nick", "Hi there, nick"}));
     }
 
@@ -221,11 +226,11 @@ public class IRCParserTest {
         };
 
         for (String string : strings) {
-            verify(test, never()).onServerReady((Parser) anyObject(), (Date) anyObject());
+            verify(test, never()).onServerReady(anyObject(), anyObject());
             parser.injectLine(string);
         }
 
-        verify(test).onServerReady(same(parser), (Date) anyObject());
+        verify(test).onServerReady(same(parser), anyObject());
     }
 
     @Test
@@ -333,8 +338,7 @@ public class IRCParserTest {
         parser.getCallbackManager().addCallback(ChannelKickListener.class, ick, "#D");
         parser.injectLine(":bar!me@moo KICK #D nick :Bye!");
 
-        verify(ick).onChannelKick(same(parser), (Date) anyObject(), (IRCChannelInfo) anyObject(),
-                (IRCChannelClientInfo) anyObject(), (IRCChannelClientInfo) anyObject(),
+        verify(ick).onChannelKick(same(parser), anyObject(), anyObject(), anyObject(), anyObject(),
                 anyString(), anyString());
     }
 
@@ -344,7 +348,7 @@ public class IRCParserTest {
         final ConnectErrorListener tiei = mock(ConnectErrorListener.class);
         tp.getCallbackManager().addCallback(ConnectErrorListener.class, tiei);
         tp.runSuper();
-        verify(tiei).onConnectError(same(tp), (Date) anyObject(), (ParserError) anyObject());
+        verify(tiei).onConnectError(same(tp), anyObject(), anyObject());
     }
 
 }