General tidying of the frame managers.

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

@@ -398,13 +398,13 @@ public final class ButtonBar implements FrameManager, ActionListener, ComponentL
             @Override
             public void run() {
                 activeWindow = window;
-                FrameToggleButton button = getButton(selected);
-                if (selected != null && button != null) {
-                    button.setSelected(false);
+                final FrameToggleButton selectedButton = getButton(selected);
+                if (selected != null && selectedButton != null) {
+                    selectedButton.setSelected(false);
                 }
 
                 selected = window.getContainer();
-                button = getButton(window.getContainer());
+                final FrameToggleButton button = getButton(window.getContainer());
                 if (button != null) {
                     scrollPane.getViewport().scrollRectToVisible(
                             button.getBounds());

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

@@ -44,6 +44,7 @@ import javax.swing.JPopupMenu;
 import javax.swing.JTree;
 import javax.swing.UIManager;
 import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
@@ -307,11 +308,11 @@ public class Tree extends JTree implements MouseMotionListener,
                 windowFactory.getSwingWindow(node.getWindow()).setPopout(false);
                 break;
         }
-        final TreeViewNode parentNode = (TreeViewNode) node.getParent();
+        final MutableTreeNode parentNode = (MutableTreeNode) node.getParent();
         final TreePath nodePath = new TreePath(node.getPath());
         final boolean isExpanded = isExpanded(nodePath);
         ((DefaultTreeModel) getModel()).removeNodeFromParent(node);
-        ((TreeViewModel) getModel()).insertNodeInto(node, parentNode, index);
+        ((DefaultTreeModel) getModel()).insertNodeInto(node, parentNode, index);
         setExpandedState(nodePath, isExpanded);
     }
 

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

@@ -60,9 +60,11 @@ import javax.inject.Inject;
 import javax.swing.JComponent;
 import javax.swing.JScrollPane;
 import javax.swing.JTree;
+import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 
@@ -167,7 +169,8 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
             public void run() {
                 final JScrollPane scrollPane = new JScrollPane(tree);
                 scrollPane.setAutoscrolls(true);
-                scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+                scrollPane.setHorizontalScrollBarPolicy(
+                        ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
 
                 parent.setVisible(false);
                 parent.setLayout(new MigLayout("ins 0, fill"));
@@ -212,7 +215,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
                 if (node.getLevel() == 0) {
                     eventBus.publishAsync(
                             new UserErrorEvent(ErrorLevel.MEDIUM, new IllegalArgumentException(),
-                                    "delServer triggered for root node" + node.toString(), ""));
+                                    "delServer triggered for root node" + node, ""));
                 } else {
                     model.removeNodeFromParent(nodes.get(window.getContainer()));
                 }
@@ -230,7 +233,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
      * @param parent Parent node
      * @param window Window to add
      */
-    public void addWindow(final TreeViewNode parent, final FrameContainer window) {
+    public void addWindow(final MutableTreeNode parent, final FrameContainer window) {
         UIUtilities.invokeAndWait(new Runnable() {
 
             @Override
@@ -345,7 +348,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
     @Override
     public void selectionChanged(final TextFrame window) {
         synchronized (nodes) {
-            final Collection<TreeViewNode> collection = new ArrayList<>(nodes.values());
+            final Iterable<TreeViewNode> collection = new ArrayList<>(nodes.values());
             for (TreeViewNode treeNode : collection) {
                 final NodeLabel label = treeNode.getLabel();
                 label.selectionChanged(window);

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenu.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
@@ -35,7 +36,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 import javax.swing.JMenu;
-import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 
 import net.engio.mbassy.listener.Handler;
 
@@ -76,35 +77,23 @@ public class FrameContainerMenu extends JMenu implements ActionListener, Selecti
         this.frame = frame;
 
         setIcon(frame.getIconManager().getIcon(frame.getIcon()));
-        new WindowMenuScroller(this, globalConfig, domain, 0);
+        WindowMenuScroller.createScroller(this, globalConfig, domain, 0);
 
         addActionListener(this);
     }
 
-    @Handler
+    @Handler(invocation = EdtHandlerInvocation.class)
     public void iconChanged(final FrameIconChangedEvent event) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (frame != null && window != null && frame.equals(window.getContainer())) {
-                    setIcon(window.getIconManager().getIcon(event.getIcon()));
-                }
-            }
-        });
+        if (frame != null && window != null && frame.equals(window.getContainer())) {
+            setIcon(window.getIconManager().getIcon(event.getIcon()));
+        }
     }
 
-    @Handler
+    @Handler(invocation = EdtHandlerInvocation.class)
     public void nameChanged(final FrameNameChangedEvent event) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (frame != null && window != null && frame.equals(window.getContainer())) {
-                    setText(event.getName());
-                }
-            }
-        });
+        if (frame != null && window != null && frame.equals(window.getContainer())) {
+            setText(event.getName());
+        }
     }
 
     @Override
@@ -115,9 +104,9 @@ public class FrameContainerMenu extends JMenu implements ActionListener, Selecti
     @Override
     public void selectionChanged(final TextFrame window) {
         if (frame.equals(window.getContainer())) {
-            setFont(getFont().deriveFont(Font.BOLD));
+            setFont(UIManager.getFont("Menu.font").deriveFont(Font.BOLD));
         } else {
-            setFont(getFont().deriveFont(Font.PLAIN));
+            setFont(UIManager.getFont("Menu.font").deriveFont(Font.PLAIN));
         }
     }
 
@@ -125,7 +114,7 @@ public class FrameContainerMenu extends JMenu implements ActionListener, Selecti
      * Informs this menu one of its children is selected.
      */
     protected void childSelected() {
-        setFont(getFont().deriveFont(Font.ITALIC));
+        setFont(UIManager.getFont("Menu.font").deriveFont(Font.ITALIC));
     }
 
     @Override

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenuItem.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
@@ -37,7 +38,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 import javax.swing.JMenuItem;
-import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 
 import net.engio.mbassy.listener.Handler;
 
@@ -81,30 +82,18 @@ public class FrameContainerMenuItem extends JMenuItem implements ActionListener,
         addActionListener(this);
     }
 
-    @Handler
+    @Handler(invocation = EdtHandlerInvocation.class)
     public void iconChanged(final FrameIconChangedEvent event) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (frame != null && window != null && frame.equals(window.getContainer())) {
-                    setIcon(window.getIconManager().getIcon(event.getIcon()));
-                }
-            }
-        });
+        if (frame != null && window != null && frame.equals(window.getContainer())) {
+            setIcon(window.getIconManager().getIcon(event.getIcon()));
+        }
     }
 
-    @Handler
+    @Handler(invocation = EdtHandlerInvocation.class)
     public void nameChanged(final FrameNameChangedEvent event) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (frame != null && window != null && frame.equals(window.getContainer())) {
-                    setText(Styliser.stipControlCodes(event.getName()));
-                }
-            }
-        });
+        if (frame != null && window != null && frame.equals(window.getContainer())) {
+            setText(Styliser.stipControlCodes(event.getName()));
+        }
     }
 
     @Override
@@ -115,13 +104,13 @@ public class FrameContainerMenuItem extends JMenuItem implements ActionListener,
     @Override
     public void selectionChanged(final TextFrame window) {
         if (frame.equals(window.getContainer())) {
-            setFont(getFont().deriveFont(Font.BOLD));
+            setFont(UIManager.getFont("MenuItem.font").deriveFont(Font.BOLD));
             final Optional<FrameContainer> parentWindow = window.getContainer().getParent();
             if (parentWindow.isPresent()) {
                 manager.parentSelection(parentWindow.get());
             }
         } else {
-            setFont(getFont().deriveFont(Font.PLAIN));
+            setFont(UIManager.getFont("MenuItem.font").deriveFont(Font.PLAIN));
         }
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -139,7 +139,7 @@ public class WindowMenuFrameManager extends JMenu implements ActionListener, Sel
 
         activeFrameManager.addSelectionListener(this);
 
-        new WindowMenuScroller(this, globalConfig, domain, itemCount);
+        WindowMenuScroller.createScroller(this, globalConfig, domain, itemCount);
         checkMenuItems();
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuScroller.java

@@ -54,23 +54,30 @@ public class WindowMenuScroller implements ConfigChangeListener {
      * @param configDomain Domain to check config settings in
      * @param fixedCount   Number of fixed items in the menu
      */
-    public WindowMenuScroller(final JMenu menu, final AggregateConfigProvider config,
+    private WindowMenuScroller(final JMenu menu, final AggregateConfigProvider config,
             final String configDomain, final int fixedCount) {
         this.menu = menu;
         this.config = config;
         this.configDomain = configDomain;
         this.fixedCount = fixedCount;
+    }
+
+    private void init() {
         this.scroller = new MenuScroller(menu,
-                config.getOptionInt(configDomain,
-                        "windowMenuItems"),
-                config.getOptionInt(configDomain,
-                        "windowMenuScrollInterval"), fixedCount, 0);
+                config.getOptionInt(configDomain,"windowMenuItems"),
+                config.getOptionInt(configDomain, "windowMenuScrollInterval"), fixedCount, 0);
         scroller.setShowSeperators(false);
 
-        config.addChangeListener(configDomain,
-                "windowMenuItems", this);
-        config.addChangeListener(configDomain,
-                "windowMenuScrollInterval", this);
+        config.addChangeListener(configDomain, "windowMenuItems", this);
+        config.addChangeListener(configDomain, "windowMenuScrollInterval", this);
+    }
+
+    /**
+     * Creates a menu scroller and attaches it to the menu.
+     */
+    public static void createScroller(final JMenu menu, final AggregateConfigProvider config,
+            final String configDomain, final int fixedCount) {
+        new WindowMenuScroller(menu, config, configDomain, fixedCount).init();
     }
 
     @Override