Migrate DCC plugin to use events.

dcc/plugin.config

@@ -8,7 +8,6 @@ keysections:
   requires
   updates
   defaults
-  formatters
   icons
   version
 
@@ -52,14 +51,6 @@ defaults:
   firewall.ports.startPort=11000
   firewall.ports.endPort=11019
 
-formatters:
-  DCCChatStarting=Starting DCC Chat with: %1$s on %2$s:%3$s
-  DCCChatInfo=%1$s
-  DCCChatError=Error: %1$s
-  DCCSendError=Error: %1$s
-  DCCChatSelfMessage=<%1$s> %2$s
-  DCCChatMessage=<%1$s> %2$s
-
 icons:
   category-dcc=plugin://dcc:com/dmdirc/addons/dcc/res/transfers.png
   dcc=plugin://dcc:com/dmdirc/addons/dcc/res/transfers.png

dcc/res/META-INF/format.yml

@@ -0,0 +1,11 @@
+---
+DccChatStartingEvent:
+  format: "Starting DCC Chat with: {{target}} on {{host}}:{{port}}..."
+DccChatSocketClosedEvent:
+  format: "Socket closed."
+DccChatSocketOpenedEvent:
+  format: "Socket opened."
+DccChatMessageEvent:
+  format: "<{{nickname}}> {{message}}"
+DccChatSelfMessageEvent:
+  format: "<{{nickname}}> {{message}}"

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

@@ -24,17 +24,17 @@ package com.dmdirc.addons.dcc;
 
 import com.dmdirc.DMDircMBassador;
 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.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.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.util.EventUtils;
 
 import java.util.Arrays;
 
@@ -105,27 +105,21 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
     @Override
     public void sendLine(final String line) {
         if (dccChat.isWriteable()) {
-            final DccChatSelfmessageEvent event = new DccChatSelfmessageEvent(this, line);
-            final String format = EventUtils.postDisplayable(eventBus, event, "DCCChatSelfMessage");
-            addLine(format, nickname, line);
+            eventBus.publishAsync(new DccChatSelfMessageEvent(this, nickname, line));
             dccChat.sendLine(line);
         } else {
-            addLine("DCCChatError", "Socket is closed.", line);
+            eventBus.publishAsync(new CommandErrorEvent(this, "Socket is closed."));
         }
     }
 
     @Override
     public void handleChatMessage(final DCCChat dcc, final String message) {
-        final DccChatMessageEvent event = new DccChatMessageEvent(this, otherNickname, message);
-        final String format = EventUtils.postDisplayable(eventBus, event, "DCCChatMessage");
-        addLine(format, otherNickname, message);
+        eventBus.publishAsync(new DccChatMessageEvent(this, otherNickname, message));
     }
 
     @Override
     public void socketClosed(final DCCChat dcc) {
-        final DccChatSocketclosedEvent event = new DccChatSocketclosedEvent(this);
-        final String format = EventUtils.postDisplayable(eventBus, event, "DCCChatInfo");
-        addLine(format, "Socket closed");
+        eventBus.publishAsync(new DccChatSocketClosedEvent(this));
         if (!isWindowClosing()) {
             setIcon("dcc-chat-inactive");
         }
@@ -133,9 +127,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
 
     @Override
     public void socketOpened(final DCCChat dcc) {
-        final DccChatSocketopenedEvent event = new DccChatSocketopenedEvent(this);
-        final String format = EventUtils.postDisplayable(eventBus, event, "DCCChatInfo");
-        addLine(format, "Socket opened");
+        eventBus.publishAsync(new DccChatSocketOpenedEvent(this));
         setIcon("dcc-chat-active");
     }
 

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.dcc;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.dcc.events.DccChatRequestSentEvent;
+import com.dmdirc.addons.dcc.events.DccChatStartingEvent;
 import com.dmdirc.addons.dcc.events.DccSendRequestEvent;
 import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCChat;
@@ -170,12 +171,15 @@ public class DCCCommand extends Command implements IntelligentCommand {
             parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(
                     myPlugin.getListenIP(parser)) + ' ' + chat.getPort());
             eventBus.publish(new DccChatRequestSentEvent(connection, target));
-            sendLine(origin, isSilent, "DCCChatStarting", target, chat.getHost(), chat.getPort());
-            window.addLine("DCCChatStarting", target, chat.getHost(), chat.getPort());
+
+            // Send the starting event to both the source window, and the new DCC window.
+            window.getEventBus().publishAsync(new DccChatStartingEvent(
+                    window, target, chat.getHost(), chat.getPort()));
+            origin.getEventBus().publishAsync(new DccChatStartingEvent(
+                    origin, target, chat.getHost(), chat.getPort()));
         } else {
-            sendLine(origin, isSilent, "DCCChatError",
-                    "Unable to start chat with " + target
-                    + " - unable to create listen socket");
+            showError(origin, isSilent,
+                    "Unable to start chat with " + target + " - unable to create listen socket");
         }
     }
 
@@ -253,8 +257,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                             + " " + send.getPort() + " " + send.getFileSize()
                             + (send.isTurbo() ? " T" : ""));
                 } else {
-                    sendLine(origin, isSilent, "DCCSendError",
-                            "Unable to start dcc send with " + target
+                    showError(origin, isSilent, "Unable to start dcc send with " + target
                             + " - unable to create listen socket");
                 }
             }

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.dcc;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.dcc.events.DccChatRequestEvent;
+import com.dmdirc.addons.dcc.events.DccChatStartingEvent;
 import com.dmdirc.addons.dcc.events.DccSendRequestEvent;
 import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCChat;
@@ -461,7 +462,7 @@ public class DCCManager {
         final DCCChat chat = new DCCChat();
         chat.setAddress(ipAddress, port);
         final String myNickname = parser.getLocalClient().getNickname();
-        final DCCFrameContainer f = new ChatContainer(
+        final DCCFrameContainer container = new ChatContainer(
                 getContainer(),
                 chat,
                 config,
@@ -472,8 +473,9 @@ public class DCCManager {
                 nickname,
                 tabCompleterFactory,
                 eventBus);
-        windowManager.addWindow(getContainer(), f);
-        f.addLine("DCCChatStarting", nickname, chat.getHost(), chat.getPort());
+        windowManager.addWindow(getContainer(), container);
+        container.getEventBus().publishAsync(new DccChatStartingEvent(
+                container, nickname, chat.getHost(), chat.getPort()));
         chat.connect();
     }
 

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

@@ -28,13 +28,16 @@ import com.dmdirc.interfaces.WindowModel;
 /**
  * Fired on a DCC chat self message.
  */
-public class DccChatSelfmessageEvent extends DccDisplayableEvent {
+public class DccChatSelfMessageEvent extends DccDisplayableEvent {
 
     private final ChatContainer chatWindow;
+    private final String nickname;
     private final String message;
 
-    public DccChatSelfmessageEvent(final ChatContainer chatWindow, final String message) {
+    public DccChatSelfMessageEvent(final ChatContainer chatWindow, final String nickname,
+            final String message) {
         this.chatWindow = chatWindow;
+        this.nickname = nickname;
         this.message = message;
     }
 
@@ -42,6 +45,10 @@ public class DccChatSelfmessageEvent extends DccDisplayableEvent {
         return chatWindow;
     }
 
+    public String getNickname() {
+        return nickname;
+    }
+
     public String getMessage() {
         return message;
     }

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

@@ -28,11 +28,11 @@ import com.dmdirc.interfaces.WindowModel;
 /**
  * Fired when a chat socket is closed.
  */
-public class DccChatSocketclosedEvent extends DccDisplayableEvent {
+public class DccChatSocketClosedEvent extends DccDisplayableEvent {
 
     private final ChatContainer chatWindow;
 
-    public DccChatSocketclosedEvent(final ChatContainer chatWindow) {
+    public DccChatSocketClosedEvent(final ChatContainer chatWindow) {
         this.chatWindow = chatWindow;
     }
 

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

@@ -28,11 +28,11 @@ import com.dmdirc.interfaces.WindowModel;
 /**
  * Fired when a chat socket is opened.
  */
-public class DccChatSocketopenedEvent extends DccDisplayableEvent {
+public class DccChatSocketOpenedEvent extends DccDisplayableEvent {
 
     private final ChatContainer chatWindow;
 
-    public DccChatSocketopenedEvent(final ChatContainer chatWindow) {
+    public DccChatSocketOpenedEvent(final ChatContainer chatWindow) {
         this.chatWindow = chatWindow;
     }
 

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

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2006-2015 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.WindowModel;
+
+/**
+ * Event raised when a DCC chat is starting.
+ */
+public class DccChatStartingEvent extends DccDisplayableEvent {
+
+    private final WindowModel source;
+    private final String target;
+    private final String host;
+    private final int port;
+
+    public DccChatStartingEvent(final WindowModel source, final String target, final String host,
+            final int port) {
+        this.source = source;
+        this.target = target;
+        this.host = host;
+        this.port = port;
+    }
+
+    @Override
+    public WindowModel getSource() {
+        return source;
+    }
+
+    public String getTarget() {
+        return target;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+}