Rollovers are no longer checked if the option is disabled

possible fix for issue 1090

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

src/com/dmdirc/ui/swing/components/renderers/TreeViewTreeCellRenderer.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.ui.swing.components.renderers;
 
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.ui.swing.framemanager.tree.NodeLabel;
 import com.dmdirc.ui.swing.framemanager.tree.TreeFrameManager;
 import com.dmdirc.ui.swing.framemanager.tree.TreeViewModel;
@@ -41,7 +43,7 @@ import javax.swing.tree.TreePath;
  * Displays a node in a tree according to its type.
  */
 public class TreeViewTreeCellRenderer implements TreeCellRenderer,
-        MouseMotionListener, MouseListener {
+        MouseMotionListener, MouseListener, ConfigChangeListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -61,8 +63,13 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
      */
     public TreeViewTreeCellRenderer(final TreeFrameManager manager) {
         this.manager = manager;
-        manager.getTree().addMouseMotionListener(this);
-        manager.getTree().addMouseListener(this);
+        if (!IdentityManager.getGlobalConfig().getOption("ui",
+                "treeviewRolloverColour", "false").contains("false")) {
+            manager.getTree().addMouseMotionListener(this);
+            manager.getTree().addMouseListener(this);
+        }
+        IdentityManager.getGlobalConfig().addChangeListener("ui",
+                "treeviewRolloverColour", this);
     }
 
     /**
@@ -84,11 +91,17 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
             final boolean leaf, final int row, final boolean hasFocus) {
         final boolean rollover = (oldSelectedPath != null) && (value ==
                 oldSelectedPath.getLastPathComponent());
-        final NodeLabel label = manager.getLabelforNode((DefaultMutableTreeNode) value);
+        final NodeLabel label =
+                manager.getLabelforNode((DefaultMutableTreeNode) value);
         label.setRollover(rollover);
         return label;
     }
-    
+
+    /**
+     * Checks the mouse position and sets the rollover node as required.
+     * 
+     * @param e Triggering mouse event
+     */
     private void checkMousePosition(final MouseEvent e) {
         final JTree tree = manager.getTree();
         final TreeViewModel model = (TreeViewModel) tree.getModel();
@@ -126,7 +139,7 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
      */
     @Override
     public void mouseDragged(final MouseEvent e) {
-        //Ignore
+    //Ignore
     }
 
     /** 
@@ -136,7 +149,7 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
      */
     @Override
     public void mouseClicked(final MouseEvent e) {
-        //Ignore
+    //Ignore
     }
 
     /** 
@@ -146,7 +159,7 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
      */
     @Override
     public void mousePressed(final MouseEvent e) {
-        //Ignore
+    //Ignore
     }
 
     /** 
@@ -156,7 +169,7 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
      */
     @Override
     public void mouseReleased(final MouseEvent e) {
-        //Ignore
+    //Ignore
     }
 
     /** 
@@ -180,4 +193,17 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
         oldSelectedPath = null;
         manager.getTree().repaint();
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void configChanged(final String domain, final String key) {
+        if (IdentityManager.getGlobalConfig().getOption("ui",
+                "treeviewRolloverColour", "false").contains("false")) {
+            manager.getTree().removeMouseMotionListener(this);
+            manager.getTree().removeMouseListener(this);
+        } else {
+            manager.getTree().addMouseMotionListener(this);
+            manager.getTree().addMouseListener(this);
+        }
+    }
 }

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

@@ -49,7 +49,6 @@ import java.util.Map;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
-import javax.swing.JLabel;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollBar;
@@ -191,17 +190,20 @@ public final class TreeFrameManager implements FrameManager, MouseListener,
     @Override
     public void delWindow(final FrameContainer window) {
         if (nodes != null && nodes.get(window) != null) {
-            final DefaultMutableTreeNode node = nodes.get(window);
-            if (node.getLevel() == 0) {
-                Logger.appError(ErrorLevel.MEDIUM,
-                        "delServer triggered for root node" + node.toString(),
-                        new IllegalArgumentException());
-            } else {
-                model.removeNodeFromParent(nodes.get(window));
+            synchronized (labels) {
+                final DefaultMutableTreeNode node = nodes.get(window);
+                if (node.getLevel() == 0) {
+                    Logger.appError(ErrorLevel.MEDIUM,
+                            "delServer triggered for root node" +
+                            node.toString(),
+                            new IllegalArgumentException());
+                } else {
+                    model.removeNodeFromParent(nodes.get(window));
+                }
+                nodes.remove(window);
+                labels.remove(node);
+                window.removeSelectionListener(this);
             }
-            nodes.remove(window);
-            labels.remove(node);
-            window.removeSelectionListener(this);
         }
     }
 
@@ -213,20 +215,22 @@ public final class TreeFrameManager implements FrameManager, MouseListener,
      */
     public void addWindow(final DefaultMutableTreeNode parent,
             final FrameContainer window) {
-        final DefaultMutableTreeNode node = new DefaultMutableTreeNode();
-        nodes.put(window, node);
-        labels.put(node, new NodeLabel(this, window.getFrame()));
-        node.setUserObject(window);
-        if (parent == null) {
-            model.insertNodeInto(node, root);
-        } else {
-            model.insertNodeInto(node, parent);
+        synchronized (labels) {
+            final DefaultMutableTreeNode node = new DefaultMutableTreeNode();
+            nodes.put(window, node);
+            labels.put(node, new NodeLabel(this, window.getFrame()));
+            node.setUserObject(window);
+            if (parent == null) {
+                model.insertNodeInto(node, root);
+            } else {
+                model.insertNodeInto(node, parent);
+            }
+            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.addSelectionListener(this);
         }
-        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.addSelectionListener(this);
     }
 
     /**
@@ -380,7 +384,9 @@ public final class TreeFrameManager implements FrameManager, MouseListener,
      * @return Label for node
      */
     public NodeLabel getLabelforNode(final DefaultMutableTreeNode node) {
-        return labels.get(node);
+        synchronized (labels) {
+            return labels.get(node);
+        }
     }
 
     /** Sets treeview colours. */
@@ -434,5 +440,4 @@ public final class TreeFrameManager implements FrameManager, MouseListener,
             }
         }
     }
-
 }