Convert DCC Plugin to use events.

Change-Id: I136ba57bfa1a421d845351bb6c75b4b35dfb45df
Reviewed-on: http://gerrit.dmdirc.com/3494
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/dcc/ChatContainer.java

@@ -23,9 +23,13 @@
 package com.dmdirc.addons.dcc;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.addons.dcc.actions.DCCActions;
+import com.dmdirc.addons.dcc.events.DccChatMessageEvent;
+import com.dmdirc.addons.dcc.events.DccChatSelfmessageEvent;
+import com.dmdirc.addons.dcc.events.DccChatSocketclosedEvent;
+import com.dmdirc.addons.dcc.events.DccChatSocketopenedEvent;
 import com.dmdirc.addons.dcc.io.DCCChat;
+import com.dmdirc.events.DisplayableEvent;
+import com.dmdirc.events.EventUtils;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
@@ -50,6 +54,8 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
     private final String nickname;
     /** Other Nickname. */
     private final String otherNickname;
+    /** Event bus to post events on. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of DCCChatWindow with a given DCCChat object.
@@ -91,6 +97,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
         dcc.setHandler(this);
         nickname = nick;
         otherNickname = targetNick;
+        this.eventBus = eventBus;
     }
 
     /**
@@ -105,31 +112,27 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
     @Override
     public void sendLine(final String line) {
         if (dccChat.isWriteable()) {
-            final StringBuffer buff = new StringBuffer("DCCChatSelfMessage");
-            ActionManager.getActionManager().triggerEvent(
-                    DCCActions.DCC_CHAT_SELFMESSAGE, buff, this, line);
-            addLine(buff, nickname, line);
+            final DisplayableEvent event = new DccChatSelfmessageEvent(this, line);
+            final String format = EventUtils.postDisplayable(eventBus, event, "DCCChatSelfMessage");
+            addLine(format, nickname, line);
             dccChat.sendLine(line);
         } else {
-            final StringBuffer buff = new StringBuffer("DCCChatError");
-            addLine(buff, "Socket is closed.", line);
+            addLine("DCCChatError", "Socket is closed.", line);
         }
     }
 
     @Override
     public void handleChatMessage(final DCCChat dcc, final String message) {
-        final StringBuffer buff = new StringBuffer("DCCChatMessage");
-        ActionManager.getActionManager().triggerEvent(
-                DCCActions.DCC_CHAT_MESSAGE, buff, this, otherNickname, message);
-        addLine(buff, otherNickname, message);
+        final DisplayableEvent event = new DccChatMessageEvent(this, otherNickname, message);
+        final String format = EventUtils.postDisplayable(eventBus, event, "DCCChatMessage");
+        addLine(format, otherNickname, message);
     }
 
     @Override
     public void socketClosed(final DCCChat dcc) {
-        final StringBuffer buff = new StringBuffer("DCCChatInfo");
-        ActionManager.getActionManager().triggerEvent(
-                DCCActions.DCC_CHAT_SOCKETCLOSED, buff, this);
-        addLine(buff, "Socket closed");
+        final DisplayableEvent event = new DccChatSocketclosedEvent(this);
+        final String format = EventUtils.postDisplayable(eventBus, event, "DCCChatInfo");
+        addLine(format, "Socket closed");
         if (!isWindowClosing()) {
             setIcon("dcc-chat-inactive");
         }
@@ -137,10 +140,9 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
 
     @Override
     public void socketOpened(final DCCChat dcc) {
-        final StringBuffer buff = new StringBuffer("DCCChatInfo");
-        ActionManager.getActionManager().triggerEvent(
-                DCCActions.DCC_CHAT_SOCKETOPENED, buff, this);
-        addLine(buff, "Socket opened");
+        final DisplayableEvent event = new DccChatSocketopenedEvent(this);
+        final String format = EventUtils.postDisplayable(eventBus, event, "DCCChatInfo");
+        addLine(format, "Socket opened");
         setIcon("dcc-chat-active");
     }
 

src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.dcc;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.addons.dcc.actions.DCCActions;
+import com.dmdirc.addons.dcc.events.DccChatRequestSentEvent;
+import com.dmdirc.addons.dcc.events.DccSendRequestEvent;
 import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
@@ -190,12 +190,9 @@ public class DCCCommand extends Command implements IntelligentCommand {
             windowManager.addWindow(myPlugin.getContainer(), window);
             parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(
                     myPlugin.getListenIP(parser)) + " " + chat.getPort());
-            ActionManager.getActionManager().triggerEvent(
-                    DCCActions.DCC_CHAT_REQUEST_SENT, null, connection, target);
-            sendLine(origin, isSilent, "DCCChatStarting", target,
-                    chat.getHost(), chat.getPort());
-            window.addLine("DCCChatStarting", target, chat.getHost(),
-                    chat.getPort());
+            eventBus.post(new DccChatRequestSentEvent(connection, target));
+            sendLine(origin, isSilent, "DCCChatStarting", target, chat.getHost(), chat.getPort());
+            window.addLine("DCCChatStarting", target, chat.getHost(), chat.getPort());
         } else {
             sendLine(origin, isSilent, "DCCChatError",
                     "Unable to start chat with " + target
@@ -249,9 +246,8 @@ public class DCCCommand extends Command implements IntelligentCommand {
                         myPlugin.getDomain(), "send.forceturbo"));
                 send.setType(DCCTransfer.TransferType.SEND);
 
-                ActionManager.getActionManager().triggerEvent(
-                        DCCActions.DCC_SEND_REQUEST_SENT,
-                        null, connection, target, selectedFile);
+                eventBus.post(new DccSendRequestEvent(connection, target, selectedFile.
+                        getAbsolutePath()));
 
                 sendLine(origin, isSilent, FORMAT_OUTPUT,
                         "Starting DCC Send with: " + target);

src/com/dmdirc/addons/dcc/DCCManager.java

@@ -26,7 +26,8 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.addons.dcc.actions.DCCActions;
+import com.dmdirc.addons.dcc.events.DccChatRequestEvent;
+import com.dmdirc.addons.dcc.events.DccSendRequestEvent;
 import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
@@ -454,9 +455,7 @@ public class DCCManager implements ActionListener {
                     chat.getPort());
             chat.connect();
         } else {
-            ActionManager.getActionManager().triggerEvent(
-                    DCCActions.DCC_CHAT_REQUEST, null, arguments[0],
-                    nickname);
+            eventBus.post(new DccChatRequestEvent((Connection) arguments[0], nickname));
             askQuestion("User " + nickname + " on "
                     + ((Connection) arguments[0]).getAddress()
                     + " would like to start a DCC Chat with you.\n\n"
@@ -547,9 +546,8 @@ public class DCCManager implements ActionListener {
             if (!token.isEmpty() && !port.equals("0")) {
                 // This is a reverse DCC Send that we no longer care about.
             } else {
-                ActionManager.getActionManager().triggerEvent(
-                        DCCActions.DCC_SEND_REQUEST, null,
-                        arguments[0], nickname, filename);
+                eventBus.post(
+                        new DccSendRequestEvent((Connection) arguments[0], nickname, filename));
                 askQuestion("User " + nickname + " on "
                         + ((Connection) arguments[0]).getAddress()
                         + " would like to send you a file over DCC.\n\nFile: "
@@ -720,9 +718,7 @@ public class DCCManager implements ActionListener {
             }
         }
 
-        ActionManager.getActionManager().registerTypes(DCCActions.values());
-        ActionManager.getActionManager().registerListener(this,
-                CoreActionType.SERVER_CTCP);
+        ActionManager.getActionManager().registerListener(this, CoreActionType.SERVER_CTCP);
     }
 
     /**

src/com/dmdirc/addons/dcc/TransferContainer.java

@@ -24,8 +24,9 @@ package com.dmdirc.addons.dcc;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.addons.dcc.actions.DCCActions;
+import com.dmdirc.addons.dcc.events.DccSendDatatransferedEvent;
+import com.dmdirc.addons.dcc.events.DccSendSocketclosedEvent;
+import com.dmdirc.addons.dcc.events.DccSendSocketopenedEvent;
 import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
 import com.dmdirc.interfaces.Connection;
@@ -72,6 +73,8 @@ public class TransferContainer extends FrameContainer implements
     /** Show open button. */
     private final boolean showOpen = Desktop.isDesktopSupported()
             && Desktop.getDesktop().isSupported(Desktop.Action.OPEN);
+    /** Event bus to post events on. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of DCCTransferWindow with a given DCCTransfer object.
@@ -107,6 +110,7 @@ public class TransferContainer extends FrameContainer implements
         dcc.addHandler(this);
 
         otherNickname = targetNick;
+        this.eventBus = eventBus;
     }
 
     @Override
@@ -168,8 +172,7 @@ public class TransferContainer extends FrameContainer implements
             setTitle(title.toString());
         }
 
-        ActionManager.getActionManager().triggerEvent(
-                DCCActions.DCC_SEND_DATATRANSFERED, null, this, bytes);
+        eventBus.post(new DccSendDatatransferedEvent(this, bytes));
     }
 
     /**
@@ -262,8 +265,7 @@ public class TransferContainer extends FrameContainer implements
      */
     @Override
     public void socketClosed(final DCCTransfer dcc) {
-        ActionManager.getActionManager().triggerEvent(
-                DCCActions.DCC_SEND_SOCKETCLOSED, null, this);
+        eventBus.post(new DccSendSocketclosedEvent(this));
         if (!windowClosing) {
             synchronized (this) {
                 if (transferCount == dcc.getFileSize() - dcc.getFileStart()) {
@@ -284,8 +286,7 @@ public class TransferContainer extends FrameContainer implements
      */
     @Override
     public void socketOpened(final DCCTransfer dcc) {
-        ActionManager.getActionManager().triggerEvent(
-                DCCActions.DCC_SEND_SOCKETOPENED, null, this);
+        eventBus.post(new DccSendSocketopenedEvent(this));
         timeStarted = System.currentTimeMillis();
         setIcon(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-active" : "dcc-receive-active");

src/com/dmdirc/addons/dcc/actions/DCCActions.java

@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.dcc.actions;
-
-import com.dmdirc.interfaces.actions.ActionMetaType;
-import com.dmdirc.interfaces.actions.ActionType;
-
-/**
- * DCC actions.
- */
-public enum DCCActions implements ActionType {
-
-    /** DCC Chat Request. */
-    DCC_CHAT_REQUEST(DCCEvents.DCC_CHAT_REQUEST,
-            "DCC chat requested"),
-    /** DCC Chat Request Sent. */
-    DCC_CHAT_REQUEST_SENT(DCCEvents.DCC_CHAT_REQUEST_SENT,
-            "DCC chat request sent"),
-    /** DCC Message from another person. */
-    DCC_CHAT_MESSAGE(DCCEvents.DCC_CHAT_MESSAGE,
-            "DCC chat message recieved"),
-    /** DCC Message to another person. */
-    DCC_CHAT_SELFMESSAGE(DCCEvents.DCC_CHAT_SELFMESSAGE,
-            "DCC chat message sent"),
-    /** DCC Chat Socket Closed. */
-    DCC_CHAT_SOCKETCLOSED(DCCEvents.DCC_CHAT_SOCKETCLOSED,
-            "DCC chat socket closed"),
-    /** DCC Chat Socket Opened. */
-    DCC_CHAT_SOCKETOPENED(DCCEvents.DCC_CHAT_SOCKETOPENED,
-            "DCC chat socket opened"),
-    /** DCC Send Socket Closed. */
-    DCC_SEND_SOCKETCLOSED(DCCEvents.DCC_SEND_SOCKETCLOSED,
-            "DCC send socket closed"),
-    /** DCC Send Socket Opened. */
-    DCC_SEND_SOCKETOPENED(DCCEvents.DCC_SEND_SOCKETOPENED,
-            "DCC send socket opened"),
-    /** DCC Send Data Transfered. */
-    DCC_SEND_DATATRANSFERED(DCCEvents.DCC_SEND_DATATRANSFERED,
-            "DCC send data transferred"),
-    /** DCC Send Request. */
-    DCC_SEND_REQUEST(DCCEvents.DCC_SEND_REQUEST,
-            "DCC send requested"),
-    /** DCC Send Request Sent. */
-    DCC_SEND_REQUEST_SENT(DCCEvents.DCC_SEND_REQUEST_SENT,
-            "DCC send request sent");
-    /** The type of this action. */
-    private final ActionMetaType type;
-    /** The name of this action. */
-    private final String name;
-
-    /**
-     * Constructs a new core action.
-     *
-     * @param type The type of this action
-     * @param name The name of this action
-     */
-    DCCActions(final ActionMetaType type, final String name) {
-        this.type = type;
-        this.name = name;
-    }
-
-    @Override
-    public ActionMetaType getType() {
-        return type;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-}

src/com/dmdirc/addons/dcc/actions/DCCEvents.java

@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.dcc.actions;
-
-import com.dmdirc.addons.dcc.ChatContainer;
-import com.dmdirc.addons.dcc.TransferContainer;
-import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.actions.ActionMetaType;
-
-import java.io.File;
-
-/**
- * Defines DCC-related events.
- */
-public enum DCCEvents implements ActionMetaType {
-
-    /** DCC Chat Request. */
-    DCC_CHAT_REQUEST(new String[]{"connection", "client"}, Connection.class, String.class),
-    /** DCC Chat Request Sent. */
-    DCC_CHAT_REQUEST_SENT(new String[]{"connection", "client"}, Connection.class, String.class),
-    /** DCC Message from another person. */
-    DCC_CHAT_MESSAGE(new String[]{"DCCChatWindow", "Nickname", "Message"}, ChatContainer.class,
-            String.class, String.class),
-    /** DCC Message to another person. */
-    DCC_CHAT_SELFMESSAGE(new String[]{"DCCChatWindow", "Message"}, ChatContainer.class, String.class),
-    /** DCC Chat Socket Closed. */
-    DCC_CHAT_SOCKETCLOSED(new String[]{"DCCChatWindow"}, ChatContainer.class),
-    /** DCC Chat Socket Opened. */
-    DCC_CHAT_SOCKETOPENED(new String[]{"DCCChatWindow"}, ChatContainer.class),
-    /** DCC Send Socket Closed. */
-    DCC_SEND_SOCKETCLOSED(new String[]{"DCCSendWindow"}, TransferContainer.class),
-    /** DCC Send Socket Opened. */
-    DCC_SEND_SOCKETOPENED(new String[]{"DCCSendWindow"}, TransferContainer.class),
-    /** DCC Send Data Transfered */
-    DCC_SEND_DATATRANSFERED(new String[]{"DCCSendWindow", "Bytes Transfered"},
-            TransferContainer.class, int.class),
-    /** DCC Send Request. */
-    DCC_SEND_REQUEST(new String[]{"connection", "client", "file"}, Connection.class, String.class,
-            String.class),
-    /** DCC Send Request Sent. */
-    DCC_SEND_REQUEST_SENT(new String[]{"connection", "client", "file"}, Connection.class,
-            String.class, File.class);
-    /** The names of the arguments for this meta type. */
-    private String[] argNames;
-    /** The classes of the arguments for this meta type. */
-    private Class[] argTypes;
-
-    /**
-     * Creates a new instance of this meta-type.
-     *
-     * @param argNames The names of the meta-type's arguments
-     * @param argTypes The types of the meta-type's arguments
-     */
-    DCCEvents(final String[] argNames, final Class... argTypes) {
-        this.argNames = argNames;
-        this.argTypes = argTypes;
-    }
-
-    @Override
-    public int getArity() {
-        return argNames.length;
-    }
-
-    @Override
-    public Class[] getArgTypes() {
-        return argTypes;
-    }
-
-    @Override
-    public String[] getArgNames() {
-        return argNames;
-    }
-
-    @Override
-    public String getGroup() {
-        return "DCC Events";
-    }
-
-}

src/com/dmdirc/addons/dcc/events/DccChatMessageEvent.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.events;
+
+import com.dmdirc.addons.dcc.ChatContainer;
+
+/**
+ * Fired when a DCC chat message is received.
+ */
+public class DccChatMessageEvent extends DccDisplayableEvent {
+
+    private final ChatContainer chatWindow;
+    private final String nickname;
+    private final String message;
+
+    public DccChatMessageEvent(final ChatContainer chatWindow, final String nickname,
+            final String message) {
+        this.chatWindow = chatWindow;
+        this.nickname = nickname;
+        this.message = message;
+    }
+
+    public ChatContainer getChatWindow() {
+        return chatWindow;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+}

src/com/dmdirc/addons/dcc/events/DccChatRequestEvent.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.events;
+
+import com.dmdirc.interfaces.Connection;
+
+/**
+ * Fired on a DCC chat request.
+ */
+public class DccChatRequestEvent extends DccEvent {
+
+    private final Connection connection;
+    private final String client;
+
+    public DccChatRequestEvent(final Connection connection, final String client) {
+        this.connection = connection;
+        this.client = client;
+    }
+
+    public Connection getConnection() {
+        return connection;
+    }
+
+    public String getClient() {
+        return client;
+    }
+
+}

src/com/dmdirc/addons/dcc/events/DccChatRequestSentEvent.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.events;
+
+import com.dmdirc.interfaces.Connection;
+
+/**
+ * Fired when a DCC chat request is sent.
+ */
+public class DccChatRequestSentEvent extends DccEvent {
+
+    private final Connection connection;
+    private final String client;
+
+    public DccChatRequestSentEvent(final Connection connection, final String client) {
+        this.connection = connection;
+        this.client = client;
+    }
+
+    public Connection getConnection() {
+        return connection;
+    }
+
+    public String getClient() {
+        return client;
+    }
+
+}

src/com/dmdirc/addons/dcc/events/DccChatSelfmessageEvent.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.events;
+
+import com.dmdirc.addons.dcc.ChatContainer;
+
+/**
+ * Fired on a DCC chat self message.
+ */
+public class DccChatSelfmessageEvent extends DccDisplayableEvent {
+
+    private final ChatContainer chatWindow;
+    private final String message;
+
+    public DccChatSelfmessageEvent(final ChatContainer chatWindow, final String message) {
+        this.chatWindow = chatWindow;
+        this.message = message;
+    }
+
+    public ChatContainer getChatWindow() {
+        return chatWindow;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+}

src/com/dmdirc/addons/dcc/events/DccChatSocketclosedEvent.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.events;
+
+import com.dmdirc.addons.dcc.ChatContainer;
+
+/**
+ * Fired when a chat socket is closed.
+ */
+public class DccChatSocketclosedEvent extends DccDisplayableEvent {
+
+    private final ChatContainer chatWindow;
+
+    public DccChatSocketclosedEvent(final ChatContainer chatWindow) {
+        this.chatWindow = chatWindow;
+    }
+
+    public ChatContainer getChatWindow() {
+        return chatWindow;
+    }
+
+}

src/com/dmdirc/addons/dcc/events/DccChatSocketopenedEvent.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.events;
+
+import com.dmdirc.addons.dcc.ChatContainer;
+
+/**
+ * Fired when a chat socket is opened.
+ */
+public class DccChatSocketopenedEvent extends DccDisplayableEvent {
+
+    private final ChatContainer chatWindow;
+
+    public DccChatSocketopenedEvent(final ChatContainer chatWindow) {
+        this.chatWindow = chatWindow;
+    }
+
+    public ChatContainer getChatWindow() {
+        return chatWindow;
+    }
+
+}

src/com/dmdirc/addons/dcc/events/DccDisplayableEvent.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.events;
+
+import com.dmdirc.events.DisplayableEvent;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Base class for displayable DCC events.
+ */
+public abstract class DccDisplayableEvent extends DccEvent implements DisplayableEvent {
+
+    /** The display format to use for this event. */
+    private final AtomicReference<String> displayFormatRef = new AtomicReference<>("");
+
+    @Override
+    public String getDisplayFormat() {
+        return displayFormatRef.get();
+    }
+
+    @Override
+    public void setDisplayFormat(final String format) {
+        this.displayFormatRef.set(format);
+    }
+}

src/com/dmdirc/addons/dcc/events/DccEvent.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.events;
+
+import com.dmdirc.events.DMDircEvent;
+
+/**
+ * Base class for DCC events.
+ */
+public abstract class DccEvent extends DMDircEvent {
+
+}

src/com/dmdirc/addons/dcc/events/DccSendDatatransferedEvent.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.events;
+
+import com.dmdirc.addons.dcc.TransferContainer;
+
+/**
+ * Fired when data is transferred on a DCC transfer.
+ */
+public class DccSendDatatransferedEvent extends DccEvent {
+
+    private final TransferContainer transferWindow;
+    private final int bytesTransferred;
+
+    public DccSendDatatransferedEvent(final TransferContainer transferWindow,
+            final int bytesTransferred) {
+        this.transferWindow = transferWindow;
+        this.bytesTransferred = bytesTransferred;
+    }
+
+    public TransferContainer getTransferWindow() {
+        return transferWindow;
+    }
+
+    public int getBytesTransferred() {
+        return bytesTransferred;
+    }
+
+}

src/com/dmdirc/addons/dcc/events/DccSendRequestEvent.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.events;
+
+import com.dmdirc.interfaces.Connection;
+
+
+/**
+ * Fired when a DCC send request is made.
+ */
+public class DccSendRequestEvent extends DccEvent {
+
+    private final Connection connection;
+    private final String client;
+    private final String file;
+
+    public DccSendRequestEvent(final Connection connection, final String client, final String file) {
+        this.connection = connection;
+        this.client = client;
+        this.file = file;
+    }
+
+    public Connection getConnection() {
+        return connection;
+    }
+
+    public String getClient() {
+        return client;
+    }
+
+    public String getFile() {
+        return file;
+    }
+
+}

src/com/dmdirc/addons/dcc/events/DccSendRequestSentEvent.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.events;
+
+import com.dmdirc.interfaces.Connection;
+
+import java.io.File;
+
+/**
+ * Fired when a DCC Send request is sent.
+ */
+public class DccSendRequestSentEvent extends DccEvent {
+
+    private final Connection connection;
+    private final String client;
+    private final File file;
+
+    public DccSendRequestSentEvent(final Connection connection, final String client, final File file) {
+        this.connection = connection;
+        this.client = client;
+        this.file = file;
+    }
+
+    public Connection getConnection() {
+        return connection;
+    }
+
+    public String getClient() {
+        return client;
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+}

src/com/dmdirc/addons/dcc/events/DccSendSocketclosedEvent.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.events;
+
+import com.dmdirc.addons.dcc.TransferContainer;
+
+/**
+ * Fires a when a DCC send socket is closed.
+ */
+public class DccSendSocketclosedEvent extends DccEvent {
+
+    private final TransferContainer transferWindow;
+
+    public DccSendSocketclosedEvent(final TransferContainer transferWindow) {
+        this.transferWindow = transferWindow;
+    }
+
+    public TransferContainer getTransferWindow() {
+        return transferWindow;
+    }
+
+}

src/com/dmdirc/addons/dcc/events/DccSendSocketopenedEvent.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.events;
+
+import com.dmdirc.addons.dcc.TransferContainer;
+
+/**
+ * Fired when a DCC send socket is opened.
+ */
+public class DccSendSocketopenedEvent extends DccEvent {
+
+    private final TransferContainer transferWindow;
+
+    public DccSendSocketopenedEvent(final TransferContainer transferWindow) {
+        this.transferWindow = transferWindow;
+    }
+
+    public TransferContainer getTransferWindow() {
+        return transferWindow;
+    }
+
+}