Use new unread status events.

ui_swing/src/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -39,7 +39,7 @@ import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
 import com.dmdirc.events.ClientMinimisedEvent;
 import com.dmdirc.events.ClientUnminimisedEvent;
 import com.dmdirc.events.FrameTitleChangedEvent;
-import com.dmdirc.events.NotificationSetEvent;
+import com.dmdirc.events.UnreadStatusChangedEvent;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
@@ -524,10 +524,10 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
     }
 
     @Handler
-    public void notificationSet(final NotificationSetEvent event) {
+    public void unreadStatusChanged(final UnreadStatusChangedEvent event) {
         activeFrame.map(Window::getContainer)
-                .filter(isEqual(event.getWindow()))
-                .ifPresent(c -> event.getWindow().clearNotification());
+                .filter(isEqual(event.getSource()))
+                .ifPresent(c -> event.getManager().clearStatus());
     }
 
     @Override

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -217,7 +217,7 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
      * Called when the frame has been selected in the UI.
      */
     public void activateFrame() {
-        UIUtilities.invokeLater(frameParent::clearNotification);
+        UIUtilities.invokeLater(() -> frameParent.getUnreadStatusManager().clearStatus());
     }
 
     /**

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

@@ -26,12 +26,13 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
+import com.dmdirc.addons.ui_swing.textpane.StyledDocumentMaker;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameNameChangedEvent;
-import com.dmdirc.events.NotificationSetEvent;
+import com.dmdirc.events.UnreadStatusChangedEvent;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.addons.ui_swing.textpane.StyledDocumentMaker;
 import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.util.colours.Colour;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -110,12 +111,10 @@ public class NodeLabel extends JPanel {
                 && window.equals(event.getWindow().get());
     }
 
-    public void notificationSet(final NotificationSetEvent event) {
-            notificationColour = UIUtilities.convertColour(event.getColour());
-    }
-
-    public void notificationCleared() {
-            notificationColour = null;
+    public void unreadStatusChanged(final UnreadStatusChangedEvent event) {
+        // TODO: Should this colour be configurable?
+        notificationColour = UIUtilities.convertColour(
+                event.getNotificationColour().orElse(Colour.BLACK));
     }
 
     @Handler

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

@@ -38,8 +38,7 @@ import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 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.UnreadStatusChangedEvent;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
@@ -49,7 +48,6 @@ import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.util.colours.Colour;
 
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
@@ -237,9 +235,10 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
                 tree.scrollRectToVisible(new Rectangle(0, (int) view.getY(), 0, 0));
             }
 
-            // TODO: Should this colour be configurable?
-            node.getLabel().notificationSet(new NotificationSetEvent(window.getContainer(),
-                    window.getContainer().getNotification().orElse(Colour.BLACK)));
+            node.getLabel().unreadStatusChanged(new UnreadStatusChangedEvent(
+                    window.getContainer(), window.getContainer().getUnreadStatusManager(),
+                    window.getContainer().getUnreadStatusManager().getNotificationColour(),
+                    window.getContainer().getUnreadStatusManager().getUnreadLines()));
             node.getLabel().iconChanged(new FrameIconChangedEvent(window.getContainer(),
                     window.getContainer().getIcon()));
         });
@@ -333,33 +332,20 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
                     final TreePath path = new TreePath(treePath);
                     tree.setTreePath(path);
                     tree.scrollPathToVisible(path);
-                }
-            });
-        }
-    }
-
-    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
-    public void notificationSet(final NotificationSetEvent event) {
-        synchronized (nodes) {
-            final TreeViewNode node = nodes.get(windowFactory.getSwingWindow(event.getWindow()));
-            if (event.getWindow() != null && node != null) {
-                final NodeLabel label = node.getLabel();
-                if (label != null) {
-                    label.notificationSet(event);
                     tree.repaint();
                 }
-            }
+            });
         }
     }
 
     @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
-    public void notificationCleared(final NotificationClearedEvent event) {
+    public void unreadStatusChanged(final UnreadStatusChangedEvent event) {
         synchronized (nodes) {
-            final TreeViewNode node = nodes.get(windowFactory.getSwingWindow(event.getWindow()));
-            if (event.getWindow() != null && node != null) {
+            final TreeViewNode node = nodes.get(windowFactory.getSwingWindow(event.getSource()));
+            if (node != null) {
                 final NodeLabel label = node.getLabel();
                 if (label != null) {
-                    label.notificationCleared();
+                    label.unreadStatusChanged(event);
                     tree.repaint();
                 }
             }