On the fly frame manager switching.

TreeView supports this, buttonbar has issues.

Fixes issue 4061

Change-Id: If1f254caac4455a0c0f730ea4885f73de62bebec
Reviewed-on: http://gerrit.dmdirc.com/1188
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

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

@@ -100,6 +100,8 @@ public final class MainFrame extends JFrame implements WindowListener,
     private SwingStatusBar statusBar;
     /** Client Version. */
     private String version;
+    /** Main split pane. */
+    private SplitPane mainSplitPane;
 
     /**
      * Creates new form MainFrame.
@@ -113,8 +115,7 @@ public final class MainFrame extends JFrame implements WindowListener,
 
         initComponents();
 
-        imageIcon =
-                new ImageIcon(IconManager.getIconManager().getImage("icon"));
+        imageIcon = new ImageIcon(IconManager.getIconManager().getImage("icon"));
         setIconImage(imageIcon.getImage());
 
         CoreUIUtils.centreWindow(this);
@@ -129,6 +130,8 @@ public final class MainFrame extends JFrame implements WindowListener,
                 this);
         IdentityManager.getGlobalConfig().addChangeListener("ui", "showversion",
                 this);
+        IdentityManager.getGlobalConfig().addChangeListener("ui", "framemanager",
+                this);
         IdentityManager.getGlobalConfig().addChangeListener("icon", "icon", this);
 
 
@@ -351,6 +354,7 @@ public final class MainFrame extends JFrame implements WindowListener,
             /** {@inheritDoc} */
             @Override
             public void run() {
+                frameManagerPanel.removeAll();
                 final String manager = IdentityManager.getGlobalConfig().
                         getOption("ui", "framemanager");
                 try {
@@ -399,8 +403,8 @@ public final class MainFrame extends JFrame implements WindowListener,
     private void initComponents() {
         statusBar = new SwingStatusBar(controller, this);
         frameManagerPanel = new JPanel();
-        desktopPane = new DMDircDesktopPane(controller, this, controller.
-                getDomain());
+        desktopPane = new DMDircDesktopPane(controller, this, controller.getDomain());
+        mainSplitPane = new SplitPane(SplitPane.Orientation.HORIZONTAL);
 
         initFrameManagers();
 
@@ -412,7 +416,7 @@ public final class MainFrame extends JFrame implements WindowListener,
 
         getContentPane().setLayout(new MigLayout(
                 "fill, ins rel, wrap 1, hidemode 2"));
-        getContentPane().add(initSplitPane(), "grow, push");
+        getContentPane().add(initSplitPane(mainSplitPane), "grow, push");
         getContentPane().add(statusBar,
                 "hmax 20, wmax 100%-2*rel, wmin 100%-2*rel");
 
@@ -426,12 +430,9 @@ public final class MainFrame extends JFrame implements WindowListener,
      *
      * @return Returns the initialised split pane
      */
-    private JSplitPane initSplitPane() {
-        final JSplitPane mainSplitPane =
-                new SplitPane(SplitPane.Orientation.HORIZONTAL);
-        position =
-                FramemanagerPosition.getPosition(IdentityManager.getGlobalConfig().
-                getOption("ui", "framemanagerPosition"));
+    private JSplitPane initSplitPane(final SplitPane mainSplitPane) {
+        position = FramemanagerPosition.getPosition(IdentityManager
+                .getGlobalConfig().getOption("ui", "framemanagerPosition"));
 
         if (position == FramemanagerPosition.UNKNOWN) {
             position = FramemanagerPosition.LEFT;
@@ -455,8 +456,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                 mainSplitPane.setResizeWeight(0.0);
                 mainSplitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
                 frameManagerPanel.setPreferredSize(new Dimension(
-                        Integer.MAX_VALUE,
-                        IdentityManager.getGlobalConfig().
+                        Integer.MAX_VALUE, IdentityManager.getGlobalConfig().
                         getOptionInt("ui", "frameManagerSize")));
                 break;
             case LEFT:
@@ -474,8 +474,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                 mainSplitPane.setResizeWeight(1.0);
                 mainSplitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
                 frameManagerPanel.setPreferredSize(new Dimension(
-                        Integer.MAX_VALUE,
-                        IdentityManager.getGlobalConfig().
+                        Integer.MAX_VALUE, IdentityManager.getGlobalConfig().
                         getOptionInt("ui", "frameManagerSize")));
                 break;
             case RIGHT:
@@ -574,10 +573,13 @@ public final class MainFrame extends JFrame implements WindowListener,
         if ("ui".equals(domain)) {
             if ("lookandfeel".equals(key)) {
                 controller.updateLookAndFeel();
+            } else if ("framemanager".equals(key)) {
+                initFrameManagers();
+                initSplitPane(mainSplitPane);
+                frameManagerPanel.repaint();
             } else {
                 showVersion = IdentityManager.getGlobalConfig().getOptionBool(
-                        "ui",
-                        "showversion");
+                        "ui", "showversion");
             }
         } else {
             imageIcon = new ImageIcon(IconManager.getIconManager().getImage(

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

@@ -780,10 +780,10 @@ public class SwingController extends Plugin implements Serializable,
                 "Look and feel", "The Java look and feel to use", lafs));
         general.addSetting(new PreferencesSetting("ui", "framemanager",
                 "Window manager", "Which window manager should be used?",
-                framemanagers).setRestartNeeded());
+                framemanagers));
         general.addSetting(new PreferencesSetting("ui", "framemanagerPosition",
                 "Window manager position", "Where should the window "
-                + "manager be positioned?", fmpositions).setRestartNeeded());
+                + "manager be positioned?", fmpositions));
         general.addSetting(new PreferencesSetting(PreferencesType.FONT,
                 "ui", "textPaneFontName", "Textpane font",
                 "Font for the textpane"));

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

@@ -173,9 +173,14 @@ public final class ButtonBar implements FrameManager, ActionListener,
             @Override
             public void run() {
                 ButtonBar.this.parent = parent;
-                parent.setLayout(new MigLayout("ins 0, fill"));
-                parent.add(scrollPane, "top, left");
+                scrollPane.setSize(parent.getWidth(), parent.getHeight());
+
+                parent.setVisible(false);
+                parent.setLayout(new MigLayout("ins 0"));
+                parent.add(scrollPane);
                 parent.addComponentListener(ButtonBar.this);
+                parent.setVisible(true);
+                relayout();
             }
         });
     }

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

@@ -27,10 +27,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.addons.ui_swing.actions.CloseFrameContainerAction;
-import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
@@ -101,31 +98,6 @@ public class Tree extends JTree implements MouseMotionListener,
                 (int) PlatformDefaults.getUnitValueX("related").getValue(),
                 (int) PlatformDefaults.getUnitValueX("related").getValue(),
                 (int) PlatformDefaults.getUnitValueX("related").getValue()));
-        new TreeScroller(this) {
-
-            /** {@inheritDoc} */
-            @Override
-            protected void setPath(final TreePath path) {
-                if (path == null) {
-                    Logger.appError(ErrorLevel.HIGH, "Unable to change focus",
-                            new IllegalArgumentException("path == null"));
-                    return;
-                }
-                if (path.getLastPathComponent() == null) {
-                    Logger.appError(ErrorLevel.HIGH, "Unable to change focus",
-                            new IllegalArgumentException("Last component == null"));
-                    return;
-                }
-                if (((TreeViewNode) path.getLastPathComponent()).getWindow() == null) {
-                    Logger.appError(ErrorLevel.HIGH, "Unable to change focus",
-                            new IllegalArgumentException("Frame is null"));
-                    return;
-                }
-                super.setPath(path);
-                ((TreeViewNode) path.getLastPathComponent()).getWindow().
-                        activateFrame();
-            }
-        };
         setFocusable(false);
 
         dragSelect = IdentityManager.getGlobalConfig().getOptionBool("treeview",
@@ -237,8 +209,8 @@ public class Tree extends JTree implements MouseMotionListener,
             dragButton = true;
             final TreePath selectedPath = getPathForLocation(e.getX(), e.getY());
             if (selectedPath != null) {
-                ((TreeViewNode) selectedPath.getLastPathComponent()).
-                        getWindow().activateFrame();
+                ((TreeViewNode) selectedPath.getLastPathComponent()).getWindow().
+                        activateFrame();
             }
         }
         processMouseEvents(e);
@@ -285,8 +257,8 @@ public class Tree extends JTree implements MouseMotionListener,
             if (e.isPopupTrigger()) {
                 TextFrame frame = null;
 
-                frame = (TextFrame) controller.getSwingWindow(((TreeViewNode)
-                        localPath.getLastPathComponent()).getWindow());
+                frame = (TextFrame) controller.getSwingWindow(((TreeViewNode) localPath.
+                        getLastPathComponent()).getWindow());
 
                 if (frame == null) {
                     return;
@@ -347,4 +319,4 @@ public class Tree extends JTree implements MouseMotionListener,
         ((TreeViewModel) getModel()).insertNodeInto(node, parentNode, index);
         setExpandedState(nodePath, isExpanded);
     }
-}
+}

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

@@ -33,6 +33,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.UIController;
 import com.dmdirc.ui.interfaces.Window;
@@ -109,11 +110,20 @@ public final class TreeFrameManager implements FrameManager,
                 scrollPane.setHorizontalScrollBarPolicy(
                         JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 
+
+                parent.setVisible(false);
                 parent.setLayout(new MigLayout("ins 0, fill"));
                 parent.add(scrollPane, "grow");
                 parent.setFocusable(false);
+                parent.setVisible(true);
 
                 setColours();
+
+                redoTreeView();
+                if (controller.getMainFrame().getActiveFrame() != null) {
+                    selectionChanged(controller.getMainFrame().getActiveFrame().
+                            getContainer());
+                }
             }
         });
     }
@@ -132,7 +142,7 @@ public final class TreeFrameManager implements FrameManager,
             @Override
             public void run() {
                 model = new TreeViewModel(new TreeViewNode(null, null));
-                tree = new Tree(TreeFrameManager.this, model, 
+                tree = new Tree(TreeFrameManager.this, model,
                         TreeFrameManager.this.controller.getWindowFactory());
 
                 tree.setCellRenderer(new TreeViewTreeCellRenderer(
@@ -178,8 +188,8 @@ public final class TreeFrameManager implements FrameManager,
                         nodes.get(window.getContainer());
                 if (node.getLevel() == 0) {
                     Logger.appError(ErrorLevel.MEDIUM,
-                            "delServer triggered for root node" +
-                            node.toString(),
+                            "delServer triggered for root node"
+                            + node.toString(),
                             new IllegalArgumentException());
                 } else {
                     model.removeNodeFromParent(nodes.get(window.getContainer()));
@@ -187,9 +197,12 @@ public final class TreeFrameManager implements FrameManager,
                 synchronized (nodes) {
                     nodes.remove(window.getContainer());
                 }
-                window.getContainer().removeSelectionListener(TreeFrameManager.this);
-                window.getContainer().removeFrameInfoListener(TreeFrameManager.this);
-                window.getContainer().removeNotificationListener(TreeFrameManager.this);
+                window.getContainer().removeSelectionListener(
+                        TreeFrameManager.this);
+                window.getContainer().removeFrameInfoListener(
+                        TreeFrameManager.this);
+                window.getContainer().removeNotificationListener(
+                        TreeFrameManager.this);
             }
         });
     }
@@ -252,8 +265,8 @@ public final class TreeFrameManager implements FrameManager,
 
         if (event == null) {
             node = null;
-        } else if (tree.getNodeForLocation(event.getX(), event.getY()) !=
-                null) {
+        } else if (tree.getNodeForLocation(event.getX(), event.getY())
+                != null) {
             node =
                     tree.getNodeForLocation(event.getX(), event.getY()).getLabel();
         }
@@ -301,10 +314,12 @@ public final class TreeFrameManager implements FrameManager,
                 ((DefaultTreeModel) tree.getModel()).setRoot(null);
                 ((DefaultTreeModel) tree.getModel()).setRoot(new TreeViewNode(
                         null, null));
+                new TreeTreeScroller(tree);
 
                 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);
                     }

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

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.framemanager.tree;
+
+import com.dmdirc.addons.ui_swing.components.TreeScroller;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import javax.swing.tree.TreePath;
+
+/**
+ * Extention of TreeScroller to scroll the tree view.
+ */
+public class TreeTreeScroller extends TreeScroller {
+
+    /**
+     * Creates a new Tree scroller for the tree view.
+     *
+     * @param tree Tree view tree
+     */
+    public TreeTreeScroller(final Tree tree) {
+        super(tree);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void setPath(final TreePath path) {
+        if (path == null) {
+            Logger.appError(ErrorLevel.HIGH,
+                    "Unable to change focus",
+                    new IllegalArgumentException("path == null"));
+            return;
+        }
+        if (path.getLastPathComponent() == null) {
+            Logger.appError(ErrorLevel.HIGH,
+                    "Unable to change focus",
+                    new IllegalArgumentException(
+                    "Last component == null"));
+            return;
+        }
+        if (((TreeViewNode) path.getLastPathComponent()).getWindow()
+                == null) {
+            Logger.appError(ErrorLevel.HIGH,
+                    "Unable to change focus",
+                    new IllegalArgumentException("Frame is null"));
+            return;
+        }
+        super.setPath(path);
+        ((TreeViewNode) path.getLastPathComponent()).getWindow().
+                activateFrame();
+    }
+}