Parser support for arbitrary timestampyness

Change-Id: Ia9c4b46b63cd731db004f490bf460d98c99791a6
Reviewed-on: http://gerrit.dmdirc.com/1209
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Automatic-Compile: Shane Mc Cormack <shane@dmdirc.com>

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

@@ -33,6 +33,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -138,11 +139,24 @@ public abstract class CallbackObject {
      * @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 + 1];
-        System.arraycopy(args, 0, newArgs, 1, args.length);
+        final Object[] newArgs = new Object[args.length + 2];
+        System.arraycopy(args, 0, newArgs, 2, args.length);
         newArgs[0] = myParser;
+        newArgs[1] = date;
 
         createFakeArgs(newArgs);
 

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

@@ -28,6 +28,7 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Hashtable;
 
 /**
@@ -140,20 +141,15 @@ public abstract class CallbackObjectSpecific extends CallbackObject {
         }
     }
 
-    /**
-     * Actually calls this callback. The specified arguments must match those
-     * 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
-     */
+    /** {@inheritDoc} */
     @Override
-    public boolean call(final Object... args) {
+    public boolean call(final Date date, final Object... args) {
         boolean bResult = false;
 
-        final Object[] newArgs = new Object[args.length + 1];
-        System.arraycopy(args, 0, newArgs, 1, args.length);
+        final Object[] newArgs = new Object[args.length + 2];
+        System.arraycopy(args, 0, newArgs, 2, args.length);
         newArgs[0] = myParser;
+        newArgs[1] = date;
 
         createFakeArgs(newArgs);
 

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

@@ -24,17 +24,21 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Interface Used on every incomming line before 001.
  */
 public interface AuthNoticeListener extends CallbackInterface {
 
     /**
-	 * Called on every incomming line before 001.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sData Incomming Line.
-	 * @see com.dmdirc.parser.irc.ProcessNoticeAuth#callNoticeAuth
-	 */
-	void onNoticeAuth(Parser tParser, String sData);
+     * Called on every incomming line before 001.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param data Incomming Line.
+     * @see com.dmdirc.parser.irc.ProcessNoticeAuth#callNoticeAuth
+     */
+    void onNoticeAuth(Parser parser, Date date, String data);
+
 }

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

@@ -25,19 +25,23 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Called when we go away, or come back.
  */
 public interface AwayStateListener extends CallbackInterface {
 
     /**
-	 * Called when we go away, or come back.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-         * @param oldState Old Away State
-	 * @param currentState Current Away State
-	 * @param reason Best guess at away reason
-	 * @see com.dmdirc.parser.irc.ProcessAway#callAwayState
-	 */
-	void onAwayState(Parser tParser, AwayState oldState, AwayState currentState, String reason);
+     * Called when we go away, or come back.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param oldState Old Away State
+     * @param currentState Current Away State
+     * @param reason Best guess at away reason
+     * @see com.dmdirc.parser.irc.ProcessAway#callAwayState
+     */
+    void onAwayState(Parser parser, Date date, AwayState oldState,
+            AwayState currentState, String reason);
 }

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

@@ -28,6 +28,7 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import java.util.Date;
 
 /**
  * Called when a person does an action in a channel.
@@ -38,21 +39,23 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
 public interface ChannelActionListener extends CallbackInterface {
 
     /**
-	 * Called when a person does an action in a channel.
-	 * sHost is the hostname of the person sending the action. (Can be a server or a person)<br>
-	 * cChannelClient is null if user is a server, or not on the channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @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)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelAction
-	 */
-	void onChannelAction(
-            @FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sMessage,
-            @FakableSource String sHost);
+     * Called when a person does an action in a channel.
+     * sHost is the hostname of the person sending the action. (Can be a server or a person)<br>
+     * cChannelClient is null if user is a server, or not on the channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel where the action was sent to
+     * @param client ChannelClient who sent the action (may be null if server)
+     * @param message action contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callChannelAction
+     */
+    void onChannelAction(
+        @FakableSource Parser parser,
+        Date date,
+        @FakableSource ChannelInfo channel,
+        @FakableArgument ChannelClientInfo client,
+        String message,
+        @FakableSource String host);
 }

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

@@ -29,6 +29,8 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when a person sends a CTCP to a channel.
  * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
@@ -36,22 +38,25 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface ChannelCtcpListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a CTCP to a channel.
-	 * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
-	 * cChannelClient is null if user is a server.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @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)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelCTCP
-	 */
-	void onChannelCTCP(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sType, String sMessage,
-            @FakableSource String sHost);
+    
+    /**
+     * Called when a person sends a CTCP to a channel.
+     * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
+     * cChannelClient is null if user is a server.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel where CTCP was sent
+     * @param client ChannelClient who sent the message (may be null if server)
+     * @param type Type of CTCP (VERSION, TIME etc)
+     * @param message Additional contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callChannelCTCP
+     */
+    void onChannelCTCP(@FakableSource Parser parser,
+            Date date,
+            @FakableSource ChannelInfo channel,
+            @FakableArgument ChannelClientInfo client,
+            String type, String message,
+            @FakableSource String host);
 }

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

@@ -29,6 +29,8 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when a person sends a CTCPRReply to a channel.
  * sHost is the hostname of the person sending the CTCPReply. (Can be a server or a person)<br>
@@ -36,22 +38,25 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface ChannelCtcpReplyListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a CTCPRReply to a channel.
-	 * sHost is the hostname of the person sending the CTCPReply. (Can be a server or a person)<br>
-	 * cChannelClient is null if user is a server.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @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)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelCTCPReply
-	 */
-	void onChannelCTCPReply(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sType, String sMessage,
-            @FakableSource String sHost);
+
+    /**
+     * Called when a person sends a CTCPRReply to a channel.
+     * sHost is the hostname of the person sending the CTCPReply. (Can be a server or a person)<br>
+     * cChannelClient is null if user is a server.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel where CTCPReply was sent
+     * @param client ChannelClient who sent the message (may be null if server)
+     * @param type Type of CTCPRReply (VERSION, TIME etc)
+     * @param message Reply Contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callChannelCTCPReply
+     */
+    void onChannelCTCPReply(@FakableSource Parser parser,
+            Date date,
+            @FakableSource ChannelInfo channel,
+            @FakableArgument ChannelClientInfo client,
+            String type, String message,
+            @FakableSource String host);
 }

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

@@ -27,20 +27,25 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /** 
  * Called When we, or another client joins a channel.
  * This is called AFTER client has been added to channel as a ChannelClientInfo
  */
 @SpecificCallback
 public interface ChannelJoinListener extends CallbackInterface {
-	/**
-	 * Called When another client joins a channel.
-	 * This is called AFTER client has been added to channel as a ChannelClientInfo
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel Object
-	 * @param cChannelClient ChannelClient object for new person
-	 * @see com.dmdirc.parser.irc.ProcessJoin#callChannelJoin
-	 */
-	void onChannelJoin(Parser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient);
+
+    /**
+     * Called When another client joins a channel.
+     * This is called AFTER client has been added to channel as a ChannelClientInfo
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel Object
+     * @param client ChannelClient object for new person
+     * @see com.dmdirc.parser.irc.ProcessJoin#callChannelJoin
+     */
+    void onChannelJoin(Parser parser, Date date, ChannelInfo channel, ChannelClientInfo client);
+
 }

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

@@ -29,28 +29,33 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when a person is kicked.
  * cKickedByClient can be null if kicked by a server. sKickedByHost is the hostname of the person/server doing the kicking.
  */
 @SpecificCallback
 public interface ChannelKickListener extends CallbackInterface {
-	/**
-	 * Called when a person is kicked.
-	 * cKickedByClient can be null if kicked by a server. sKickedByHost is the hostname of the person/server doing the kicking.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @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)
-	 * @see com.dmdirc.parser.irc.ProcessKick#callChannelKick
-	 */
-	void onChannelKick(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            ChannelClientInfo cKickedClient,
-            @FakableArgument ChannelClientInfo cKickedByClient,
-            String sReason,
-            @FakableSource String sKickedByHost);
+
+    /**
+     * Called when a person is kicked.
+     * cKickedByClient can be null if kicked by a server. sKickedByHost is the hostname of the person/server doing the kicking.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel where the kick took place
+     * @param kickedClient ChannelClient that got kicked
+     * @param client ChannelClient that did the kicking (may be null if server)
+     * @param reason Reason for kick (may be "")
+     * @param host Hostname of Kicker (or servername)
+     * @see com.dmdirc.parser.irc.ProcessKick#callChannelKick
+     */
+    void onChannelKick(@FakableSource Parser parser,
+            Date date,
+            @FakableSource ChannelInfo channel,
+            ChannelClientInfo kickedClient,
+            @FakableArgument ChannelClientInfo client,
+            String reason,
+            @FakableSource String host);
 }

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

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when all requested ListModes have been sent.
  * This is decided by ProcessListModes, and is called when an "end of list"
@@ -33,13 +35,16 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface ChannelListModeListener extends CallbackInterface {
-	/**
-	 * Called when a ListModes reply is parsed.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel which the ListModes reply is for
-         * @param mode the Mode the ListMOdes reply is for.
-	 * @see com.dmdirc.parser.irc.ProcessListModes#callChannelGotListModes
-	 */
-	void onChannelGotListModes(Parser tParser, ChannelInfo cChannel, char mode);
+
+    /**
+     * Called when a ListModes reply is parsed.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel which the ListModes reply is for
+     * @param mode the Mode the ListMOdes reply is for.
+     * @see com.dmdirc.parser.irc.ProcessListModes#callChannelGotListModes
+     */
+    void onChannelGotListModes(Parser parser, Date date, ChannelInfo channel, char mode);
+
 }

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

@@ -29,6 +29,8 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when a person sends a message to a channel.
  * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
@@ -36,21 +38,23 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface ChannelMessageListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a message to a channel.
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * cChannelClient is null if user is a server, or not on the channel.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @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)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelMessage
-	 */
-	void onChannelMessage(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sMessage,
-            @FakableSource String sHost);
+
+    /**
+     * Called when a person sends a message to a channel.
+     * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
+     * cChannelClient is null if user is a server, or not on the channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel where the message was sent to
+     * @param client ChannelClient who sent the message (may be null if server)
+     * @param message Message contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callChannelMessage
+     */
+    void onChannelMessage(@FakableSource Parser parser, Date date,
+            @FakableSource ChannelInfo channel,
+            @FakableArgument ChannelClientInfo client,
+            String message,
+            @FakableSource String host);
 }

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

@@ -29,6 +29,8 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /** 
  * Called when the channel modes are changed or discovered.
  * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
@@ -36,21 +38,23 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface ChannelModeChangeListener extends CallbackInterface {
-	/**
-	 * Called when the channel modes are changed or discovered.
-	 * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
-	 * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel where modes were changed
-	 * @param cChannelClient Client chaning the modes (null if server)
-	 * @param sHost Host doing the mode changing (User host or server name)
-	 * @param sModes String showing the exact mode change parsed.
-	 * @see com.dmdirc.parser.irc.ProcessMode#callChannelModeChanged
-	 */
-	void onChannelModeChanged(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            @FakableSource String sHost,
-            String sModes);
+
+    /**
+     * Called when the channel modes are changed or discovered.
+     * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
+     * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel where modes were changed
+     * @param client Client chaning the modes (null if server)
+     * @param host Host doing the mode changing (User host or server name)
+     * @param modes String showing the exact mode change parsed.
+     * @see com.dmdirc.parser.irc.ProcessMode#callChannelModeChanged
+     */
+    void onChannelModeChanged(@FakableSource Parser parser, Date date,
+            @FakableSource ChannelInfo channel,
+            @FakableArgument ChannelClientInfo client,
+            @FakableSource String host,
+            String modes);
 }

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

@@ -29,6 +29,8 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when a person sends a Message to a channel with a mode prefix.
  * (Examples @#Channel +#Channel)
@@ -37,23 +39,25 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface ChannelModeMessageListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a Message to a channel.
-	 * sHost is the hostname of the person sending the Message. (Can be a server or a person)<br>
-	 * cChannelClient is null if user is a server, or not on the channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-         * @param prefix The mode prefix of the message
-	 * @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)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelModeMessage
-	 */
-	void onChannelModeMessage(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
+
+    /**
+     * Called when a person sends a Message to a channel.
+     * sHost is the hostname of the person sending the Message. (Can be a server or a person)<br>
+     * cChannelClient is null if user is a server, or not on the channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param prefix The mode prefix of the message
+     * @param channel Channel where the Message was sent to
+     * @param client ChannelClient who sent the Message (may be null if server)
+     * @param message Message contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callChannelModeMessage
+     */
+    void onChannelModeMessage(@FakableSource Parser parser,
+            Date date, @FakableSource ChannelInfo channel,
             char prefix,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sMessage,
-            @FakableSource String sHost);
+            @FakableArgument ChannelClientInfo client,
+            String message,
+            @FakableSource String host);
 }

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

@@ -29,6 +29,8 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when a person sends a notice to a channel with a mode prefix.
  * (Examples @#Channel +#Channel)
@@ -37,23 +39,25 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface ChannelModeNoticeListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a notice to a channel.
-	 * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
-	 * cChannelClient is null if user is a server, or not on the channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-         * @param prefix The mode prefix of the message
-	 * @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)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelModeNotice
-	 */
-	void onChannelModeNotice(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
+
+    /**
+     * Called when a person sends a notice to a channel.
+     * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
+     * cChannelClient is null if user is a server, or not on the channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param prefix The mode prefix of the message
+     * @param channel Channel where the notice was sent to
+     * @param client ChannelClient who sent the notice (may be null if server)
+     * @param message notice contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callChannelModeNotice
+     */
+    void onChannelModeNotice(@FakableSource Parser parser,
+            Date date, @FakableSource ChannelInfo channel,
             char prefix,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sMessage,
-            @FakableSource String sHost);
+            @FakableArgument ChannelClientInfo client,
+            String message,
+            @FakableSource String host);
 }

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

@@ -25,18 +25,22 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import java.util.Date;
 
 /**
  * Called when a names reply is parsed.
  */
 @SpecificCallback
 public interface ChannelNamesListener extends CallbackInterface {
-	/**
-	 * Called when a names reply is parsed.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel which the names reply is for
-	 * @see com.dmdirc.parser.irc.ProcessNames#callChannelGotNames
-	 */
-	void onChannelGotNames(Parser tParser, ChannelInfo cChannel);
+
+    /**
+     * Called when a names reply is parsed.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel which the names reply is for
+     * @see com.dmdirc.parser.irc.ProcessNames#callChannelGotNames
+     */
+    void onChannelGotNames(Parser parser, Date date, ChannelInfo channel);
+
 }

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

@@ -27,21 +27,27 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /** 
  * Called when we or another user change nickname (Called once per channel the user is on).
  * This is called after the nickname change has been done internally
  */
 @SpecificCallback
 public interface ChannelNickChangeListener extends CallbackInterface {
-	/**
-	 * Called when we or another user change nickname (Called once per channel the user is on).
-	 * This is called after the nickname change has been done internally
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel One of the channels that the user is on
-	 * @param cChannelClient Client changing nickname
-	 * @param sOldNick Nickname before change
-	 * @see com.dmdirc.parser.irc.ProcessNick#callChannelNickChanged
-	 */
-	 void onChannelNickChanged(Parser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sOldNick);
+
+    /**
+     * Called when we or another user change nickname (Called once per channel the user is on).
+     * This is called after the nickname change has been done internally
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel One of the channels that the user is on
+     * @param client Client changing nickname
+     * @param oldNick Nickname before change
+     * @see com.dmdirc.parser.irc.ProcessNick#callChannelNickChanged
+     */
+     void onChannelNickChanged(Parser parser, Date date, ChannelInfo channel,
+             ChannelClientInfo client, String oldNick);
+
 }

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

@@ -29,6 +29,8 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /** 
  * Called when the channel modes are changed or discovered.
  * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
@@ -36,21 +38,23 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface ChannelNonUserModeChangeListener extends CallbackInterface {
-	/**
-	 * Called when the channel modes are changed or discovered.
-	 * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
-	 * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel where modes were changed
-	 * @param cChannelClient Client chaning the modes (null if server)
-	 * @param sHost Host doing the mode changing (User host or server name)
-	 * @param sModes String showing the exact mode change parsed. (Not including user modes)
-	 */
-	void onChannelNonUserModeChanged(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            @FakableSource String sHost,
-            String sModes);
+
+    /**
+     * Called when the channel modes are changed or discovered.
+     * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
+     * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel where modes were changed
+     * @param client Client chaning the modes (null if server)
+     * @param host Host doing the mode changing (User host or server name)
+     * @param modes String showing the exact mode change parsed. (Not including user modes)
+     */
+    void onChannelNonUserModeChanged(@FakableSource Parser parser,
+            Date date, @FakableSource ChannelInfo channel,
+            @FakableArgument ChannelClientInfo client,
+            @FakableSource String host,
+            String modes);
 }
 

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

@@ -29,6 +29,8 @@ import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when a person sends a notice to a channel.
  * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
@@ -36,21 +38,23 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface ChannelNoticeListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a notice to a channel.
-	 * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
-	 * cChannelClient is null if user is a server, or not on the channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @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)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelNotice
-	 */
-	void onChannelNotice(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sMessage,
-            @FakableSource String sHost);
+
+    /**
+     * Called when a person sends a notice to a channel.
+     * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
+     * cChannelClient is null if user is a server, or not on the channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel where the notice was sent to
+     * @param client ChannelClient who sent the notice (may be null if server)
+     * @param message notice contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callChannelNotice
+     */
+    void onChannelNotice(@FakableSource Parser parser, Date date,
+            @FakableSource ChannelInfo channel,
+            @FakableArgument ChannelClientInfo client,
+            String message,
+            @FakableSource String host);
 }

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

@@ -27,21 +27,26 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import java.util.Date;
 
 /**
  * Called when we go away, or come back.
  */
 @SpecificCallback
 public interface ChannelOtherAwayStateListener extends CallbackInterface {
-	/**
-	 * Called when we go away, or come back.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param channel Channel this is for
-	 * @param channelClient Client this is for
-         * @param oldState Old Away State
-	 * @param state Current Away State
-	 * @see com.dmdirc.parser.irc.ProcessAway#callChannelAwayStateOther
-	 */
-	void onChannelAwayStateOther(Parser tParser, ChannelInfo channel, ChannelClientInfo channelClient, AwayState oldState, AwayState state);
+
+    /**
+     * Called when we go away, or come back.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel this is for
+     * @param client Client this is for
+     * @param oldState Old Away State
+     * @param state Current Away State
+     * @see com.dmdirc.parser.irc.ProcessAway#callChannelAwayStateOther
+     */
+    void onChannelAwayStateOther(Parser parser, Date date, ChannelInfo channel,
+            ChannelClientInfo client, AwayState oldState, AwayState state);
+
 }

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

@@ -26,6 +26,7 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import java.util.Date;
 
 /** 
  * Called When we, or another client parts a channel.
@@ -33,15 +34,19 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface ChannelPartListener extends CallbackInterface {
-	/**
-	 * Called When we, or another client parts a channel.
-	 * This is called BEFORE client has been removed from the channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel that the user parted
-	 * @param cChannelClient Client that parted
-	 * @param sReason Reason given for parting (May be "")
-	 * @see com.dmdirc.parser.irc.ProcessPart#callChannelPart
-	 */
-	void onChannelPart(Parser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sReason);
+
+    /**
+     * Called When we, or another client parts a channel.
+     * This is called BEFORE client has been removed from the channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel that the user parted
+     * @param client Client that parted
+     * @param reason Reason given for parting (May be "")
+     * @see com.dmdirc.parser.irc.ProcessPart#callChannelPart
+     */
+    void onChannelPart(Parser parser, Date date, ChannelInfo channel,
+            ChannelClientInfo client, String reason);
+
 }

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

@@ -27,21 +27,27 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /** 
  * Called When we, or another client quits IRC (Called once per channel the user was on).
  * This is called BEFORE client has been removed from the channel.
  */
 @SpecificCallback
 public interface ChannelQuitListener extends CallbackInterface {
-	/**
-	 * Called When we, or another client quits IRC (Called once per channel the user was on).
-	 * This is called BEFORE client has been removed from the channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel that user was on
-	 * @param cChannelClient User thats quitting
-	 * @param sReason Quit reason
-	 * @see com.dmdirc.parser.irc.ProcessQuit#callChannelQuit
-	 */
-	void onChannelQuit(Parser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sReason);
+
+    /**
+     * Called When we, or another client quits IRC (Called once per channel the user was on).
+     * This is called BEFORE client has been removed from the channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel that user was on
+     * @param client User thats quitting
+     * @param reason Quit reason
+     * @see com.dmdirc.parser.irc.ProcessQuit#callChannelQuit
+     */
+    void onChannelQuit(Parser parser, Date date, ChannelInfo channel,
+            ChannelClientInfo client, String reason);
+
 }

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

@@ -25,18 +25,23 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /** 
  * Called When we join a channel.
  * We are NOT added as a channelclient until after the names reply
  */
 public interface ChannelSelfJoinListener extends CallbackInterface {
-	/**
-	 * Called When we join a channel.
-	 * We are NOT added as a channelclient until after the names reply
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel Object
-	 * @see com.dmdirc.parser.irc.ProcessJoin#callChannelSelfJoin
-	 */
-	void onChannelSelfJoin(Parser tParser, ChannelInfo cChannel);
+
+    /**
+     * Called When we join a channel.
+     * We are NOT added as a channelclient until after the names reply
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel Object
+     * @see com.dmdirc.parser.irc.ProcessJoin#callChannelSelfJoin
+     */
+    void onChannelSelfJoin(Parser parser, Date date, ChannelInfo channel);
+
 }

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

@@ -28,6 +28,7 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import java.util.Date;
 
 /** 
  * Called when the channel modes are changed or discovered.
@@ -36,21 +37,24 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface ChannelSingleModeChangeListener extends CallbackInterface {
-	/**
-	 * Called when the channel modes are changed or discovered.
-	 * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
-	 * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel where modes were changed
-	 * @param cChannelClient Client chaning the modes (null if server)
-	 * @param sHost Host doing the mode changing (User host or server name)
-	 * @param sModes String parsed (ie "+m" or "+k moo"
-	 */
-	void onChannelSingleModeChanged(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            @FakableSource String sHost,
-            String sModes);
+
+    /**
+     * Called when the channel modes are changed or discovered.
+     * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
+     * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel where modes were changed
+     * @param client Client chaning the modes (null if server)
+     * @param host Host doing the mode changing (User host or server name)
+     * @param modes String parsed (ie "+m" or "+k moo"
+     */
+    void onChannelSingleModeChanged(@FakableSource Parser parser,
+            Date date,
+            @FakableSource ChannelInfo channel,
+            @FakableArgument ChannelClientInfo client,
+            @FakableSource String host,
+            String modes);
 }
 

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

@@ -25,6 +25,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import java.util.Date;
 
 /** 
  * Called when the topic is changed or discovered for the first time.
@@ -32,14 +33,17 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface ChannelTopicListener extends CallbackInterface {
-	/**
-	 * Called when the topic is changed or discovered for the first time.
-	 * bIsNewTopic is true if someone sets the topic, false if the topic is discovered on join
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel that topic was set on
-	 * @param bIsJoinTopic True when getting topic on join, false if set by user/server
-	 * @see com.dmdirc.parser.irc.ProcessTopic#callChannelTopic
-	 */
-	void onChannelTopic(Parser tParser, ChannelInfo cChannel, boolean bIsJoinTopic);
+
+    /**
+     * Called when the topic is changed or discovered for the first time.
+     * bIsNewTopic is true if someone sets the topic, false if the topic is discovered on join
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel that topic was set on
+     * @param isJoinTopic True when getting topic on join, false if set by user/server
+     * @see com.dmdirc.parser.irc.ProcessTopic#callChannelTopic
+     */
+    void onChannelTopic(Parser parser, Date date, ChannelInfo channel, boolean isJoinTopic);
+
 }

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

@@ -28,29 +28,33 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import java.util.Date;
 
 /** 
  * Called when a users channel mode is changed.
  */
 @SpecificCallback
 public interface ChannelUserModeChangeListener extends CallbackInterface {
-	/**
-	 * Called when a users channel mode is changed.
-	 * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
-	 * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel where modes were changed
-	 * @param cChangedClient Client being changed
-	 * @param cSetByClient Client chaning the modes (null if server)
-	 * @param sHost Host doing the mode changing (User host or server name)
-	 * @param sMode String representing mode change (ie +o)
-	 * @see com.dmdirc.parser.irc.ProcessMode#callChannelUserModeChanged
-	 */
-	void onChannelUserModeChanged(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            ChannelClientInfo cChangedClient,
-            @FakableArgument ChannelClientInfo cSetByClient,
-            @FakableSource String sHost,
-            String sMode);
+
+    /**
+     * Called when a users channel mode is changed.
+     * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
+     * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param channel Channel where modes were changed
+     * @param targetClient Client being changed
+     * @param client Client chaning the modes (null if server)
+     * @param host Host doing the mode changing (User host or server name)
+     * @param mode String representing mode change (ie +o)
+     * @see com.dmdirc.parser.irc.ProcessMode#callChannelUserModeChanged
+     */
+    void onChannelUserModeChanged(@FakableSource Parser parser,
+            Date date,
+            @FakableSource ChannelInfo channel,
+            ChannelClientInfo targetClient,
+            @FakableArgument ChannelClientInfo client,
+            @FakableSource String host,
+            String mode);
 }

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

@@ -25,16 +25,21 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.common.ParserError;
 
+import java.util.Date;
+
 /**
  * Called to give Error Information related to a connection attempt.
  */
 public interface ConnectErrorListener extends CallbackInterface {
-	/**
-	 * Called to give Error Information related to a connection attempt.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param errorInfo ParserError object representing the error.
-	 * @see com.dmdirc.parser.irc.IRCParser#callConnectError
-	 */
-	void onConnectError(Parser tParser, ParserError errorInfo);
+
+    /**
+     * Called to give Error Information related to a connection attempt.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param errorInfo ParserError object representing the error.
+     * @see com.dmdirc.parser.irc.IRCParser#callConnectError
+     */
+    void onConnectError(Parser parser, Date date, ParserError errorInfo);
+
 }

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

@@ -24,16 +24,21 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Interface Used on every incomming line BEFORE parsing.
  */
 public interface DataInListener extends CallbackInterface {
-	/**
-	 * Called on every incomming line BEFORE parsing.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sData Incomming Line.
-	 * @see com.dmdirc.parser.irc.IRCParser#callDataIn
-	 */
-	void onDataIn(Parser tParser, String sData);
+
+    /**
+     * Called on every incomming line BEFORE parsing.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param data Incomming Line.
+     * @see com.dmdirc.parser.irc.IRCParser#callDataIn
+     */
+    void onDataIn(Parser parser, Date date, String data);
+
 }

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

@@ -24,17 +24,22 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Called on every incomming line BEFORE being sent.
  */
 public interface DataOutListener extends CallbackInterface {
-	/**
-	 * Called on every incomming line BEFORE being sent.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sData Outgoing Data
-	 * @param bFromParser True if parser sent the data, false if sent using .sendLine
-	 * @see com.dmdirc.parser.irc.IRCParser#callDataOut
-	 */
-	void onDataOut(Parser tParser, String sData, boolean bFromParser);
+
+    /**
+     * Called on every incomming line BEFORE being sent.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param data Outgoing Data
+     * @param fromParser True if parser sent the data, false if sent using .sendLine
+     * @see com.dmdirc.parser.irc.IRCParser#callDataOut
+     */
+    void onDataOut(Parser parser, Date date, String data, boolean fromParser);
+
 }

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

@@ -24,17 +24,22 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Interface Used to give Debug Information.
  */
 public interface DebugInfoListener extends CallbackInterface {
-	/**
-	 * This callback is used to provide occasional debug information from the parser.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param nLevel Debugging Level (ndInfo, ndSocket etc)
-	 * @param sData Debugging Information
-	 * @see com.dmdirc.parser.irc.IRCParser#callDebugInfo
-	 */
-	void onDebugInfo(Parser tParser, int nLevel, String sData);
+
+    /**
+     * This callback is used to provide occasional debug information from the parser.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param level Debugging Level (ndInfo, ndSocket etc)
+     * @param data Debugging Information
+     * @see com.dmdirc.parser.irc.IRCParser#callDebugInfo
+     */
+    void onDebugInfo(Parser parser, Date date, int level, String data);
+
 }

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

@@ -25,16 +25,21 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.common.ParserError;
 
+import java.util.Date;
+
 /**
  * Called to give Error Information.
  */
 public interface ErrorInfoListener extends CallbackInterface {
-	/**
-	 * Called to give Error Information.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param errorInfo ParserError object representing the error.
-	 * @see com.dmdirc.parser.irc.IRCParser#callErrorInfo
-	 */
-	void onErrorInfo(Parser tParser, ParserError errorInfo);
+
+    /**
+     * Called to give Error Information.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param errorInfo ParserError object representing the error.
+     * @see com.dmdirc.parser.irc.IRCParser#callErrorInfo
+     */
+    void onErrorInfo(Parser parser, Date date, ParserError errorInfo);
+    
 }

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

@@ -24,17 +24,22 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Called when we are invited to a channel.
  */
 public interface InviteListener extends CallbackInterface {
-	/**
-	 * Called when we are invited to a channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param userHost Hostname of user who invited us
-	 * @param channel Channel we were invited to
-	 * @see com.dmdirc.parser.irc.ProcessInvite#callInvite
-	 */
-	void onInvite(Parser tParser, String userHost, String channel);
+
+    /**
+     * Called when we are invited to a channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param userHost Hostname of user who invited us
+     * @param channel Channel we were invited to
+     * @see com.dmdirc.parser.irc.ProcessInvite#callInvite
+     */
+    void onInvite(Parser parser, Date date, String userHost, String channel);
+
 }

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

@@ -24,17 +24,22 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Called when "End of MOTD" or "No MOTD" is received.
  */
 public interface MotdEndListener extends CallbackInterface {
-	/**
-	 * Called when "End of MOTD" or "No MOTD".
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param noMOTD Set to true if this was a "No MOTD Found" message rather than an "End of MOTD"
-	 * @param sData The contents of the line (incase of language changes or so)
-	 * @see com.dmdirc.parser.irc.ProcessMOTD#callMOTDEnd
-	 */
-	void onMOTDEnd(Parser tParser, boolean noMOTD, String sData);
+
+    /**
+     * Called when "End of MOTD" or "No MOTD".
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param noMOTD Set to true if this was a "No MOTD Found" message rather than an "End of MOTD"
+     * @param data The contents of the line (incase of language changes or so)
+     * @see com.dmdirc.parser.irc.ProcessMOTD#callMOTDEnd
+     */
+    void onMOTDEnd(Parser parser, Date date, boolean noMOTD, String data);
+
 }

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

@@ -24,16 +24,21 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Interface Used to give MOTD Information.
  */
 public interface MotdLineListener extends CallbackInterface {
-	/**
-	 * Called on every incomming line from the MOTD.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sData Incomming Line.
-	 * @see com.dmdirc.parser.irc.ProcessMOTD#callMOTDLine
-	 */
-	void onMOTDLine(Parser tParser, String sData);
+
+    /**
+     * Called on every incomming line from the MOTD.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param data Incomming Line.
+     * @see com.dmdirc.parser.irc.ProcessMOTD#callMOTDLine
+     */
+    void onMOTDLine(Parser parser, Date date, String data);
+
 }

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

@@ -24,16 +24,21 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Interface Used when the MOTD Starts.
  */
 public interface MotdStartListener extends CallbackInterface {
-	/**
-	 * Called on MOTD Start.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sData Incomming Line.
-	 * @see com.dmdirc.parser.irc.ProcessMOTD#callMOTDStart
-	 */
-	void onMOTDStart(Parser tParser, String sData);
+
+    /**
+     * Called on MOTD Start.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param data Incomming Line.
+     * @see com.dmdirc.parser.irc.ProcessMOTD#callMOTDStart
+     */
+    void onMOTDStart(Parser parser, Date date, String data);
+
 }

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

@@ -24,19 +24,25 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Interface Used when the Network=blah 005 token is recieved.
  */
 public interface NetworkDetectedListener extends CallbackInterface {
-	/**
-	 * Called when the Network=blah 005 token is recieved.
-	 * if NETWORK= is not sent in 005, this will not be called.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param networkName The name of the network.
-	 * @param ircdVersion The version of the ircd.
-	 * @param ircdType The Guessed type of the ircd based on the name.
-	 * @see com.dmdirc.parser.irc.Process004005#callGotNetwork
-	 */
-	void onGotNetwork(Parser tParser, String networkName, String ircdVersion, String ircdType);
+
+    /**
+     * Called when the Network=blah 005 token is recieved.
+     * if NETWORK= is not sent in 005, this will not be called.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param networkName The name of the network.
+     * @param ircdVersion The version of the ircd.
+     * @param ircdType The Guessed type of the ircd based on the name.
+     * @see com.dmdirc.parser.irc.Process004005#callGotNetwork
+     */
+    void onGotNetwork(Parser parser, Date date, String networkName,
+            String ircdVersion, String ircdType);
+
 }

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

@@ -25,19 +25,24 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Called when we or another user change nickname.
  * This is called after the nickname change has been done internally
  */
 public interface NickChangeListener extends CallbackInterface {
-	/**
-	 * Called when we or another user change nickname.
-	 * This is called after the nickname change has been done internally
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cClient Client changing nickname
-	 * @param sOldNick Nickname before change
-	 * @see com.dmdirc.parser.irc.ProcessNick#callNickChanged
-	 */
-	void onNickChanged(Parser tParser, ClientInfo cClient, String sOldNick);
+
+    /**
+     * Called when we or another user change nickname.
+     * This is called after the nickname change has been done internally
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param client Client changing nickname
+     * @param oldNick Nickname before change
+     * @see com.dmdirc.parser.irc.ProcessNick#callNickChanged
+     */
+    void onNickChanged(Parser parser, Date date, ClientInfo client, String oldNick);
+
 }

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

@@ -24,16 +24,21 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Called when requested nickname is in use.
  */
 public interface NickInUseListener extends CallbackInterface {
-	/**
-	 * Called when requested nickname is in use.
-	 *
-	 * @param nickname Nickname that was wanted.
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see com.dmdirc.parser.irc.ProcessNickInUse#callNickInUse
-	 */
-	void onNickInUse(Parser tParser, String nickname);
+
+    /**
+     * Called when requested nickname is in use.
+     *
+     * @param nickname Nickname that was wanted.
+     * @param date The date/time at which the event occured
+     * @param parser Reference to the parser object that made the callback.
+     * @see com.dmdirc.parser.irc.ProcessNickInUse#callNickInUse
+     */
+    void onNickInUse(Parser parser, Date date, String nickname);
+
 }

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

@@ -24,17 +24,22 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Interface Used to give numeric Information.
  */
 public interface NumericListener extends CallbackInterface {
-	/**
-	 * Called on every incomming line with a numerical type.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param numeric What numeric is this for
-	 * @param token IRC Tokenised line
-	 * @see com.dmdirc.parser.irc.ProcessingManager#callNumeric
-	 */
-	void onNumeric(Parser tParser, int numeric, String[] token);
+
+    /**
+     * Called on every incomming line with a numerical type.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param numeric What numeric is this for
+     * @param token IRC Tokenised line
+     * @see com.dmdirc.parser.irc.ProcessingManager#callNumeric
+     */
+    void onNumeric(Parser parser, Date date, int numeric, String[] token);
+
 }

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

@@ -27,19 +27,25 @@ import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when we go away, or come back.
  */
 @SpecificCallback
 public interface OtherAwayStateListener extends CallbackInterface {
-	/**
-	 * Called when we go away, or come back.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param client Client this is for
-         * @param oldState Old Away State
-	 * @param state Current Away State
-	 * @see com.dmdirc.parser.irc.ProcessAway#callAwayStateOther
-	 */
-	void onAwayStateOther(Parser tParser, ClientInfo client, AwayState oldState, AwayState state);
+
+    /**
+     * Called when we go away, or come back.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param client Client this is for
+     * @param oldState Old Away State
+     * @param state Current Away State
+     * @see com.dmdirc.parser.irc.ProcessAway#callAwayStateOther
+     */
+    void onAwayStateOther(Parser parser, Date date, ClientInfo client,
+            AwayState oldState, AwayState state);
+
 }

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

@@ -24,15 +24,20 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Interface Used when a raw 464 is recieved.
  */
 public interface PasswordRequiredListener extends CallbackInterface {
-	/**
-	 * Called when a raw 464 is recieved.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see com.dmdirc.parser.irc.Process004005#callPasswordRequired
-	 */
-	void onPasswordRequired(Parser tParser);
+
+    /**
+     * Called when a raw 464 is recieved.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @see com.dmdirc.parser.irc.Process004005#callPasswordRequired
+     */
+    void onPasswordRequired(Parser parser, Date date);
+
 }

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

@@ -24,15 +24,20 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Called when a Ping Failed.
  */
 public interface PingFailureListener extends CallbackInterface {
-	/**
-	 * Called when a ping failed.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see IRCParser#callPingFailed
-	 */
-	void onPingFailed(Parser tParser);
+
+    /**
+     * Called when a ping failed.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @see IRCParser#callPingFailed
+     */
+    void onPingFailed(Parser parser, Date date);
+
 }

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

@@ -23,16 +23,20 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import java.util.Date;
 
 /**
  * Called when a Ping was Sent.
  */
 public interface PingSentListener extends CallbackInterface {
-	/**
-	 * Called when a ping was Sent.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see IRCParser#callPingSent
-	 */
-	void onPingSent(Parser tParser);
+
+    /**
+     * Called when a ping was Sent.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @see IRCParser#callPingSent
+     */
+    void onPingSent(Parser parser, Date date);
+
 }

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

@@ -23,16 +23,20 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import java.util.Date;
 
 /**
  * Called when a Ping was a Success.
  */
 public interface PingSuccessListener extends CallbackInterface {
-	/**
-	 * Called when a ping was a Success.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see IRCParser#callPingSuccess
-	 */
-	void onPingSuccess(Parser tParser);
+
+    /**
+     * Called when a ping was a Success.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @see IRCParser#callPingSuccess
+     */
+    void onPingSuccess(Parser parser, Date date);
+
 }

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

@@ -23,16 +23,20 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import java.util.Date;
 
 /**
  * Called after 001.
  */
 public interface Post005Listener extends CallbackInterface {
-	/**
-	 * Called after 005.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see com.dmdirc.parser.irc.Process001#callPost005
-	 */
-	void onPost005(Parser tParser);
+
+    /**
+     * Called after 005.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @see com.dmdirc.parser.irc.Process001#callPost005
+     */
+    void onPost005(Parser parser, Date date);
+
 }

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import java.util.Date;
 
 /**
  * Called when a person does an action to you (PM).
@@ -32,15 +33,18 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface PrivateActionListener extends CallbackInterface {
-	/**
-	 * Called when a person does an action to you (PM).
-	 * sHost is the hostname of the person sending the action. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage action contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateAction
-	 */
-	void onPrivateAction(Parser tParser, String sMessage, String sHost);
+
+    /**
+     * Called when a person does an action to you (PM).
+     * sHost is the hostname of the person sending the action. (Can be a server or a person)<br>
+     * cClient is null if user is a server, or not on any common channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param message action contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateAction
+     */
+    void onPrivateAction(Parser parser, Date date, String message, String host);
+
 }

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

@@ -25,6 +25,8 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when a person sends a CTCP to you directly.
  * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
@@ -32,16 +34,19 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface PrivateCtcpListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a CTCP to you directly.
-	 * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channels.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sType Type of CTCP (VERSION, TIME etc)
-	 * @param sMessage Additional contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateCTCP
-	 */
-	void onPrivateCTCP(Parser tParser, String sType, String sMessage, String sHost);
+
+    /**
+     * Called when a person sends a CTCP to you directly.
+     * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
+     * cClient is null if user is a server, or not on any common channels.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param type Type of CTCP (VERSION, TIME etc)
+     * @param message Additional contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateCTCP
+     */
+    void onPrivateCTCP(Parser parser, Date date, String type, String message, String host);
+
 }

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

@@ -25,6 +25,8 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when a person sends a CTCPRReply to you directly.
  * sHost is the hostname of the person sending the CTCPRReply. (Can be a server or a person)<br>
@@ -32,16 +34,18 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface PrivateCtcpReplyListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a CTCPRReply to you directly.
-	 * sHost is the hostname of the person sending the CTCPRReply. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channels.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sType Type of CTCPRReply (VERSION, TIME etc)
-	 * @param sMessage Reply Contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateCTCPReply
-	 */
-	void onPrivateCTCPReply(Parser tParser, String sType, String sMessage, String sHost);
+
+    /**
+     * Called when a person sends a CTCPRReply to you directly.
+     * sHost is the hostname of the person sending the CTCPRReply. (Can be a server or a person)<br>
+     * cClient is null if user is a server, or not on any common channels.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param type Type of CTCPRReply (VERSION, TIME etc)
+     * @param message Reply Contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateCTCPReply
+     */
+    void onPrivateCTCPReply(Parser parser, Date date, String type, String message, String host);
 }

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

@@ -25,6 +25,8 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when a person sends a message to you directly (PM). 
  * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
@@ -32,15 +34,18 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface PrivateMessageListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a message to you directly (PM). 
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Message contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateMessage
-	 */
-	void onPrivateMessage(Parser tParser, String sMessage, String sHost);
+
+    /**
+     * Called when a person sends a message to you directly (PM).
+     * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
+     * cClient is null if user is a server, or not on any common channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param message Message contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateMessage
+     */
+    void onPrivateMessage(Parser parser, Date date, String message, String host);
+
 }

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

@@ -25,6 +25,8 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when a person sends a notice to you.
  * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
@@ -32,15 +34,18 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface PrivateNoticeListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a notice to you.
-	 * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Notice contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateNotice
-	 */
-	void onPrivateNotice(Parser tParser, String sMessage, String sHost);
-}
+
+    /**
+     * Called when a person sends a notice to you.
+     * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
+     * cClient is null if user is a server, or not on any common channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param message Notice contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateNotice
+     */
+    void onPrivateNotice(Parser parser, Date date, String message, String host);
+
+}

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

@@ -25,19 +25,24 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /** 
  * Called When we, or another client quits IRC (Called once in total).
  * This is called BEFORE client has been removed from the channel.
  */
 public interface QuitListener extends CallbackInterface {
-	/**
-	 * Called When we, or another client quits IRC (Called once in total).
-	 * This is called BEFORE client has been removed from the channel.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cClient Client Quitting
-	 * @param sReason Reason for quitting (may be "")
-	 * @see com.dmdirc.parser.irc.ProcessQuit#callQuit
-	 */
-	void onQuit(Parser tParser, ClientInfo cClient, String sReason);
+
+    /**
+     * Called When we, or another client quits IRC (Called once in total).
+     * This is called BEFORE client has been removed from the channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param client Client Quitting
+     * @param reason Reason for quitting (may be "")
+     * @see com.dmdirc.parser.irc.ProcessQuit#callQuit
+     */
+    void onQuit(Parser parser, Date date, ClientInfo client, String reason);
+
 }

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

@@ -24,16 +24,21 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Interface Used to give ServerError.
  */
 public interface ServerErrorListener extends CallbackInterface {
-	/**
-	 * This callback is used to give messages the server sends as an ERROR.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Error Information
-	 * @see com.dmdirc.parser.irc.IRCParser#callServerError
-	 */
-	void onServerError(Parser tParser, String sMessage);
+
+    /**
+     * This callback is used to give messages the server sends as an ERROR.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param message Error Information
+     * @see com.dmdirc.parser.irc.IRCParser#callServerError
+     */
+    void onServerError(Parser parser, Date date, String message);
+
 }

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

@@ -25,20 +25,25 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when a server sends a notice to you.
  * sHost is the hostname of the server sending the notice.<br>
  */
 @SpecificCallback
 public interface ServerNoticeListener extends CallbackInterface {
-	/**
-	 * Called when a server sends a notice to you.
-	 * sHost is the hostname of the server sending the notice.<br>
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Notice contents
-	 * @param sHost Hostname of sender
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateNotice
-	 */
-	void onServerNotice(Parser tParser, String sMessage, String sHost);
+
+    /**
+     * Called when a server sends a notice to you.
+     * sHost is the hostname of the server sending the notice.<br>
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param message Notice contents
+     * @param host Hostname of sender
+     * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateNotice
+     */
+    void onServerNotice(Parser parser, Date date, String message, String host);
+
 }

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

@@ -24,15 +24,20 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Called after 001.
  */
 public interface ServerReadyListener extends CallbackInterface {
-	/**
-	 * Called after 001.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see com.dmdirc.parser.irc.Process001#callServerReady
-	 */
-	void onServerReady(Parser tParser);
+
+    /**
+     * Called after 001.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @see com.dmdirc.parser.irc.Process001#callServerReady
+     */
+    void onServerReady(Parser parser, Date date);
+
 }

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

@@ -24,15 +24,18 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Called when the socket is closed.
  */
 public interface SocketCloseListener extends CallbackInterface {
 
     /**
-	 * Called when the socket is closed.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 */
-	void onSocketClosed(Parser tParser);
+     * Called when the socket is closed.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     */
+    void onSocketClosed(Parser parser, Date date);
 }

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

@@ -24,22 +24,28 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Called when a person sends an action not aimed specifically at you or a channel (ie $*).
  * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
  * cClient is null if user is a server, or not on any common channel.
  */
 public interface UnknownActionListener extends CallbackInterface {
-	/**
-	 * Called when a person sends an action not aimed specifically at you or a channel (ie $*).
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Action contents
-	 * @param sTarget Actual target of action
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownAction
-	 */
-	void onUnknownAction(Parser tParser, String sMessage, String sTarget, String sHost);
-}
+
+    /**
+     * Called when a person sends an action not aimed specifically at you or a channel (ie $*).
+     * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
+     * cClient is null if user is a server, or not on any common channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param message Action contents
+     * @param target Actual target of action
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownAction
+     */
+    void onUnknownAction(Parser parser, Date date, String message,
+            String target, String host);
+
+}

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

@@ -24,23 +24,29 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Called when a person sends a CTCP not aimed at you or a channel (ie $*).
  * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
  * cClient is null if user is a server, or not on any common channels.
  */
 public interface UnknownCtcpListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a CTCP not aimed at you or a channel (ie $*).
-	 * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channels.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @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)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownCTCP
-	 */
-	void onUnknownCTCP(Parser tParser, String sType, String sMessage, String sTarget, String sHost);
+
+    /**
+     * Called when a person sends a CTCP not aimed at you or a channel (ie $*).
+     * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
+     * cClient is null if user is a server, or not on any common channels.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param type Type of CTCP (VERSION, TIME etc)
+     * @param message Additional contents
+     * @param target Actual Target of CTCP
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownCTCP
+     */
+    void onUnknownCTCP(Parser parser, Date date, String type, String message,
+            String target, String host);
+
 }

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

@@ -24,23 +24,28 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Called when a person sends a CTCP not aimed at you or a channel (ie $*).
  * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
  * cClient is null if user is a server, or not on any common channels.
  */
 public interface UnknownCtcpReplyListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a CTCP not aimed at you or a channel (ie $*).
-	 * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channels.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @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)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownCTCPReply
-	 */
-	void onUnknownCTCPReply(Parser tParser, String sType, String sMessage, String sTarget, String sHost);
+
+    /**
+     * Called when a person sends a CTCP not aimed at you or a channel (ie $*).
+     * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
+     * cClient is null if user is a server, or not on any common channels.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param type Type of CTCPRReply (VERSION, TIME etc)
+     * @param message Reply Contents
+     * @param target Actual Target of CTCPReply
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownCTCPReply
+     */
+    void onUnknownCTCPReply(Parser parser, Date date, String type,
+            String message, String target, String host);
 }

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import java.util.Date;
 
 /**
  * Called when a person sends a message not aimed specifically at you or a channel (ie $*).
@@ -30,16 +31,19 @@ import com.dmdirc.parser.interfaces.Parser;
  * cClient is null if user is a server, or not on any common channel.
  */
 public interface UnknownMessageListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a message not aimed specifically at you or a channel (ie $*).
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Message contents
-	 * @param sTarget Actual target of message
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownMessage
-	 */
-	void onUnknownMessage(Parser tParser, String sMessage, String sTarget, String sHost);
+
+    /**
+     * Called when a person sends a message not aimed specifically at you or a channel (ie $*).
+     * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
+     * cClient is null if user is a server, or not on any common channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param message Message contents
+     * @param target Actual target of message
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownMessage
+     */
+    void onUnknownMessage(Parser parser, Date date, String message, String target, String host);
+
 }

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

@@ -24,22 +24,27 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /**
  * Called when a person sends a notice not aimed specifically at you or a channel (ie $*).
  * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
  * cClient is null if user is a server, or not on any common channel.
  */
 public interface UnknownNoticeListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a notice not aimed specifically at you or a channel (ie $*).
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Notice contents
-	 * @param sTarget Actual target of notice
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownNotice
-	 */
-	void onUnknownNotice(Parser tParser, String sMessage, String sTarget, String sHost);
+
+    /**
+     * Called when a person sends a notice not aimed specifically at you or a channel (ie $*).
+     * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
+     * cClient is null if user is a server, or not on any common channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param message Notice contents
+     * @param target Actual target of notice
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownNotice
+     */
+    void onUnknownNotice(Parser parser, Date date, String message, String target, String host);
+
 }

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

@@ -23,22 +23,27 @@
 package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
+import java.util.Date;
 
 /**
  * Called when a server sends a notice not aimed specifically at you or a channel (ie $*).
  * sHost is the hostname of the server sending the message.<br>
  */
 public interface UnknownServerNoticeListener extends CallbackInterface {
-	/**
-	 * Called when a server sends a notice not aimed specifically at you or a channel (ie $*).
-	 * sHost is the hostname of the server sending the message.<br>
-	 * cClient is null if user is a server, or not on any common channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Notice contents
-	 * @param sTarget Actual target of notice
-	 * @param sHost Hostname of sender
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownServerNotice
-	 */
-	void onUnknownServerNotice(Parser tParser, String sMessage, String sTarget, String sHost);
+
+    /**
+     * Called when a server sends a notice not aimed specifically at you or a channel (ie $*).
+     * sHost is the hostname of the server sending the message.<br>
+     * cClient is null if user is a server, or not on any common channel.
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param message Notice contents
+     * @param target Actual target of notice
+     * @param host Hostname of sender
+     * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownServerNotice
+     */
+    void onUnknownServerNotice(Parser parser, Date date, String message,
+            String target, String host);
+
 }

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

@@ -25,22 +25,27 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /** 
  * Called when user modes are changed.
  * cClient represents the user who's modes were changed (should ALWAYS be us)<br>
  * sSetby is the host of the person who set the mode (usually us, may be an oper or server in some cases)
  */
 public interface UserModeChangeListener extends CallbackInterface {
-	/**
-	 * Called when user modes are changed.
-	 * cClient represents the user who's modes were changed (should ALWAYS be us)<br>
-	 * sSetby is the host of the person who set the mode (usually us, may be an oper or server in some cases)
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @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.
-	 * @see com.dmdirc.parser.irc.ProcessMode#callUserModeChanged
-	 */
-	void onUserModeChanged(Parser tParser, ClientInfo cClient, String sSetBy, String sModes);
+
+    /**
+     * Called when user modes are changed.
+     * cClient represents the user who's modes were changed (should ALWAYS be us)<br>
+     * sSetby is the host of the person who set the mode (usually us, may be an oper or server in some cases)
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param client Client that had the mode changed (almost always us)
+     * @param host Host that set the mode (us or servername)
+     * @param modes The modes set.
+     * @see com.dmdirc.parser.irc.ProcessMode#callUserModeChanged
+     */
+    void onUserModeChanged(Parser parser, Date date, ClientInfo client,
+            String host, String modes);
 }

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

@@ -25,20 +25,24 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 
+import java.util.Date;
+
 /** 
  * Called when user modes are Discovered.
  * cClient represents the user who's modes were Discovered (should ALWAYS be us)<br>
  * sSetby is the host of the person who set the mode (usually us, may be an oper or server in some cases)
  */
 public interface UserModeDiscoveryListener extends CallbackInterface {
-	/**
-	 * Called when user modes are Discovered.
-	 * cClient represents the user who's modes were Discovered (should ALWAYS be us)
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cClient Client that had the mode changed (almost always us)
-	 * @param sModes The modes set.
-	 * @see com.dmdirc.parser.irc.ProcessMode#callUserModeDiscovered
-	 */
-	void onUserModeDiscovered(Parser tParser, ClientInfo cClient, String sModes);
+
+    /**
+     * Called when user modes are Discovered.
+     * cClient represents the user who's modes were Discovered (should ALWAYS be us)
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param client Client that had the mode changed (almost always us)
+     * @param modes The modes set.
+     * @see com.dmdirc.parser.irc.ProcessMode#callUserModeDiscovered
+     */
+    void onUserModeDiscovered(Parser parser, Date date, ClientInfo client, String modes);
 }

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import java.util.Date;
 
 /**
  * Called when a Desync message is recieved over wallops.
@@ -31,14 +32,17 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface WallDesyncListener extends CallbackInterface {
-	/**
-	 * Called when a Desync message is recieved over wallops.
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Message contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessWallops#callWallDesync
-	 */
-	void onWallDesync(Parser tParser, String sMessage, String sHost);
+
+    /**
+     * Called when a Desync message is recieved over wallops.
+     * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param message Message contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessWallops#callWallDesync
+     */
+    void onWallDesync(Parser parser, Date date, String message, String host);
+
 }

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces.callbacks;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
+import java.util.Date;
 
 /**
  * Called when an oper-only message is recieved over wallops.
@@ -31,14 +32,17 @@ import com.dmdirc.parser.interfaces.SpecificCallback;
  */
 @SpecificCallback
 public interface WallopListener extends CallbackInterface {
-	/**
-	 * Called when an oper-only message is recieved over wallops.
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Message contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessWallops#callWallop
-	 */
-	void onWallop(Parser tParser, String sMessage, String sHost);
+
+    /**
+     * Called when an oper-only message is recieved over wallops.
+     * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param message Message contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessWallops#callWallop
+     */
+    void onWallop(Parser parser, Date date, String message, String host);
+
 }

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

@@ -25,20 +25,24 @@ package com.dmdirc.parser.interfaces.callbacks;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 
+import java.util.Date;
+
 /**
  * Called when an all-users message is recieved over wallops.
  * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
  */
 @SpecificCallback
 public interface WalluserListener extends CallbackInterface {
-	/**
-	 * Called when an all-users message is recieved over wallops.
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Message contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessWallops#callWalluser
-	 */
-	void onWalluser(Parser tParser, String sMessage, String sHost);
+
+    /**
+     * Called when an all-users message is recieved over wallops.
+     * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
+     *
+     * @param parser Reference to the parser object that made the callback.
+     * @param date The date/time at which the event occured
+     * @param message Message contents
+     * @param host Hostname of sender (or servername)
+     * @see com.dmdirc.parser.irc.ProcessWallops#callWalluser
+     */
+    void onWalluser(Parser parser, Date date, String message, String host);
 }