Publish events.

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

@@ -21,6 +21,7 @@
  */
 package com.dmdirc.parser.common;
 
+import com.dmdirc.parser.events.ErrorInfoEvent;
 import com.dmdirc.parser.interfaces.FakableArgument;
 import com.dmdirc.parser.interfaces.FakableSource;
 import com.dmdirc.parser.interfaces.Parser;
@@ -103,7 +104,7 @@ public class CallbackObject {
      * @param errorInfo ParserError object to pass as error.
      */
     protected final void callErrorInfo(final ParserError errorInfo) {
-        myManager.getCallback(ErrorInfoListener.class).onErrorInfo(myParser, new Date(), errorInfo);
+        myManager.publish(new ErrorInfoEvent(myParser, new Date(), errorInfo));
     }
 
     /**

common/src/com/dmdirc/parser/events/UnknownMessageEvent.java

@@ -35,7 +35,7 @@ public class UnknownMessageEvent extends ParserEvent {
     private final String target;
     private final String host;
 
-    public UnknownMessageEvent(final Parser parser, final Date date, final String type,
+    public UnknownMessageEvent(final Parser parser, final Date date,
             final String message, final String target, final String host) {
         super(parser, date);
         this.message = message;

common/src/com/dmdirc/parser/events/UnknownNoticeEvent.java

@@ -35,7 +35,7 @@ public class UnknownNoticeEvent extends ParserEvent {
     private final String target;
     private final String host;
 
-    public UnknownNoticeEvent(final Parser parser, final Date date, final String type,
+    public UnknownNoticeEvent(final Parser parser, final Date date,
             final String message, final String target, final String host) {
         super(parser, date);
         this.message = message;

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

@@ -31,6 +31,17 @@ import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.common.QueuePriority;
 import com.dmdirc.parser.common.SRVRecord;
 import com.dmdirc.parser.common.SystemEncoder;
+import com.dmdirc.parser.events.ConnectErrorEvent;
+import com.dmdirc.parser.events.DataInEvent;
+import com.dmdirc.parser.events.DataOutEvent;
+import com.dmdirc.parser.events.DebugInfoEvent;
+import com.dmdirc.parser.events.ErrorInfoEvent;
+import com.dmdirc.parser.events.PingFailureEvent;
+import com.dmdirc.parser.events.PingSentEvent;
+import com.dmdirc.parser.events.PingSuccessEvent;
+import com.dmdirc.parser.events.ServerErrorEvent;
+import com.dmdirc.parser.events.ServerReadyEvent;
+import com.dmdirc.parser.events.SocketCloseEvent;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Encoder;
 import com.dmdirc.parser.interfaces.EncodingParser;
@@ -59,8 +70,8 @@ import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.cert.X509Certificate;
-import java.text.SimpleDateFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -535,7 +546,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @param message The error message
      */
     protected void callServerError(final String message) {
-        getCallback(ServerErrorListener.class).onServerError(this, new Date(), message);
+        getCallbackManager().publish(new ServerErrorEvent(this, new Date(), message));
     }
 
     /**
@@ -545,7 +556,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @param data Incoming Line.
      */
     protected void callDataIn(final String data) {
-        getCallback(DataInListener.class).onDataIn(this, new Date(), data);
+        getCallbackManager().publish(new DataInEvent(this, new Date(), data));
     }
 
     /**
@@ -556,7 +567,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @see DataOutListener
      */
     protected void callDataOut(final String data, final boolean fromParser) {
-        getCallback(DataOutListener.class).onDataOut(this, new Date(), data, fromParser);
+        getCallbackManager().publish(new DataOutEvent(this, new Date(), data));
     }
 
     /**
@@ -579,7 +590,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @param data Debugging Information
      */
     protected void callDebugInfo(final int level, final String data) {
-        getCallback(DebugInfoListener.class).onDebugInfo(this, new Date(), level, data);
+        getCallbackManager().publish(new DebugInfoEvent(this, new Date(), level, data));
     }
 
     /**
@@ -589,7 +600,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @param errorInfo ParserError object representing the error.
      */
     public void callErrorInfo(final ParserError errorInfo) {
-        getCallback(ErrorInfoListener.class).onErrorInfo(this, new Date(), errorInfo);
+        getCallbackManager().publish(new ErrorInfoEvent(this, new Date(), errorInfo));
     }
 
     /**
@@ -599,7 +610,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @param errorInfo ParserError object representing the error.
      */
     protected void callConnectError(final ParserError errorInfo) {
-        getCallback(ConnectErrorListener.class).onConnectError(this, new Date(), errorInfo);
+        getCallbackManager().publish(new ConnectErrorEvent(this, new Date(), errorInfo));
     }
 
     /**
@@ -608,7 +619,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @see SocketCloseListener
      */
     protected void callSocketClosed() {
-        getCallback(SocketCloseListener.class).onSocketClosed(this, new Date());
+        getCallbackManager().publish(new SocketCloseEvent(this, new Date()));
     }
 
     /**
@@ -617,7 +628,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @see PingFailureListener
      */
     protected void callPingFailed() {
-        getCallbackManager().getCallback(PingFailureListener.class).onPingFailed(this, new Date());
+        getCallbackManager().publish(new PingFailureEvent(this, new Date()));
     }
 
     /**
@@ -626,7 +637,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @see PingSentListener
      */
     protected void callPingSent() {
-        getCallback(PingSentListener.class).onPingSent(this, new Date());
+        getCallbackManager().publish(new PingSentEvent(this, new Date()));
     }
 
     /**
@@ -635,7 +646,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      * @see PingSuccessListener
      */
     protected void callPingSuccess() {
-        getCallback(PingSuccessListener.class).onPingSuccess(this, new Date());
+        getCallbackManager().publish(new PingSuccessEvent(this, new Date()));
     }
 
     /**
@@ -660,7 +671,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
             parseChanModes();
         }
 
-        getCallback(ServerReadyListener.class).onServerReady(this, new Date());
+        getCallbackManager().publish(new ServerReadyEvent(this, new Date()));
     }
 
     //---------------------------------------------------------------------------

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.irc;
 
 import com.dmdirc.parser.common.ParserError;
+import com.dmdirc.parser.events.NumericEvent;
 import com.dmdirc.parser.interfaces.callbacks.NumericListener;
 import com.dmdirc.parser.irc.processors.IRCProcessor;
 import com.dmdirc.parser.irc.processors.Process001;
@@ -272,7 +273,6 @@ public class ProcessingManager {
      * @param token IRC Tokenised line
      */
     protected void callNumeric(final int numeric, final String... token) {
-        parser.getCallbackManager().getCallback(NumericListener.class)
-                .onNumeric(parser, new Date(), numeric, token);
+        parser.getCallbackManager().publish(new NumericEvent(parser, new Date(), numeric, token));
     }
 }

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.events.DebugInfoEvent;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.parser.interfaces.callbacks.NickInUseListener;
 
 import java.util.Date;
@@ -78,7 +78,7 @@ public class SimpleNickInUseHandler implements NickInUseListener {
     }
 
     private void callDebugInfo(final Parser parser, final int level, final String data) {
-        parser.getCallbackManager().getCallback(DebugInfoListener.class)
-                .onDebugInfo(parser, new Date(), level, data);
+        parser.getCallbackManager().publish(
+                new DebugInfoEvent(parser, new Date(), level, data));
     }
 }

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.irc.processors;
 
+import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.common.QueuePriority;
-import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
 import com.dmdirc.parser.irc.IRCChannelInfo;
@@ -125,15 +125,8 @@ public abstract class IRCProcessor {
         return parser.getChannel(name);
     }
 
-    /**
-     * Gets a callback proxy used to raise events.
-     *
-     * @param callback The type of callback proxy to retrieve.
-     * @param <T> The type of callback proxy to retrieve.
-     * @return A proxy that can be used to call events.
-     */
-    protected <T extends CallbackInterface> T getCallback(final Class<T> callback) {
-        return parser.getCallbackManager().getCallback(callback);
+    protected CallbackManager getCallbackManager() {
+        return parser.getCallbackManager();
     }
 
     /**

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

@@ -24,6 +24,7 @@ package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.common.QueuePriority;
+import com.dmdirc.parser.events.NetworkDetectedEvent;
 import com.dmdirc.parser.interfaces.callbacks.NetworkDetectedListener;
 import com.dmdirc.parser.irc.CapabilityState;
 import com.dmdirc.parser.irc.IRCEncoding;
@@ -85,8 +86,8 @@ public class Process004005 extends IRCProcessor {
         final String ircdVersion = parser.getServerSoftware();
         final String ircdType = parser.getServerSoftwareType();
 
-        getCallback(NetworkDetectedListener.class)
-                .onGotNetwork(parser, new Date(), networkName, ircdVersion, ircdType);
+        getCallbackManager().publish(
+                new NetworkDetectedEvent(parser, new Date(), networkName, ircdVersion, ircdType));
     }
 
     /**

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc.processors;
 
+import com.dmdirc.parser.events.PasswordRequiredEvent;
 import com.dmdirc.parser.interfaces.callbacks.PasswordRequiredListener;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
@@ -60,6 +61,6 @@ public class Process464 extends IRCProcessor {
      * @see PasswordRequiredListener
      */
     protected void callPasswordRequired() {
-        getCallback(PasswordRequiredListener.class).onPasswordRequired(parser, new Date());
+        getCallbackManager().publish(new PasswordRequiredEvent(parser, new Date()));
     }
 }

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

@@ -22,6 +22,7 @@
 package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.AwayState;
+import com.dmdirc.parser.events.AwayStateEvent;
 import com.dmdirc.parser.interfaces.callbacks.AwayStateListener;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
@@ -92,8 +93,8 @@ public class ProcessAway extends IRCProcessor {
      */
     protected void callAwayState(final AwayState oldState, final AwayState currentState,
             final String reason) {
-        getCallback(AwayStateListener.class)
-                .onAwayState(parser, new Date(), oldState, currentState, reason);
+        getCallbackManager().publish(
+                new AwayStateEvent(parser, new Date(), oldState, currentState, reason));
     }
 
 }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc.processors;
 
+import com.dmdirc.parser.events.InviteEvent;
 import com.dmdirc.parser.interfaces.callbacks.InviteListener;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
@@ -65,7 +66,7 @@ public class ProcessInvite extends IRCProcessor {
      * @param channel The name of the channel we were invited to
      */
     protected void callInvite(final String userHost, final String channel) {
-        getCallback(InviteListener.class).onInvite(parser, new Date(), userHost, channel);
+        getCallbackManager().publish(new InviteEvent(parser, new Date(), userHost, channel));
     }
 
 }

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

@@ -24,6 +24,8 @@ package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.common.QueuePriority;
+import com.dmdirc.parser.events.ChannelJoinEvent;
+import com.dmdirc.parser.events.ChannelSelfJoinEvent;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelJoinListener;
@@ -183,8 +185,8 @@ public class ProcessJoin extends IRCProcessor {
      */
     protected void callChannelJoin(final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient) {
-        getCallback(ChannelJoinListener.class).onChannelJoin(parser, new Date(), cChannel,
-                cChannelClient);
+        getCallbackManager().publish(
+                new ChannelJoinEvent(parser, new Date(), cChannel, cChannelClient));
     }
 
     /**
@@ -194,7 +196,7 @@ public class ProcessJoin extends IRCProcessor {
      * @param cChannel Channel Object
      */
     protected void callChannelSelfJoin(final ChannelInfo cChannel) {
-        getCallback(ChannelSelfJoinListener.class).onChannelSelfJoin(parser, new Date(), cChannel);
+        getCallbackManager().publish(new ChannelSelfJoinEvent(parser, new Date(), cChannel));
     }
 
 }

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ParserError;
+import com.dmdirc.parser.events.ChannelKickEvent;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelKickListener;
@@ -121,9 +122,9 @@ public class ProcessKick extends IRCProcessor {
     protected void callChannelKick(final ChannelInfo cChannel,
             final ChannelClientInfo cKickedClient, final ChannelClientInfo cKickedByClient,
             final String sReason, final String sKickedByHost) {
-        getCallback(ChannelKickListener.class)
-                .onChannelKick(parser, new Date(), cChannel, cKickedClient, cKickedByClient,
-                        sReason, sKickedByHost);
+        getCallbackManager().publish(
+                new ChannelKickEvent(parser, new Date(), cChannel, cKickedClient, cKickedByClient,
+                        sReason, sKickedByHost));
     }
 
 }

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.parser.irc.processors;
 
-import com.dmdirc.parser.interfaces.callbacks.GroupListEndListener;
-import com.dmdirc.parser.interfaces.callbacks.GroupListEntryListener;
-import com.dmdirc.parser.interfaces.callbacks.GroupListStartListener;
+import com.dmdirc.parser.events.GroupListEndEvent;
+import com.dmdirc.parser.events.GroupListEntryEvent;
+import com.dmdirc.parser.events.GroupListStartEvent;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
@@ -58,15 +58,14 @@ public class ProcessList extends IRCProcessor {
         // :port80b.se.quakenet.org 323 MD87 :End of /LIST
         switch (sParam) {
             case "321":
-                getCallback(GroupListStartListener.class).onGroupListStart(parser, new Date());
+                getCallbackManager().publish(new GroupListStartEvent(parser, new Date()));
                 break;
             case "322":
-                getCallback(GroupListEntryListener.class)
-                        .onGroupListEntry(parser, new Date(), token[3], Integer.parseInt(token[4]),
-                                token[5]);
+                getCallbackManager().publish(new GroupListEntryEvent(parser, new Date(), token[3],
+                        Integer.parseInt(token[4]), token[5]));
                 break;
             case "323":
-                getCallback(GroupListEndListener.class).onGroupListEnd(parser, new Date());
+                getCallbackManager().publish(new GroupListEndEvent(parser, new Date()));
                 break;
         }
     }

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

@@ -23,6 +23,7 @@ package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ChannelListModeItem;
 import com.dmdirc.parser.common.ParserError;
+import com.dmdirc.parser.events.ChannelListModeEvent;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelListModeListener;
 import com.dmdirc.parser.irc.IRCChannelInfo;
@@ -287,7 +288,6 @@ public class ProcessListModes extends IRCProcessor {
      * @param mode the mode that we got list modes for.
      */
     protected void callChannelGotListModes(final ChannelInfo cChannel, final char mode) {
-        getCallback(ChannelListModeListener.class)
-                .onChannelGotListModes(parser, new Date(), cChannel, mode);
+        getCallbackManager().publish(new ChannelListModeEvent(parser, new Date(), cChannel, mode));
     }
 }

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

@@ -22,6 +22,9 @@
 
 package com.dmdirc.parser.irc.processors;
 
+import com.dmdirc.parser.events.MOTDEndEvent;
+import com.dmdirc.parser.events.MOTDLineEvent;
+import com.dmdirc.parser.events.MOTDStartEvent;
 import com.dmdirc.parser.interfaces.callbacks.MotdEndListener;
 import com.dmdirc.parser.interfaces.callbacks.MotdLineListener;
 import com.dmdirc.parser.interfaces.callbacks.MotdStartListener;
@@ -74,7 +77,7 @@ public class ProcessMOTD extends IRCProcessor {
      * @see MotdEndListener
      */
     protected void callMOTDEnd(final boolean noMOTD, final String data) {
-        getCallback(MotdEndListener.class).onMOTDEnd(parser, new Date(), noMOTD, data);
+        getCallbackManager().publish(new MOTDEndEvent(parser, new Date(), noMOTD, data));
     }
 
     /**
@@ -84,7 +87,7 @@ public class ProcessMOTD extends IRCProcessor {
      * @param data Incomming Line.
      */
     protected void callMOTDLine(final String data) {
-        getCallback(MotdLineListener.class).onMOTDLine(parser, new Date(), data);
+        getCallbackManager().publish(new MOTDLineEvent(parser, new Date(), data));
     }
 
     /**
@@ -94,7 +97,7 @@ public class ProcessMOTD extends IRCProcessor {
      * @param data Incomming Line.
      */
     protected void callMOTDStart(final String data) {
-        getCallback(MotdStartListener.class).onMOTDStart(parser, new Date(), data);
+        getCallbackManager().publish(new MOTDStartEvent(parser, new Date(), data));
     }
 
 }

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

@@ -23,6 +23,25 @@
 package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ParserError;
+import com.dmdirc.parser.events.ChannelActionEvent;
+import com.dmdirc.parser.events.ChannelCTCPEvent;
+import com.dmdirc.parser.events.ChannelCTCPReplyEvent;
+import com.dmdirc.parser.events.ChannelMessageEvent;
+import com.dmdirc.parser.events.ChannelModeMessageEvent;
+import com.dmdirc.parser.events.ChannelModeNoticeEvent;
+import com.dmdirc.parser.events.ChannelNoticeEvent;
+import com.dmdirc.parser.events.PrivateActionEvent;
+import com.dmdirc.parser.events.PrivateCTCPEvent;
+import com.dmdirc.parser.events.PrivateCTCPReplyEvent;
+import com.dmdirc.parser.events.PrivateMessageEvent;
+import com.dmdirc.parser.events.PrivateNoticeEvent;
+import com.dmdirc.parser.events.ServerNoticeEvent;
+import com.dmdirc.parser.events.UnknownActionEvent;
+import com.dmdirc.parser.events.UnknownCTCPEvent;
+import com.dmdirc.parser.events.UnknownCTCPReplyEvent;
+import com.dmdirc.parser.events.UnknownMessageEvent;
+import com.dmdirc.parser.events.UnknownNoticeEvent;
+import com.dmdirc.parser.events.UnknownServerNoticeEvent;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelActionListener;
@@ -302,8 +321,8 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callChannelAction(final Date date, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
-        getCallback(ChannelActionListener.class)
-                .onChannelAction(parser, date, cChannel, cChannelClient, sMessage, sHost);
+        getCallbackManager().publish(
+                new ChannelActionEvent(parser, date, cChannel, cChannelClient, sMessage, sHost));
     }
 
     /**
@@ -320,8 +339,9 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callChannelCTCP(final Date date, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sType, final String sMessage,
             final String sHost) {
-        getCallback(ChannelCtcpListener.class)
-                .onChannelCTCP(parser, date, cChannel, cChannelClient, sType, sMessage, sHost);
+        getCallbackManager().publish(
+                new ChannelCTCPEvent(parser, date, cChannel, cChannelClient, sType, sMessage,
+                        sHost));
     }
 
     /**
@@ -338,8 +358,9 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callChannelCTCPReply(final Date date, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sType, final String sMessage,
             final String sHost) {
-        getCallback(ChannelCtcpReplyListener.class)
-                .onChannelCTCPReply(parser, date, cChannel, cChannelClient, sType, sMessage, sHost);
+        getCallbackManager().publish(
+                new ChannelCTCPReplyEvent(parser, date, cChannel, cChannelClient, sType, sMessage,
+                        sHost));
     }
 
     /**
@@ -354,8 +375,8 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callChannelMessage(final Date date, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
-        getCallback(ChannelMessageListener.class)
-                .onChannelMessage(parser, date, cChannel, cChannelClient, sMessage, sHost);
+        getCallbackManager().publish(
+                new ChannelMessageEvent(parser, date, cChannel, cChannelClient, sMessage, sHost));
     }
 
     /**
@@ -370,8 +391,8 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callChannelNotice(final Date date, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
-        getCallback(ChannelNoticeListener.class)
-                .onChannelNotice(parser, date, cChannel, cChannelClient, sMessage, sHost);
+        getCallbackManager().publish(
+                new ChannelNoticeEvent(parser, date, cChannel, cChannelClient, sMessage, sHost));
     }
 
     /**
@@ -388,9 +409,9 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callChannelModeNotice(final Date date, final char prefix,
             final ChannelInfo cChannel, final ChannelClientInfo cChannelClient,
             final String sMessage, final String sHost) {
-        getCallback(ChannelModeNoticeListener.class)
-                .onChannelModeNotice(parser, date, cChannel, prefix, cChannelClient, sMessage,
-                        sHost);
+        getCallbackManager().publish(
+                new ChannelModeNoticeEvent(parser, date, cChannel, prefix, cChannelClient, sMessage,
+                        sHost));
     }
 
     /**
@@ -407,9 +428,9 @@ public class ProcessMessage extends TimestampedIRCProcessor {
     protected void callChannelModeMessage(final Date date, final char prefix,
             final ChannelInfo cChannel, final ChannelClientInfo cChannelClient,
             final String sMessage, final String sHost) {
-        getCallback(ChannelModeMessageListener.class)
-                .onChannelModeMessage(parser, date, cChannel, prefix, cChannelClient, sMessage,
-                        sHost);
+        getCallbackManager().publish(
+                new ChannelModeMessageEvent(parser, date, cChannel, prefix, cChannelClient,
+                        sMessage, sHost));
     }
 
     /**
@@ -421,8 +442,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      * @param sHost Hostname of sender (or servername)
      */
     protected void callPrivateAction(final Date date, final String sMessage, final String sHost) {
-        getCallback(PrivateActionListener.class)
-                .onPrivateAction(parser, date, sMessage, sHost);
+        getCallbackManager().publish(new PrivateActionEvent(parser, date, sMessage, sHost));
     }
 
     /**
@@ -436,8 +456,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callPrivateCTCP(final Date date, final String sType, final String sMessage,
             final String sHost) {
-        getCallback(PrivateCtcpListener.class)
-                .onPrivateCTCP(parser, date, sType, sMessage, sHost);
+        getCallbackManager().publish(new PrivateCTCPEvent(parser, date, sType, sMessage, sHost));
     }
 
     /**
@@ -451,8 +470,8 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callPrivateCTCPReply(final Date date, final String sType, final String sMessage,
             final String sHost) {
-        getCallback(PrivateCtcpReplyListener.class)
-                .onPrivateCTCPReply(parser, date, sType, sMessage, sHost);
+        getCallbackManager().publish(
+                new PrivateCTCPReplyEvent(parser, date, sType, sMessage, sHost));
     }
 
     /**
@@ -464,8 +483,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      * @param sHost Hostname of sender (or servername)
      */
     protected void callPrivateMessage(final Date date, final String sMessage, final String sHost) {
-        getCallback(PrivateMessageListener.class)
-                .onPrivateMessage(parser, date, sMessage, sHost);
+        getCallbackManager().publish(new PrivateMessageEvent(parser, date, sMessage, sHost));
     }
 
     /**
@@ -477,8 +495,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      * @param sHost Hostname of sender (or servername)
      */
     protected void callPrivateNotice(final Date date, final String sMessage, final String sHost) {
-        getCallback(PrivateNoticeListener.class)
-                .onPrivateNotice(parser, date, sMessage, sHost);
+        getCallbackManager().publish(new PrivateNoticeEvent(parser, date, sMessage, sHost));
     }
 
     /**
@@ -490,8 +507,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      * @param sHost Hostname of sender (or servername)
      */
     protected void callServerNotice(final Date date, final String sMessage, final String sHost) {
-        getCallback(ServerNoticeListener.class)
-                .onServerNotice(parser, date, sMessage, sHost);
+        getCallbackManager().publish(new ServerNoticeEvent(parser, date, sMessage, sHost));
     }
 
     /**
@@ -505,8 +521,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callUnknownAction(final Date date, final String sMessage, final String sTarget,
             final String sHost) {
-        getCallback(UnknownActionListener.class)
-                .onUnknownAction(parser, date, sMessage, sTarget, sHost);
+        getCallbackManager().publish(new UnknownActionEvent(parser, date, sMessage, sTarget, sHost));
     }
 
     /**
@@ -521,8 +536,8 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callUnknownCTCP(final Date date, final String sType, final String sMessage,
             final String sTarget, final String sHost) {
-        getCallback(UnknownCtcpListener.class)
-                .onUnknownCTCP(parser, date, sType, sMessage, sTarget, sHost);
+        getCallbackManager().publish(
+                new UnknownCTCPEvent(parser, date, sType, sMessage, sTarget, sHost));
     }
 
     /**
@@ -537,8 +552,8 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callUnknownCTCPReply(final Date date, final String sType, final String sMessage,
             final String sTarget, final String sHost) {
-        getCallback(UnknownCtcpReplyListener.class)
-                .onUnknownCTCPReply(parser, date, sType, sMessage, sTarget, sHost);
+        getCallbackManager().publish(
+                new UnknownCTCPReplyEvent(parser, date, sType, sMessage, sTarget, sHost));
     }
 
     /**
@@ -552,8 +567,8 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callUnknownMessage(final Date date, final String sMessage, final String sTarget,
             final String sHost) {
-        getCallback(UnknownMessageListener.class)
-                .onUnknownMessage(parser, date, sMessage, sTarget, sHost);
+        getCallbackManager().publish(
+                new UnknownMessageEvent(parser, date, sMessage, sTarget, sHost));
     }
 
     /**
@@ -567,8 +582,7 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callUnknownNotice(final Date date, final String sMessage, final String sTarget,
             final String sHost) {
-        getCallback(UnknownNoticeListener.class)
-                .onUnknownNotice(parser, date, sMessage, sTarget, sHost);
+        getCallbackManager().publish(new UnknownNoticeEvent(parser, date, sMessage, sTarget, sHost));
     }
 
     /**
@@ -582,8 +596,8 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      */
     protected void callUnknownServerNotice(final Date date, final String sMessage,
             final String sTarget, final String sHost) {
-        getCallback(UnknownServerNoticeListener.class)
-                .onUnknownServerNotice(parser, date, sMessage, sTarget, sHost);
+        getCallbackManager().publish(
+                new UnknownServerNoticeEvent(parser, date, sMessage, sTarget, sHost));
     }
 
 }

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

@@ -24,12 +24,16 @@ package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ChannelListModeItem;
 import com.dmdirc.parser.common.ParserError;
+import com.dmdirc.parser.events.ChannelModeChangeEvent;
+import com.dmdirc.parser.events.ChannelNonUserModeChangeEvent;
+import com.dmdirc.parser.events.ChannelSingleModeChangeEvent;
+import com.dmdirc.parser.events.ChannelUserModeChangeEvent;
+import com.dmdirc.parser.events.UserModeChangeEvent;
+import com.dmdirc.parser.events.UserModeDiscoveryEvent;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelModeChangeListener;
-import com.dmdirc.parser.interfaces.callbacks.ChannelNonUserModeChangeListener;
-import com.dmdirc.parser.interfaces.callbacks.ChannelSingleModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelUserModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.UserModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.UserModeDiscoveryListener;
@@ -229,10 +233,10 @@ public class ProcessMode extends IRCProcessor {
                         iChannel.setListModeParam(cMode, new ChannelListModeItem(sModeParam, token[0], nTemp), bPositive);
                         callDebugInfo(IRCParser.DEBUG_INFO, "List Mode: %c [%s] {Positive: %b}", cMode, sModeParam, bPositive);
                         if (!"324".equals(sParam)) {
-                            getCallback(ChannelSingleModeChangeListener.class)
-                                    .onChannelSingleModeChanged(parser, new Date(), iChannel,
+                            getCallbackManager().publish(
+                                    new ChannelSingleModeChangeEvent(parser, new Date(), iChannel,
                                             setterCCI, token[0], cPositive + cMode + " " +
-                                                    sModeParam);
+                                            sModeParam));
                         }
                     } else {
                         // Mode with a parameter
@@ -243,10 +247,11 @@ public class ProcessMode extends IRCProcessor {
                             callDebugInfo(IRCParser.DEBUG_INFO, "Set Mode: %c [%s] {Positive: %b}", cMode, sModeParam, bPositive);
                             iChannel.setModeParam(cMode, sModeParam);
                             if (!"324".equals(sParam)) {
-                                getCallback(ChannelSingleModeChangeListener.class)
-                                        .onChannelSingleModeChanged(parser, new Date(), iChannel,
-                                                setterCCI, token[0], cPositive + cMode + " " +
-                                                        sModeParam);
+                                getCallbackManager().publish(
+                                        new ChannelSingleModeChangeEvent(parser, new Date(),
+                                                iChannel, setterCCI, token[0],
+                                                cPositive + cMode + " " +
+                                                        sModeParam));
                             }
                         } else {
                             // -Mode - parameter isn't always needed, we need to check
@@ -259,10 +264,10 @@ public class ProcessMode extends IRCProcessor {
                             callDebugInfo(IRCParser.DEBUG_INFO, "Unset Mode: %c [%s] {Positive: %b}", cMode, sModeParam, bPositive);
                             iChannel.setModeParam(cMode, "");
                             if (!"324".equals(sParam)) {
-                                getCallback(ChannelSingleModeChangeListener.class)
-                                        .onChannelSingleModeChanged(parser, new Date(), iChannel,
-                                                setterCCI, token[0], trim(cPositive + cMode + " "
-                                                        + sModeParam));
+                                getCallbackManager().publish(
+                                        new ChannelSingleModeChangeEvent(parser, new Date(),
+                                                iChannel, setterCCI, token[0],
+                                                trim(cPositive + cMode + " " + sModeParam)));
                             }
                         }
                     }
@@ -280,9 +285,9 @@ public class ProcessMode extends IRCProcessor {
             callChannelModeChanged(iChannel, null, "", sFullModeStr.toString().trim());
         } else {
             callChannelModeChanged(iChannel, setterCCI, token[0], sFullModeStr.toString().trim());
-            getCallback(ChannelNonUserModeChangeListener.class)
-                    .onChannelNonUserModeChanged(parser, new Date(), iChannel, setterCCI, token[0],
-                            trim(sNonUserModeStr.toString() + sNonUserModeStrParams));
+            getCallbackManager().publish(
+                    new ChannelNonUserModeChangeEvent(parser, new Date(), iChannel, setterCCI,
+                            token[0], trim(sNonUserModeStr.toString() + sNonUserModeStrParams)));
         }
     }
 
@@ -350,8 +355,9 @@ public class ProcessMode extends IRCProcessor {
      */
     protected void callChannelModeChanged(final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sHost, final String sModes) {
-        getCallback(ChannelModeChangeListener.class)
-                .onChannelModeChanged(parser, new Date(), cChannel, cChannelClient, sHost, sModes);
+        getCallbackManager().publish(
+                new ChannelModeChangeEvent(parser, new Date(), cChannel, cChannelClient, sHost,
+                        sModes));
     }
 
     /**
@@ -367,9 +373,9 @@ public class ProcessMode extends IRCProcessor {
     protected void callChannelUserModeChanged(final ChannelInfo cChannel,
             final ChannelClientInfo cChangedClient, final ChannelClientInfo cSetByClient,
             final String sHost, final String sMode) {
-        getCallback(ChannelUserModeChangeListener.class)
-                .onChannelUserModeChanged(parser, new Date(), cChannel, cChangedClient,
-                        cSetByClient, sHost, sMode);
+        getCallbackManager().publish(
+                new ChannelUserModeChangeEvent(parser, new Date(), cChannel, cChangedClient,
+                        cSetByClient, sHost, sMode));
     }
 
     /**
@@ -382,8 +388,8 @@ public class ProcessMode extends IRCProcessor {
      */
     protected void callUserModeChanged(final ClientInfo cClient, final String sSetby,
             final String sModes) {
-        getCallback(UserModeChangeListener.class)
-                .onUserModeChanged(parser, new Date(), cClient, sSetby, sModes);
+        getCallbackManager().publish(
+                new UserModeChangeEvent(parser, new Date(), cClient, sSetby, sModes));
     }
 
     /**
@@ -394,8 +400,8 @@ public class ProcessMode extends IRCProcessor {
      * @param sModes The modes set.
      */
     protected void callUserModeDiscovered(final ClientInfo cClient, final String sModes) {
-        getCallback(UserModeDiscoveryListener.class)
-                .onUserModeDiscovered(parser, new Date(), cClient, sModes);
+        getCallbackManager().publish(
+                new UserModeDiscoveryEvent(parser, new Date(), cClient, sModes));
     }
 
 }

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

@@ -22,6 +22,8 @@
 
 package com.dmdirc.parser.irc.processors;
 
+import com.dmdirc.parser.events.ChannelNamesEvent;
+import com.dmdirc.parser.events.ChannelTopicEvent;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNamesListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
@@ -147,8 +149,8 @@ public class ProcessNames extends IRCProcessor {
      */
     protected void callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
         ((IRCChannelInfo) cChannel).setHadTopic();
-        getCallback(ChannelTopicListener.class)
-                .onChannelTopic(parser, new Date(), cChannel, bIsJoinTopic);
+        getCallbackManager().publish(
+                new ChannelTopicEvent(parser, new Date(), cChannel, bIsJoinTopic));
     }
 
     /**
@@ -158,8 +160,7 @@ public class ProcessNames extends IRCProcessor {
      * @param cChannel Channel which the names reply is for
      */
     protected void callChannelGotNames(final ChannelInfo cChannel) {
-        getCallback(ChannelNamesListener.class)
-                .onChannelGotNames(parser, new Date(), cChannel);
+        getCallbackManager().publish(new ChannelNamesEvent(parser, new Date(), cChannel));
     }
 
 }

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

@@ -23,6 +23,8 @@
 package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ParserError;
+import com.dmdirc.parser.events.ChannelNickChangeEvent;
+import com.dmdirc.parser.events.NickChangeEvent;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
@@ -109,8 +111,8 @@ public class ProcessNick extends IRCProcessor {
      */
     protected void callChannelNickChanged(final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sOldNick) {
-        getCallback(ChannelNickChangeListener.class)
-                .onChannelNickChanged(parser, new Date(), cChannel, cChannelClient, sOldNick);
+        getCallbackManager().publish(
+                new ChannelNickChangeEvent(parser, new Date(), cChannel, cChannelClient, sOldNick));
     }
 
     /**
@@ -121,8 +123,7 @@ public class ProcessNick extends IRCProcessor {
      * @param sOldNick Nickname before change
      */
     protected void callNickChanged(final ClientInfo cClient, final String sOldNick) {
-        getCallback(NickChangeListener.class)
-                .onNickChanged(parser, new Date(), cClient, sOldNick);
+        getCallbackManager().publish(new NickChangeEvent(parser, new Date(), cClient, sOldNick));
     }
 
 }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc.processors;
 
+import com.dmdirc.parser.events.NickInUseEvent;
 import com.dmdirc.parser.interfaces.callbacks.NickInUseListener;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
@@ -73,8 +74,7 @@ public class ProcessNickInUse extends IRCProcessor {
      * @see NickInUseListener
      */
     protected void callNickInUse(final String nickname) {
-        getCallback(NickInUseListener.class)
-                .onNickInUse(parser, new Date(), nickname);
+        getCallbackManager().publish(new NickInUseEvent(parser, new Date(), nickname));
     }
 
 }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc.processors;
 
+import com.dmdirc.parser.events.AuthNoticeEvent;
 import com.dmdirc.parser.interfaces.callbacks.AuthNoticeListener;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
@@ -61,7 +62,7 @@ public class ProcessNoticeAuth extends IRCProcessor {
      * @param data Incomming Line.
      */
     protected void callNoticeAuth(final String data) {
-        getCallback(AuthNoticeListener.class).onNoticeAuth(parser, new Date(), data);
+        getCallbackManager().publish(new AuthNoticeEvent(parser, new Date(), data));
     }
 
 }

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

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.ParserError;
+import com.dmdirc.parser.events.ChannelPartEvent;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelPartListener;
@@ -114,8 +115,8 @@ public class ProcessPart extends IRCProcessor {
      */
     protected void callChannelPart(final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sReason) {
-        getCallback(ChannelPartListener.class)
-                .onChannelPart(parser, new Date(), cChannel, cChannelClient, sReason);
+        getCallbackManager().publish(
+                new ChannelPartEvent(parser, new Date(), cChannel, cChannelClient, sReason));
     }
 
 }

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

@@ -22,6 +22,8 @@
 
 package com.dmdirc.parser.irc.processors;
 
+import com.dmdirc.parser.events.ChannelQuitEvent;
+import com.dmdirc.parser.events.QuitEvent;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
@@ -121,8 +123,8 @@ public class ProcessQuit extends IRCProcessor {
      */
     protected void callChannelQuit(final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sReason) {
-        getCallback(ChannelQuitListener.class)
-                .onChannelQuit(parser, new Date(), cChannel, cChannelClient, sReason);
+        getCallbackManager().publish(
+                new ChannelQuitEvent(parser, new Date(), cChannel, cChannelClient, sReason));
     }
 
     /**
@@ -133,8 +135,7 @@ public class ProcessQuit extends IRCProcessor {
      * @param sReason Reason for quitting (may be "")
      */
     protected void callQuit(final ClientInfo cClient, final String sReason) {
-        getCallback(QuitListener.class)
-                .onQuit(parser, new Date(), cClient, sReason);
+        getCallbackManager().publish(new QuitEvent(parser, new Date(), cClient, sReason));
     }
 
 }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc.processors;
 
+import com.dmdirc.parser.events.ChannelTopicEvent;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
 import com.dmdirc.parser.irc.IRCChannelInfo;
@@ -104,8 +105,8 @@ public class ProcessTopic extends IRCProcessor {
      */
     protected void callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
         ((IRCChannelInfo) cChannel).setHadTopic();
-        getCallback(ChannelTopicListener.class)
-                .onChannelTopic(parser, new Date(), cChannel, bIsJoinTopic);
+        getCallbackManager().publish(
+                new ChannelTopicEvent(parser, new Date(), cChannel, bIsJoinTopic));
     }
 
 }

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

@@ -22,6 +22,9 @@
 
 package com.dmdirc.parser.irc.processors;
 
+import com.dmdirc.parser.events.WallDesyncEvent;
+import com.dmdirc.parser.events.WallopEvent;
+import com.dmdirc.parser.events.WalluserEvent;
 import com.dmdirc.parser.interfaces.callbacks.WallDesyncListener;
 import com.dmdirc.parser.interfaces.callbacks.WallopListener;
 import com.dmdirc.parser.interfaces.callbacks.WalluserListener;
@@ -84,7 +87,7 @@ public class ProcessWallops extends IRCProcessor {
      * @param host Host of the user who sent the wallop
      */
     protected void callWallop(final String message, final String host) {
-        getCallback(WallopListener.class).onWallop(parser, new Date(), message, host);
+        getCallbackManager().publish(new WallopEvent(parser, new Date(), message, host));
     }
 
     /**
@@ -95,8 +98,7 @@ public class ProcessWallops extends IRCProcessor {
      * @param host Host of the user who sent the walluser
      */
     protected void callWalluser(final String message, final String host) {
-        getCallback(WalluserListener.class)
-                .onWalluser(parser, new Date(), message, host);
+        getCallbackManager().publish(new WalluserEvent(parser, new Date(), message, host));
     }
 
     /**
@@ -107,8 +109,7 @@ public class ProcessWallops extends IRCProcessor {
      * @param host Host of the user who sent the WallDesync
      */
     protected void callWallDesync(final String message, final String host) {
-        getCallback(WallDesyncListener.class)
-                .onWallDesync(parser, new Date(), message, host);
+        getCallbackManager().publish(new WallDesyncEvent(parser, new Date(), message, host));
     }
 
 }

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

@@ -23,6 +23,9 @@
 package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.AwayState;
+import com.dmdirc.parser.events.AwayStateEvent;
+import com.dmdirc.parser.events.ChannelOtherAwayStateEvent;
+import com.dmdirc.parser.events.OtherAwayStateEvent;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
@@ -108,8 +111,8 @@ public class ProcessWho extends IRCProcessor {
      */
     protected void callAwayState(final AwayState oldState, final AwayState currentState,
             final String reason) {
-        getCallback(AwayStateListener.class)
-                .onAwayState(parser, new Date(), oldState, currentState, reason);
+        getCallbackManager().publish(
+                new AwayStateEvent(parser, new Date(), oldState, currentState, reason));
     }
 
     /**
@@ -122,8 +125,8 @@ public class ProcessWho extends IRCProcessor {
      */
     protected void callAwayStateOther(final ClientInfo client, final AwayState oldState,
             final AwayState state) {
-        getCallback(OtherAwayStateListener.class)
-                .onAwayStateOther(parser, new Date(), client, oldState, state);
+        getCallbackManager().publish(
+                new OtherAwayStateEvent(parser, new Date(), client, oldState, state));
     }
 
     /**
@@ -137,9 +140,9 @@ public class ProcessWho extends IRCProcessor {
      */
     protected void callChannelAwayStateOther(final ChannelInfo channel,
             final ChannelClientInfo channelClient, final AwayState oldState, final AwayState state) {
-        getCallback(ChannelOtherAwayStateListener.class)
-                .onChannelAwayStateOther(parser, new Date(), channel, channelClient, oldState,
-                        state);
+        getCallbackManager().publish(
+                new ChannelOtherAwayStateEvent(parser, new Date(), channel, channelClient, oldState,
+                        state));
     }
 
 }

xmpp/src/com/dmdirc/parser/xmpp/XmppFakeChannel.java

@@ -24,10 +24,10 @@ package com.dmdirc.parser.xmpp;
 
 import com.dmdirc.parser.common.BaseChannelInfo;
 import com.dmdirc.parser.common.ChannelListModeItem;
+import com.dmdirc.parser.events.ChannelNamesEvent;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.ChannelNamesListener;
 
 import java.util.Collection;
 import java.util.Date;
@@ -134,8 +134,8 @@ public class XmppFakeChannel extends BaseChannelInfo {
         }
 
         // TODO: Delete old contacts, don't needlessly create new objects
-        getParser().getCallbackManager().getCallback(ChannelNamesListener.class)
-                .onChannelGotNames(getParser(), new Date(), this);
+        getParser().getCallbackManager().publish(
+                new ChannelNamesEvent(getParser(), new Date(), this));
     }
 
 }

xmpp/src/com/dmdirc/parser/xmpp/XmppParser.java

@@ -30,23 +30,25 @@ import com.dmdirc.parser.common.CompositionState;
 import com.dmdirc.parser.common.DefaultStringConverter;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.common.QueuePriority;
+import com.dmdirc.parser.events.AwayStateEvent;
+import com.dmdirc.parser.events.ChannelSelfJoinEvent;
+import com.dmdirc.parser.events.CompositionStateChangeEvent;
+import com.dmdirc.parser.events.ConnectErrorEvent;
+import com.dmdirc.parser.events.DataInEvent;
+import com.dmdirc.parser.events.DataOutEvent;
+import com.dmdirc.parser.events.NumericEvent;
+import com.dmdirc.parser.events.OtherAwayStateEvent;
+import com.dmdirc.parser.events.PrivateActionEvent;
+import com.dmdirc.parser.events.PrivateMessageEvent;
+import com.dmdirc.parser.events.ServerReadyEvent;
+import com.dmdirc.parser.events.SocketCloseEvent;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.LocalClientInfo;
 import com.dmdirc.parser.interfaces.StringConverter;
-import com.dmdirc.parser.interfaces.callbacks.AwayStateListener;
 import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
-import com.dmdirc.parser.interfaces.callbacks.ChannelSelfJoinListener;
-import com.dmdirc.parser.interfaces.callbacks.CompositionStateChangeListener;
-import com.dmdirc.parser.interfaces.callbacks.ConnectErrorListener;
 import com.dmdirc.parser.interfaces.callbacks.DataInListener;
 import com.dmdirc.parser.interfaces.callbacks.DataOutListener;
-import com.dmdirc.parser.interfaces.callbacks.NumericListener;
-import com.dmdirc.parser.interfaces.callbacks.OtherAwayStateListener;
-import com.dmdirc.parser.interfaces.callbacks.PrivateActionListener;
-import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
-import com.dmdirc.parser.interfaces.callbacks.ServerReadyListener;
-import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
 
 import java.net.URI;
 import java.util.Collection;
@@ -242,7 +244,7 @@ public class XmppParser extends BaseSocketAwareParser {
         newArgs[2] = getLocalClient().getNickname();
         System.arraycopy(args, 0, newArgs, 3, args.length);
 
-        getCallback(NumericListener.class).onNumeric(this, new Date(), numeric, newArgs);
+        getCallbackManager().publish(new NumericEvent(this, new Date(), numeric, newArgs));
     }
 
     @Override
@@ -408,9 +410,9 @@ public class XmppParser extends BaseSocketAwareParser {
     @Override
     public void run() {
         if (getURI().getUserInfo() == null || !getURI().getUserInfo().contains(":")) {
-            getCallback(ConnectErrorListener.class).onConnectError(this,
-                    new Date(), new ParserError(ParserError.ERROR_USER,
-                            "User name and password must be specified in URI", ""));
+            getCallbackManager().publish(new ConnectErrorEvent(this, new Date(),
+                    new ParserError(ParserError.ERROR_USER,
+                            "User name and password must be specified in URI", "")));
             return;
         }
         final String[] userInfoParts = getURI().getUserInfo().split(":", 2);
@@ -440,9 +442,8 @@ public class XmppParser extends BaseSocketAwareParser {
             try {
                 connection.login(userInfoParts[0], userInfoParts[1], "DMDirc.");
             } catch (XMPPException ex) {
-                getCallback(ConnectErrorListener.class).onConnectError(this,
-                        new Date(), new ParserError(ParserError.ERROR_USER,
-                                ex.getMessage(), ""));
+                getCallbackManager().publish(new ConnectErrorEvent(this, new Date(),
+                        new ParserError(ParserError.ERROR_USER, ex.getMessage(), "")));
                 return;
             }
 
@@ -454,7 +455,7 @@ public class XmppParser extends BaseSocketAwareParser {
 
             setServerName(connection.getServiceName());
 
-            getCallback(ServerReadyListener.class).onServerReady(this, new Date());
+            getCallbackManager().publish(new ServerReadyEvent(this, new Date()));
 
             for (RosterEntry contact : connection.getRoster().getEntries()) {
                 getClient(contact.getUser()).setRosterEntry(contact);
@@ -462,13 +463,13 @@ public class XmppParser extends BaseSocketAwareParser {
 
             if (useFakeChannel) {
                 fakeChannel = new XmppFakeChannel(this, "&contacts");
-                getCallback(ChannelSelfJoinListener.class).
-                        onChannelSelfJoin(null, null, fakeChannel);
+                getCallbackManager().publish(new ChannelSelfJoinEvent(null, null, fakeChannel));
                 fakeChannel.updateContacts(contacts.values());
 
                 contacts.values().stream().filter(XmppClientInfo::isAway).forEach(client ->
-                        getCallback(OtherAwayStateListener.class).onAwayStateOther(this, new Date(),
-                                client, AwayState.UNKNOWN, AwayState.AWAY));
+                        getCallbackManager().publish(
+                                new OtherAwayStateEvent(this, new Date(), client, AwayState.UNKNOWN,
+                                        AwayState.AWAY)));
             }
         } catch (XMPPException ex) {
             LOG.debug("Go an XMPP exception", ex);
@@ -486,7 +487,7 @@ public class XmppParser extends BaseSocketAwareParser {
                 error.setException(ex);
             }
 
-            getCallback(ConnectErrorListener.class).onConnectError(this, new Date(), error);
+            getCallbackManager().publish(new ConnectErrorEvent(this, new Date(), error));
         }
     }
 
@@ -500,10 +501,9 @@ public class XmppParser extends BaseSocketAwareParser {
         LOG.debug("Handling away state change for {} to {}", client.getNickname(), isBack);
 
         if (useFakeChannel) {
-            getCallback(OtherAwayStateListener.class)
-                    .onAwayStateOther(null, null, client,
-                            isBack ? AwayState.AWAY : AwayState.HERE,
-                            isBack ? AwayState.HERE : AwayState.AWAY);
+            getCallbackManager().publish(new OtherAwayStateEvent(
+                    this, new Date(), client, isBack ? AwayState.AWAY : AwayState.HERE,
+                    isBack ? AwayState.HERE : AwayState.AWAY));
         }
     }
 
@@ -516,8 +516,8 @@ public class XmppParser extends BaseSocketAwareParser {
         connection.sendPacket(new Presence(Presence.Type.available, reason,
                 priority, Presence.Mode.away));
 
-        getCallback(AwayStateListener.class).onAwayState(this, new Date(),
-                AwayState.HERE, AwayState.AWAY, reason);
+        getCallbackManager().publish(
+                new AwayStateEvent(this, new Date(), AwayState.HERE, AwayState.AWAY, reason));
     }
 
     /**
@@ -527,8 +527,8 @@ public class XmppParser extends BaseSocketAwareParser {
         connection.sendPacket(new Presence(Presence.Type.available, null,
                 priority, Presence.Mode.available));
 
-        getCallback(AwayStateListener.class).onAwayState(this, new Date(),
-                AwayState.AWAY, AwayState.HERE, null);
+        getCallbackManager().publish(
+                new AwayStateEvent(this, new Date(), AwayState.AWAY, AwayState.HERE, null));
     }
 
     @Override
@@ -571,13 +571,13 @@ public class XmppParser extends BaseSocketAwareParser {
 
         @Override
         public void connectionClosed() {
-            getCallback(SocketCloseListener.class).onSocketClosed(XmppParser.this, new Date());
+            getCallbackManager().publish(new SocketCloseEvent(XmppParser.this, new Date()));
         }
 
         @Override
         public void connectionClosedOnError(final Exception excptn) {
             // TODO: Handle exception
-            getCallback(SocketCloseListener.class).onSocketClosed(XmppParser.this, new Date());
+            getCallbackManager().publish(new SocketCloseEvent(XmppParser.this, new Date()));
         }
 
         @Override
@@ -639,22 +639,20 @@ public class XmppParser extends BaseSocketAwareParser {
         @Override
         public void processMessage(final Chat chat, final Message msg) {
             if (msg.getType() == Message.Type.error) {
-                getCallback(NumericListener.class).onNumeric(XmppParser.this, new Date(),
-                        404, new String[]{
-                            ":xmpp", "404", getLocalClient().getNickname(),
-                            msg.getFrom(),
-                            "Cannot send message: " + msg.getError().toString()
-                        });
+                getCallbackManager().publish(new NumericEvent(XmppParser.this, new Date(), 404,
+                        new String[]{":xmpp", "404", getLocalClient().getNickname(), msg.getFrom(),
+                                "Cannot send message: " + msg.getError().toString()}));
                 return;
             }
 
             if (msg.getBody() != null) {
                 if (msg.getBody().startsWith("/me ")) {
-                    getCallback(PrivateActionListener.class).onPrivateAction(XmppParser.this,
-                            new Date(), msg.getBody().substring(4), msg.getFrom());
+                    getCallbackManager().publish(new PrivateActionEvent(XmppParser.this, new Date(),
+                            msg.getBody().substring(4), msg.getFrom()));
                 } else {
-                    getCallback(PrivateMessageListener.class).onPrivateMessage(XmppParser.this,
-                            new Date(), msg.getBody(), msg.getFrom());
+                    getCallbackManager().publish(
+                            new PrivateMessageEvent(XmppParser.this, new Date(), msg.getBody(),
+                                    msg.getFrom()));
                 }
             }
         }
@@ -678,9 +676,9 @@ public class XmppParser extends BaseSocketAwareParser {
                     break;
             }
 
-            getCallback(CompositionStateChangeListener.class)
-                    .onCompositionStateChanged(XmppParser.this, new Date(), state,
-                            chat.getParticipant());
+            getCallbackManager().publish(
+                    new CompositionStateChangeEvent(XmppParser.this, new Date(), state,
+                            chat.getParticipant()));
         }
 
     }
@@ -696,11 +694,11 @@ public class XmppParser extends BaseSocketAwareParser {
         @Override
         public void processPacket(final Packet packet) {
             if (callback.equals(DataOutListener.class)) {
-                getCallback(DataOutListener.class).onDataOut(XmppParser.this, new Date(),
-                        packet.toXML(), true);
+                getCallbackManager().publish(
+                        new DataOutEvent(XmppParser.this, new Date(), packet.toXML()));
             } else {
-                getCallback(DataInListener.class).onDataIn(XmppParser.this, new Date(),
-                        packet.toXML());
+                getCallbackManager().publish(
+                        new DataInEvent(XmppParser.this, new Date(), packet.toXML()));
             }
         }