Fix DCC Plugin after parser changes.

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

@@ -32,24 +32,25 @@ import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.parser.events.SocketCloseEvent;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
 import com.dmdirc.ui.messages.BackBufferFactory;
 
 import java.awt.Desktop;
 import java.io.File;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.Optional;
 
 import javax.annotation.Nullable;
 import javax.swing.JOptionPane;
 
+import net.engio.mbassy.listener.Handler;
+
 /**
  * This class links DCC Send objects to a window.
  */
 public class TransferContainer extends FrameContainer implements
-        DCCTransferHandler, SocketCloseListener {
+        DCCTransferHandler {
 
     /** The dcc plugin that owns this frame */
     protected final DCCManager plugin;
@@ -99,7 +100,7 @@ public class TransferContainer extends FrameContainer implements
         myPlugin = plugin;
 
         if (parser != null) {
-            parser.getCallbackManager().addCallback(SocketCloseListener.class, this);
+            parser.getCallbackManager().subscribe(this);
         }
         dcc.addHandler(this);
 
@@ -108,10 +109,10 @@ public class TransferContainer extends FrameContainer implements
         initBackBuffer();
     }
 
-    @Override
-    public void onSocketClosed(final Parser parser, final Date date) {
+    @Handler
+    public void onSocketClosed(final SocketCloseEvent event) {
         // Remove our reference to the parser (and its reference to us)
-        this.parser.getCallbackManager().delAllCallback(this);
+        parser.getCallbackManager().unsubscribe(this);
         this.parser = null;
     }
 
@@ -346,13 +347,6 @@ public class TransferContainer extends FrameContainer implements
         dcc.removeFromTransfers();
     }
 
-    public void addSocketCloseCallback(final SocketCloseListener listener) {
-        if (connection != null) {
-            connection.getParser().map(Parser::getCallbackManager).ifPresent(
-                    cbm -> cbm.addCallback(SocketCloseListener.class, listener));
-        }
-    }
-
     @Override
     public Optional<Connection> getConnection() {
         return Optional.empty();

dcc/src/com/dmdirc/addons/dcc/ui/TransferPanel.java

@@ -29,10 +29,11 @@ import com.dmdirc.addons.dcc.io.DCCTransfer;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.SwingFrameComponent;
 import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.parser.events.SocketCloseEvent;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
 import com.dmdirc.util.DateUtils;
 
 import java.awt.Desktop;
@@ -40,7 +41,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
-import java.util.Date;
 
 import javax.swing.JButton;
 import javax.swing.JLabel;
@@ -49,13 +49,15 @@ import javax.swing.JProgressBar;
 
 import net.miginfocom.swing.MigLayout;
 
+import net.engio.mbassy.listener.Handler;
+
 /**
  * A panel for displaying the progress of DCC transfers.
  *
  * @since 0.6.6
  */
 public class TransferPanel extends JPanel implements ActionListener,
-        SocketCloseListener, DCCTransferHandler, SwingFrameComponent {
+        DCCTransferHandler, SwingFrameComponent {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1L;
@@ -92,7 +94,10 @@ public class TransferPanel extends JPanel implements ActionListener,
         dcc = transferContainer.getDCC();
 
         dcc.addHandler(this);
-        transferContainer.addSocketCloseCallback(this);
+        transferContainer.getConnection()
+                .flatMap(Connection::getParser)
+                .map(Parser::getCallbackManager)
+                .ifPresent(cm -> cm.subscribe(this));
 
         setLayout(new MigLayout("hidemode 0"));
 
@@ -164,8 +169,8 @@ public class TransferPanel extends JPanel implements ActionListener,
         }
     }
 
-    @Override
-    public void onSocketClosed(final Parser parser, final Date date) {
+    @Handler
+    public void onSocketClosed(final SocketCloseEvent event) {
         if ("Resend".equals(button.getText())) {
             button.setText("Close Window");
         }