General tidying of the frame managers.

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

@@ -307,7 +307,7 @@ public final class ButtonBar implements FrameManager, ActionListener, ComponentL
         final FrameToggleButton button = new FrameToggleButton(
                 source.getContainer().getName(),
                 source.getContainer().getIconManager().getIcon(source.getContainer().getIcon()),
-                (TextFrame) source, source.getContainer());
+                (TextFrame) source);
         button.addActionListener(this);
         button.addMouseListener(this);
         button.setHorizontalAlignment(SwingConstants.LEFT);

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

@@ -26,6 +26,7 @@ import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.LayoutManager;
 import java.awt.Rectangle;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
@@ -33,13 +34,10 @@ import java.awt.event.MouseWheelListener;
 import javax.swing.JPanel;
 import javax.swing.Scrollable;
 
-import net.miginfocom.swing.MigLayout;
-
 /**
  * Implements scrollable onto a JPanel so we have more control over scrolling.
  */
-public class ButtonPanel extends JPanel implements Scrollable,
-        MouseWheelListener {
+public class ButtonPanel extends JPanel implements Scrollable, MouseWheelListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
@@ -55,7 +53,7 @@ public class ButtonPanel extends JPanel implements Scrollable,
      * @param layout             Layout settings for this ButtonPanel
      * @param buttonBar          the buttonBar that created this Panel
      */
-    public ButtonPanel(final ActiveFrameManager activeFrameManager, final MigLayout layout,
+    public ButtonPanel(final ActiveFrameManager activeFrameManager, final LayoutManager layout,
             final ButtonBar buttonBar) {
         super(layout);
 
@@ -65,7 +63,7 @@ public class ButtonPanel extends JPanel implements Scrollable,
 
     @Override
     public Dimension getPreferredScrollableViewportSize() {
-        return super.getPreferredSize();
+        return getPreferredSize();
     }
 
     @Override
@@ -97,8 +95,7 @@ public class ButtonPanel extends JPanel implements Scrollable,
         int newIndex = 0;
         if (e.getWheelRotation() < 0) {
             //Up
-            newIndex = selectedIndex > 0 ? selectedIndex - 1
-                    : getComponentCount() - 1;
+            newIndex = selectedIndex > 0 ? selectedIndex - 1 : getComponentCount() - 1;
         } else if (e.getWheelRotation() > 0) {
             //Down
             newIndex = (selectedIndex + 1) % getComponentCount();

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.framemanager.buttonbar;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 
 import javax.swing.Icon;
@@ -38,8 +37,6 @@ public class FrameToggleButton extends JToggleButton {
     private static final long serialVersionUID = 1;
     /** Contains the window associated with this button. */
     private final TextFrame textFrame;
-    /** The frame container associated with this button. */
-    private final FrameContainer frameContainer;
 
     /**
      * Create a new instance of FrameToggleButton.
@@ -47,13 +44,10 @@ public class FrameToggleButton extends JToggleButton {
      * @param text           Text to show
      * @param icon           Icon to show
      * @param textFrame      Text frame
-     * @param frameContainer Associated frame container
      */
-    public FrameToggleButton(final String text, final Icon icon, final TextFrame textFrame,
-            final FrameContainer frameContainer) {
+    public FrameToggleButton(final String text, final Icon icon, final TextFrame textFrame) {
         super(text, icon);
         this.textFrame = textFrame;
-        this.frameContainer = frameContainer;
     }
 
     /**
@@ -65,13 +59,4 @@ public class FrameToggleButton extends JToggleButton {
         return textFrame;
     }
 
-    /**
-     * Returns the FrameContainer associated with this button.
-     *
-     * @return FrameContainer associated with this button
-     */
-    public FrameContainer getFrameContainer() {
-        return frameContainer;
-    }
-
 }

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java

@@ -42,12 +42,14 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
 
+import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import javax.swing.InputMap;
 import javax.swing.JComponent;
 import javax.swing.KeyStroke;
 import javax.swing.tree.DefaultTreeSelectionModel;
@@ -106,17 +108,21 @@ public class CtrlTabWindowManager implements SelectionListener {
 
         activeFrameManager.addSelectionListener(this);
 
-        mainFrame.getRootPane().getActionMap().put("prevFrameAction",
-                new PreviousFrameAction(treeScroller));
-        mainFrame.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
-                .put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB,
-                                KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK),
-                        "prevFrameAction");
-        mainFrame.getRootPane().getActionMap().put(
-                "nextFrameAction", new NextFrameAction(treeScroller));
-        mainFrame.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
-                .put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB,
-                                KeyEvent.CTRL_DOWN_MASK), "nextFrameAction");
+        if (mainFrame.getRootPane().getActionMap() != null) {
+            mainFrame.getRootPane().getActionMap()
+                    .put("prevFrameAction", new PreviousFrameAction(treeScroller));
+            mainFrame.getRootPane().getActionMap()
+                    .put("nextFrameAction", new NextFrameAction(treeScroller));
+        }
+        final InputMap ancestorFocusedMap = mainFrame.getRootPane().getInputMap(
+                JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+        if (ancestorFocusedMap != null) {
+            ancestorFocusedMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB,
+                    InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK), "prevFrameAction");
+            ancestorFocusedMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB,
+                    InputEvent.CTRL_DOWN_MASK),
+                    "nextFrameAction");
+        }
     }
 
     @Handler
@@ -158,7 +164,7 @@ public class CtrlTabWindowManager implements SelectionListener {
                 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));
                 }
@@ -177,7 +183,6 @@ public class CtrlTabWindowManager implements SelectionListener {
         treeScroller.changeFocus(false);
     }
 
-    /* {@inheritDoc} */
     @Override
     public void selectionChanged(final TextFrame window) {
         UIUtilities.invokeLater(new Runnable() {

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

@@ -29,7 +29,6 @@ import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameNameChangedEvent;
-import com.dmdirc.events.NotificationClearedEvent;
 import com.dmdirc.events.NotificationSetEvent;
 import com.dmdirc.ui.messages.Styliser;
 
@@ -103,27 +102,27 @@ public class NodeLabel extends JPanel implements SelectionListener {
 
     @Override
     public void selectionChanged(final TextFrame window) {
-        selected = equals(window.getContainer());
+        selected = this.window.equals(window.getContainer());
     }
 
     public void notificationSet(final NotificationSetEvent event) {
             notificationColour = UIUtilities.convertColour(event.getColour());
     }
 
-    public void notificationCleared(final NotificationClearedEvent event) {
+    public void notificationCleared() {
             notificationColour = null;
     }
 
     @Handler
     public void iconChanged(final FrameIconChangedEvent event) {
-        if (equals(event.getContainer())) {
+        if (window.equals(event.getContainer())) {
             icon.setIcon(window.getIconManager().getIcon(event.getIcon()));
         }
     }
 
     @Handler
     public void nameChanged(final FrameNameChangedEvent event) {
-        if (equals(event.getContainer())) {
+        if (window.equals(event.getContainer())) {
             text.setText(event.getName());
         }
     }
@@ -164,15 +163,6 @@ public class NodeLabel extends JPanel implements SelectionListener {
         return notificationColour;
     }
 
-    @Override
-    public boolean equals(final Object obj) {
-        if (window == null) {
-            return false;
-        }
-
-        return window.equals(obj);
-    }
-
     @Override
     public int hashCode() {
         if (window == null) {
@@ -187,11 +177,6 @@ public class NodeLabel extends JPanel implements SelectionListener {
         return UIManager.getFont("TextPane.font");
     }
 
-    /**
-     * Sets the foreground colour for this label.
-     *
-     * @param colour New foreground colour
-     */
     @Override
     public void setForeground(final Color colour) {
         if (text != null) {
@@ -199,11 +184,6 @@ public class NodeLabel extends JPanel implements SelectionListener {
         }
     }
 
-    /**
-     * Sets the background colour for this label.
-     *
-     * @param colour New background colour
-     */
     @Override
     public void setBackground(final Color colour) {
         if (text != null) {
@@ -211,11 +191,6 @@ public class NodeLabel extends JPanel implements SelectionListener {
         }
     }
 
-    /**
-     * Sets the font for this label.
-     *
-     * @param font New font
-     */
     @Override
     public void setFont(final Font font) {
         if (text != null) {
@@ -223,11 +198,6 @@ public class NodeLabel extends JPanel implements SelectionListener {
         }
     }
 
-    /**
-     * Sets the opacity of this label.
-     *
-     * @param opacity Desired opacity
-     */
     @Override
     public void setOpaque(final boolean opacity) {
         if (text != null) {
@@ -235,23 +205,6 @@ public class NodeLabel extends JPanel implements SelectionListener {
         }
     }
 
-    /**
-     * Sets the text and style in this label.
-     *
-     * @param styliser   Styliser to use to style text
-     * @param styledText Styled text string to use
-     */
-    public void setStyledText(final Styliser styliser,
-            final String styledText) {
-        if (currentText.equals(styledText)) {
-            return;
-        }
-        text.setText("");
-        currentText = styledText;
-        styliser.addStyledString((StyledDocument) text.getDocument(),
-                new String[]{styledText,});
-    }
-
     /**
      * Sets the styles for the text in this label.
      *

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

@@ -43,6 +43,7 @@ import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.JTree;
 import javax.swing.UIManager;
+import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
@@ -235,7 +236,7 @@ public class Tree extends JTree implements MouseMotionListener,
      *
      * @param e mouse event
      */
-    public void processMouseEvents(final MouseEvent e) {
+    void processMouseEvents(final MouseEvent e) {
         final TreePath localPath = getPathForLocation(e.getX(), e.getY());
         if (localPath != null && e.isPopupTrigger()) {
             final TextFrame frame = windowFactory.getSwingWindow(
@@ -293,7 +294,7 @@ public class Tree extends JTree implements MouseMotionListener,
                 }
                 break;
             case "Down":
-                if (index == (node.getSiblingCount() - 1)) {
+                if (index == node.getSiblingCount() - 1) {
                     index = 0;
                 } else {
                     index++;
@@ -309,7 +310,7 @@ public class Tree extends JTree implements MouseMotionListener,
         final TreeViewNode parentNode = (TreeViewNode) node.getParent();
         final TreePath nodePath = new TreePath(node.getPath());
         final boolean isExpanded = isExpanded(nodePath);
-        ((TreeViewModel) getModel()).removeNodeFromParent(node);
+        ((DefaultTreeModel) getModel()).removeNodeFromParent(node);
         ((TreeViewModel) getModel()).insertNodeInto(node, parentNode, index);
         setExpandedState(nodePath, isExpanded);
     }

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

@@ -390,7 +390,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
             if (event.getWindow() != null && node != null) {
                 final NodeLabel label = node.getLabel();
                 if (label != null) {
-                    label.notificationCleared(event);
+                    label.notificationCleared();
                     tree.repaint();
                 }
             }

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

@@ -27,6 +27,8 @@ import com.dmdirc.GlobalWindow;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.MutableTreeNode;
+import javax.swing.tree.TreeNode;
 
 /**
  * A simple sorted tree data model based on DefaultTreeModel.
@@ -46,9 +48,7 @@ public class TreeViewModel extends DefaultTreeModel {
      * @param globalConfig The configuration provider to read settings from.
      * @param root         a TreeNode object that is the root of the tree.
      */
-    public TreeViewModel(
-            final AggregateConfigProvider globalConfig,
-            final TreeViewNode root) {
+    public TreeViewModel(final AggregateConfigProvider globalConfig, final TreeNode root) {
         super(root, false);
 
         this.globalConfig = globalConfig;
@@ -61,23 +61,8 @@ public class TreeViewModel extends DefaultTreeModel {
      * @param newChild child to be added.
      * @param parent   parent child is to be added too.
      */
-    public final void insertNodeInto(final TreeViewNode newChild,
-            final TreeViewNode parent) {
-        final int index;
-        index = getIndex(newChild, parent);
-        insertNodeInto(newChild, parent, index);
-    }
-
-    /**
-     * Inserts a new node into the tree and fires the appropriate events.
-     *
-     * @param newChild child to be added.
-     * @param parent   parent child is to be added too.
-     * @param index    Index of item to add
-     */
-    public final void insertNodeInto(final TreeViewNode newChild,
-            final TreeViewNode parent, final int index) {
-        super.insertNodeInto(newChild, parent, index);
+    public final void insertNodeInto(final TreeViewNode newChild, final MutableTreeNode parent) {
+        insertNodeInto(newChild, parent, getIndex(newChild, parent));
     }
 
     /**
@@ -89,7 +74,7 @@ public class TreeViewModel extends DefaultTreeModel {
      *
      * @return index where new node is to be inserted.
      */
-    private int getIndex(final TreeViewNode newChild, final TreeViewNode parent) {
+    private int getIndex(final TreeViewNode newChild, final TreeNode parent) {
         if (newChild.getWindow() instanceof GlobalWindow) {
             return 0;
         }
@@ -101,12 +86,10 @@ public class TreeViewModel extends DefaultTreeModel {
         if (globalConfig.getOptionBool("ui", "sortchildwindows")) {
             for (int i = 0; i < parent.getChildCount(); i++) {
                 final TreeViewNode child = (TreeViewNode) parent.getChildAt(i);
-                if (sortBefore(newChild, child)) {
-                    return i;
-                } else if (!sortAfter(newChild, child) && newChild.
-                        getUserObject().
-                        toString().compareToIgnoreCase(child.getUserObject().
-                                toString()) < 0) {
+                if (sortBefore(newChild, child)
+                        || !sortAfter(newChild, child)
+                        && newChild.getUserObject().toString().compareToIgnoreCase(
+                        child.getUserObject().toString()) < 0) {
                     return i;
                 }
             }

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

@@ -32,7 +32,7 @@ public class TreeViewNodeMenuItem extends JMenuItem {
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** Tree view node. */
-    private TreeViewNode treeNode;
+    private final TreeViewNode treeNode;
 
     /**
      * Creates a new treeviewnodemenuitem.
@@ -58,13 +58,4 @@ public class TreeViewNodeMenuItem extends JMenuItem {
         return treeNode;
     }
 
-    /**
-     * Set the value of treeNode.
-     *
-     * @param treeNode new value of treeNode
-     */
-    public void setTreeNode(final TreeViewNode treeNode) {
-        this.treeNode = treeNode;
-    }
-
 }

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

@@ -110,7 +110,6 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
         if (label == null) {
             return new JLabel("Label == null");
         }
-        final boolean bold;
         Color background = tree.getBackground();
         Color foreground = tree.getForeground();
 
@@ -123,6 +122,7 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
             foreground = colour;
         }
 
+        final boolean bold;
         if (label.isSelected()) {
             bold = activeBold;
             if (!tree.getBackground().equals(activeBackground)) {

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

@@ -46,6 +46,7 @@ import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -70,7 +71,7 @@ public class WindowMenuFrameManager extends JMenu implements ActionListener, Sel
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** Comparator. */
-    private final FrameContainerComparator comparator = new FrameContainerComparator();
+    private final Comparator<FrameContainer> comparator = new FrameContainerComparator();
     /** Non frame container menu count. */
     private final int itemCount;
     /** Menu items closing the active window. */
@@ -388,9 +389,8 @@ public class WindowMenuFrameManager extends JMenu implements ActionListener, Sel
                 continue;
             }
             final FrameContainer child = ((FrameContainerMenuInterface) component).getFrame();
-            if (sortBefore(newChild, child)) {
-                return i;
-            } else if (!sortAfter(newChild, child)
+            if (sortBefore(newChild, child)
+                    || !sortAfter(newChild, child)
                     && globalConfig.getOptionBool("treeview", "sortwindows")
                     && newChild.getName().compareToIgnoreCase(child.getName()) < 0) {
                 return i;