Switch to Notification*Events.

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

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

@@ -38,7 +38,8 @@ import com.dmdirc.addons.ui_swing.framemanager.FramemanagerPosition;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameNameChangedEvent;
-import com.dmdirc.interfaces.NotificationListener;
+import com.dmdirc.events.NotificationClearedEvent;
+import com.dmdirc.events.NotificationSetEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.Window;
@@ -80,9 +81,8 @@ import net.engio.mbassy.listener.Invoke;
 /**
  * The button bar manager is a grid of buttons that presents a manager similar to that used by mIRC.
  */
-public final class ButtonBar implements FrameManager, ActionListener,
-        ComponentListener, Serializable, NotificationListener,
-        MouseListener, ConfigChangeListener {
+public final class ButtonBar implements FrameManager, ActionListener, ComponentListener,
+        Serializable, MouseListener, ConfigChangeListener {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 3;
@@ -341,13 +341,11 @@ public final class ButtonBar implements FrameManager, ActionListener,
         final TextFrame window = event.getChildWindow();
         addButton(window);
         relayout();
-        window.getContainer().addNotificationListener(ButtonBar.this);
     }
 
     @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
     public void windowDeleted(final SwingWindowDeletedEvent event) {
         final TextFrame window = event.getChildWindow();
-        window.getContainer().removeNotificationListener(ButtonBar.this);
         if (buttons.containsKey(window)) {
             buttonPanel.setVisible(false);
             buttonPanel.remove(buttons.get(window));
@@ -388,31 +386,19 @@ public final class ButtonBar implements FrameManager, ActionListener,
         // Do nothing
     }
 
-    @Override
-    public void notificationSet(final FrameContainer window,
-            final Colour colour) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                final FrameToggleButton button = getButton(window);
-                if (button != null) {
-                    button.setForeground(UIUtilities.convertColour(colour));
-                }
-            }
-        });
+    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    public void notificationSet(final NotificationSetEvent event) {
+        final FrameToggleButton button = getButton(event.getWindow());
+        if (button != null) {
+            button.setForeground(UIUtilities.convertColour(event.getColour()));
+        }
     }
 
-    @Override
-    public void notificationCleared(final FrameContainer window) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                // TODO: Should this colour be configurable?
-                notificationSet(window, window.getNotification().or(Colour.BLACK));
-            }
-        });
+    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    public void notificationCleared(final NotificationClearedEvent event) {
+        // TODO: Should this colour be configurable?
+        notificationSet(new NotificationSetEvent(event.getWindow(),
+                event.getWindow().getNotification().or(Colour.BLACK)));
     }
 
     @Override

src/com/dmdirc/addons/ui_swing/framemanager/tree/NodeLabel.java

@@ -29,8 +29,8 @@ import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameNameChangedEvent;
-import com.dmdirc.interfaces.NotificationListener;
-import com.dmdirc.ui.Colour;
+import com.dmdirc.events.NotificationClearedEvent;
+import com.dmdirc.events.NotificationSetEvent;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.Color;
@@ -49,8 +49,7 @@ import net.engio.mbassy.listener.Handler;
 /**
  * Node label.
  */
-public class NodeLabel extends JPanel implements SelectionListener,
-        NotificationListener {
+public class NodeLabel extends JPanel implements SelectionListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
@@ -75,8 +74,6 @@ public class NodeLabel extends JPanel implements SelectionListener,
      * @param window Window for this node
      */
     public NodeLabel(final FrameContainer window) {
-        super();
-
         this.window = window;
 
         init();
@@ -109,19 +106,12 @@ public class NodeLabel extends JPanel implements SelectionListener,
         selected = equals(window.getContainer());
     }
 
-    @Override
-    public void notificationSet(final FrameContainer window,
-            final Colour colour) {
-        if (equals(window)) {
-            notificationColour = UIUtilities.convertColour(colour);
-        }
+    public void notificationSet(final NotificationSetEvent event) {
+            notificationColour = UIUtilities.convertColour(event.getColour());
     }
 
-    @Override
-    public void notificationCleared(final FrameContainer window) {
-        if (equals(window)) {
+    public void notificationCleared(final NotificationClearedEvent event) {
             notificationColour = null;
-        }
     }
 
     @Handler

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing.framemanager.tree;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -36,8 +37,9 @@ import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.addons.ui_swing.injection.SwingEventBus;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.events.FrameIconChangedEvent;
+import com.dmdirc.events.NotificationClearedEvent;
+import com.dmdirc.events.NotificationSetEvent;
 import com.dmdirc.events.UserErrorEvent;
-import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
@@ -67,12 +69,12 @@ import javax.swing.tree.TreePath;
 import net.miginfocom.swing.MigLayout;
 
 import net.engio.mbassy.listener.Handler;
+import net.engio.mbassy.listener.Invoke;
 
 /**
  * Manages open windows in the application in a tree style view.
  */
-public class TreeFrameManager implements FrameManager, Serializable, ConfigChangeListener,
-        NotificationListener {
+public class TreeFrameManager implements FrameManager, Serializable, ConfigChangeListener {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 5;
@@ -178,6 +180,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
 
                 setColours();
 
+                eventBus.subscribe(TreeFrameManager.this);
                 swingEventBus.subscribe(TreeFrameManager.this);
                 redoTreeView();
             }
@@ -220,8 +223,6 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
                     eventBus.unsubscribe(nodes.get(window.getContainer()).getLabel());
                     nodes.remove(window.getContainer());
                 }
-                window.getContainer().removeNotificationListener(
-                        TreeFrameManager.this);
             }
         });
     }
@@ -256,10 +257,10 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
                     tree.scrollRectToVisible(new Rectangle(0, (int) view.getY(),
                             0, 0));
                 }
-                window.addNotificationListener(TreeFrameManager.this);
 
                 // TODO: Should this colour be configurable?
-                node.getLabel().notificationSet(window, window.getNotification().or(Colour.BLACK));
+                node.getLabel().notificationSet(new NotificationSetEvent(window,
+                        window.getNotification().or(Colour.BLACK)));
                 node.getLabel().iconChanged(new FrameIconChangedEvent(window, window.getIcon()));
             }
         });
@@ -378,44 +379,32 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
         }
     }
 
-    @Override
-    public void notificationSet(final FrameContainer window, final Colour colour) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
+    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    public void notificationSet(final NotificationSetEvent event) {
                 synchronized (nodes) {
-                    final TreeViewNode node = nodes.get(window);
-                    if (window != null && node != null) {
+                    final TreeViewNode node = nodes.get(event.getWindow());
+                    if (event.getWindow() != null && node != null) {
                         final NodeLabel label = node.getLabel();
                         if (label != null) {
-                            label.notificationSet(window, colour);
+                            label.notificationSet(event);
                             tree.repaint();
                         }
                     }
                 }
-            }
-        });
     }
 
-    @Override
-    public void notificationCleared(final FrameContainer window) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
+    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    public void notificationCleared(final NotificationClearedEvent event) {
                 synchronized (nodes) {
-                    final TreeViewNode node = nodes.get(window);
-                    if (window != null && node != null) {
+                    final TreeViewNode node = nodes.get(event.getWindow());
+                    if (event.getWindow() != null && node != null) {
                         final NodeLabel label = node.getLabel();
                         if (label != null) {
-                            label.notificationCleared(window);
+                            label.notificationCleared(event);
                             tree.repaint();
                         }
                     }
                 }
-            }
-        });
     }
 
 }