Notifications work once again

git-svn-id: http://svn.dmdirc.com/trunk@2475 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/ui/swing/framemanager/buttonbar/ButtonBar.java

@@ -26,6 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.FrameContainerComparator;
 import com.dmdirc.Main;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.FramemanagerPosition;
 import com.dmdirc.ui.interfaces.Window;
@@ -61,14 +62,14 @@ import javax.swing.SwingConstants;
  * @author chris
  */
 public final class ButtonBar implements FrameManager, ActionListener,
-        ComponentListener, Serializable {
+        ComponentListener, Serializable, NotificationListener {
     
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
-    private static final long serialVersionUID = 1;
+    private static final long serialVersionUID = 2;
     
     /** A map of parent containers to their respective windows. */
     private final Map<FrameContainer, List<FrameContainer>> windows;
@@ -235,6 +236,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         addButton(window);
         
         relayout();
+        window.addNotificationListener(this);
     }
     
     /** {@inheritDoc} */
@@ -242,6 +244,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         windows.remove(window);
         
         relayout();
+        window.removeNotificationListener(this);
     }
         
     /** {@inheritDoc} */
@@ -250,6 +253,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         addButton(window);
         
         relayout();
+        window.addNotificationListener(this);
     }
     
     /** {@inheritDoc} */
@@ -257,6 +261,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         windows.get(parent).remove(window);
         
         relayout();
+        window.removeNotificationListener(this);
     }
     
     /** {@inheritDoc} */
@@ -325,4 +330,18 @@ public final class ButtonBar implements FrameManager, ActionListener,
         // Do nothing
     }
     
+    
+    /** {@inheritDoc} */
+    @Override
+    public void notificationSet(final Window window, final Color colour) {
+        if (buttons.containsKey(window)) {
+            buttons.get(window.getContainer()).setForeground(colour);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void notificationCleared(final Window window) {
+        notificationSet(window, window.getContainer().getNotification());
+    }
 }

src/com/dmdirc/ui/swing/framemanager/ctrltab/CtrlTabFrameManager.java

@@ -23,11 +23,9 @@
 package com.dmdirc.ui.swing.framemanager.ctrltab;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Main;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.FrameManager;
-import com.dmdirc.ui.swing.MainFrame;
 import com.dmdirc.ui.swing.components.TreeScroller;
 import com.dmdirc.ui.swing.framemanager.tree.TreeViewModel;
 

src/com/dmdirc/ui/swing/framemanager/tree/TreeFrameManager.java

@@ -25,9 +25,11 @@ package com.dmdirc.ui.swing.framemanager.tree;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.config.ConfigChangeListener;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.FrameManager;
+import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.swing.components.TreeScroller;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
@@ -66,14 +68,14 @@ import javax.swing.tree.TreeSelectionModel;
  */
 public final class TreeFrameManager implements FrameManager, MouseListener,
         ActionListener, MouseMotionListener, AdjustmentListener, Serializable,
-        ConfigChangeListener, TreeSelectionListener {
+        ConfigChangeListener, TreeSelectionListener, NotificationListener {
     
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
-    private static final long serialVersionUID = 3;
+    private static final long serialVersionUID = 4;
     
     /** display tree. */
     private final JTree tree;
@@ -247,6 +249,7 @@ public final class TreeFrameManager implements FrameManager, MouseListener,
             }
             nodes.remove(window);
             labels.remove(node);
+            window.removeNotificationListener(this);
         }
     }
     
@@ -265,6 +268,7 @@ public final class TreeFrameManager implements FrameManager, MouseListener,
         tree.expandPath(new TreePath(node.getPath()).getParentPath());
         final Rectangle view = tree.getRowBounds(tree.getRowForPath(new TreePath(node.getPath())));
         tree.scrollRectToVisible(new Rectangle(0, (int) view.getY(), 0, 0));
+        window.addNotificationListener(this);
     }
     
     /** {@inheritDoc} */
@@ -446,5 +450,18 @@ public final class TreeFrameManager implements FrameManager, MouseListener,
         ((FrameContainer )((DefaultMutableTreeNode) e.getPath().
                 getLastPathComponent()).getUserObject()).activateFrame();
     }
-    
+
+    /** {@inheritDoc} */
+    @Override
+    public void notificationSet(final Window window, final Color colour) {
+        notificationColours.put(window.getContainer(), colour);
+        tree.repaint();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void notificationCleared(final Window window) {
+        notificationColours.remove(window.getContainer());
+        tree.repaint();
+    }
 }