Events not listeners.

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

src/com/dmdirc/addons/contactlist/ContactListListener.java

@@ -24,11 +24,10 @@ package com.dmdirc.addons.contactlist;
 
 import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
-import com.dmdirc.interfaces.FrameCloseListener;
+import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.interfaces.NicklistListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
@@ -41,7 +40,7 @@ import net.engio.mbassy.listener.Handler;
 /**
  * Listens for contact list related events.
  */
-public class ContactListListener implements NicklistListener, FrameCloseListener {
+public class ContactListListener implements NicklistListener {
 
     /** The channel this listener is for. */
     private final Channel channel;
@@ -64,7 +63,6 @@ public class ContactListListener implements NicklistListener, FrameCloseListener
      */
     public void addListeners() {
         channel.addNicklistListener(this);
-        channel.addCloseListener(this);
         eventBus.subscribe(this);
     }
 
@@ -73,7 +71,6 @@ public class ContactListListener implements NicklistListener, FrameCloseListener
      */
     public void removeListeners() {
         channel.removeNicklistListener(this);
-        channel.removeCloseListener(this);
         eventBus.unsubscribe(this);
     }
 
@@ -112,8 +109,8 @@ public class ContactListListener implements NicklistListener, FrameCloseListener
         clientAdded(event.getUser());
     }
 
-    @Override
-    public void windowClosing(final FrameContainer window) {
+    @Handler
+    public void windowClosing(final FrameClosingEvent event) {
         removeListeners();
     }
 

src/com/dmdirc/addons/debug/commands/EventBusViewer.java

@@ -32,7 +32,7 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.ClientLineAddedEvent;
 import com.dmdirc.events.DMDircEvent;
-import com.dmdirc.interfaces.FrameCloseListener;
+import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.Styliser;
@@ -44,6 +44,8 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 
 import net.engio.mbassy.listener.Handler;
+import net.engio.mbassy.listener.Listener;
+import net.engio.mbassy.listener.References;
 
 /**
  * Displays events passed on an event bus.
@@ -108,13 +110,13 @@ public class EventBusViewer extends DebugCommand {
         final DMDircMBassador eventBus = isGlobal ? globalEventBus : origin.getEventBus();
         final WindowUpdater updater = new WindowUpdater(eventBus, window);
         eventBus.subscribe(updater);
-        window.addCloseListener(updater);
     }
 
     /**
      * Updates a custom window with details of each event received on an event bus.
      */
-    private static class WindowUpdater implements FrameCloseListener {
+    @Listener(references = References.Strong)
+    private static class WindowUpdater {
 
         private final DMDircMBassador eventBus;
         private final FrameContainer target;
@@ -124,6 +126,11 @@ public class EventBusViewer extends DebugCommand {
             this.target = target;
         }
 
+        @Handler
+        public void handleFrameClosing(final FrameClosingEvent event) {
+            eventBus.unsubscribe(this);
+        }
+
         @Handler
         public void handleEvent(final DMDircEvent event) {
             if (event instanceof ClientLineAddedEvent
@@ -156,10 +163,5 @@ public class EventBusViewer extends DebugCommand {
             target.addLine(FORMAT_OUTPUT, output.toString());
         }
 
-        @Override
-        public void windowClosing(final FrameContainer window) {
-            eventBus.unsubscribe(this);
-        }
-
     }
 }