Re-add treescroller after treeview is rebuilt.

Fixes isssue CLIENT-1

Change-Id: Ib0a23179daffa4903a192b627caf0a8d0823bdd6
Reviewed-on: http://gerrit.dmdirc.com/1534
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/ui_swing/components/TreeScroller.java

@@ -21,6 +21,7 @@
  */
 package com.dmdirc.addons.ui_swing.components;
 
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
 
@@ -70,7 +71,8 @@ public class TreeScroller implements MouseWheelListener {
      * @param rootVisible Is the root node visible
      */
     public TreeScroller(final DefaultTreeModel model,
-            final TreeSelectionModel selectionModel, final boolean rootVisible) {
+            final TreeSelectionModel selectionModel,
+            final boolean rootVisible) {
         this.model = model;
         this.selectionModel = selectionModel;
 
@@ -84,7 +86,14 @@ public class TreeScroller implements MouseWheelListener {
      * @param tree Tree to scroll
      */
     public static void register(final JTree tree) {
-        new TreeScroller(tree);
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                new TreeScroller(tree);
+            }
+        });
     }
 
     /**
@@ -95,8 +104,23 @@ public class TreeScroller implements MouseWheelListener {
      * @param rootVisible Root visible
      */
     public static void register(final DefaultTreeModel model,
-            final TreeSelectionModel selectionModel, final boolean rootVisible) {
-        new TreeScroller(model, selectionModel, rootVisible);
+            final TreeSelectionModel selectionModel,
+            final boolean rootVisible) {
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                new TreeScroller(model, selectionModel, rootVisible);
+            }
+        });
+    }
+
+    /**
+     * Removes this tree scroller from the tree.
+     */
+    public void unregister() {
+        tree.removeMouseWheelListener(this);
     }
 
     /**

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.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
@@ -78,6 +79,8 @@ public final class TreeFrameManager implements FrameManager,
     private final Map<FrameContainer<?>, TreeViewNode> nodes;
     /** UI Controller. */
     private SwingController controller;
+    /** Tree scroller. */
+    private TreeScroller scroller;
 
     /** creates a new instance of the TreeFrameManager. */
     public TreeFrameManager() {
@@ -119,10 +122,6 @@ public final class TreeFrameManager implements FrameManager,
                 setColours();
 
                 redoTreeView();
-                if (controller.getMainFrame().getActiveFrame() != null) {
-                    selectionChanged(controller.getMainFrame().getActiveFrame().
-                            getContainer());
-                }
             }
         });
     }
@@ -208,9 +207,9 @@ public final class TreeFrameManager implements FrameManager,
         });
     }
 
-    /** 
+    /**
      * Adds a window to the frame container.
-     * 
+     *
      * @param parent Parent node
      * @param window Window to add
      */
@@ -260,8 +259,8 @@ public final class TreeFrameManager implements FrameManager,
 
     /**
      * Checks for and sets a rollover node.
-     * 
-     * @param event event to check 
+     *
+     * @param event event to check
      */
     protected void checkRollover(final MouseEvent event) {
         NodeLabel node = null;
@@ -313,16 +312,24 @@ public final class TreeFrameManager implements FrameManager,
                 ((DefaultTreeModel) tree.getModel()).setRoot(null);
                 ((DefaultTreeModel) tree.getModel()).setRoot(new TreeViewNode(
                         null, null));
-                new TreeTreeScroller(tree);
+                if (scroller != null) {
+                    scroller.unregister();
+                }
+                scroller = new TreeTreeScroller(tree);
 
-                for (FrameContainer<?> window : WindowManager.getRootWindows()) {
+                for (FrameContainer<?> window
+                        : WindowManager.getRootWindows()) {
                     addWindow(null, window);
-                    final Collection<FrameContainer<?>> childWindows = window.
-                            getChildren();
+                    final Collection<FrameContainer<?>> childWindows = window
+                            .getChildren();
                     for (FrameContainer childWindow : childWindows) {
                         addWindow(nodes.get(window), childWindow);
                     }
                 }
+                if (controller.getMainFrame().getActiveFrame() != null) {
+                    selectionChanged(controller.getMainFrame().getActiveFrame()
+                            .getContainer());
+                }
             }
         });
     }