Remove MDI from the client.

Tidy up mainframe (creating a new dialog class).
Fix OptionalJSpinner having an excessive border.

Fixes issue CLIENT-66
Fixes issue CLIENT-2

Change-Id: I450fe4a6060988843caad0b22a1ac2ffad9e4c28
Depends-On: If58397d37b89c8fe6e099c47fb4d26fdc4589b49
Reviewed-on: http://gerrit.dmdirc.com/1630
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/dcc/ui/EmptyWindow.java

@@ -46,7 +46,6 @@ public class EmptyWindow extends TextFrame {
     public EmptyWindow(final SwingController controller, final FrameContainer<?> owner) {
         super(owner, controller);
         setTextPane(null);
-        pack();
     }
 
     /** {@inheritDoc} */

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

@@ -22,31 +22,37 @@
 
 package com.dmdirc.addons.ui_swing;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.addons.ui_swing.components.SplitPane;
-import com.dmdirc.addons.ui_swing.components.desktopPane.DMDircDesktopPane;
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
+import com.dmdirc.addons.ui_swing.dialogs.ConfirmQuitDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.addons.ui_swing.framemanager.FramemanagerPosition;
+import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.FrameInfoListener;
+import com.dmdirc.interfaces.SelectionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.MainWindow;
 import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.util.QueuedLinkedHashSet;
 import com.dmdirc.util.ReturnableThread;
 
 import java.awt.Dimension;
-import java.awt.Dialog.ModalityType;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowFocusListener;
 import java.awt.event.WindowListener;
@@ -57,6 +63,7 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JSplitPane;
 import javax.swing.MenuSelectionManager;
+import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
 
 import net.miginfocom.swing.MigLayout;
@@ -65,7 +72,8 @@ import net.miginfocom.swing.MigLayout;
  * The main application frame.
  */
 public final class MainFrame extends JFrame implements WindowListener,
-        MainWindow, ConfigChangeListener {
+        MainWindow, ConfigChangeListener, SelectionListener,
+        SwingWindowListener, FrameInfoListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -73,12 +81,16 @@ public final class MainFrame extends JFrame implements WindowListener,
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 9;
+    /** Focus queue. */
+    private final QueuedLinkedHashSet<TextFrame> focusOrder;
     /** The main application icon. */
     private ImageIcon imageIcon;
     /** The frame manager that's being used. */
     private FrameManager mainFrameManager;
-    /** Dekstop pane. */
-    private DMDircDesktopPane desktopPane;
+    /** Active frame. */
+    private TextFrame activeFrame;
+    /** Panel holding frame. */
+    private JPanel framePanel;
     /** Main panel. */
     private JPanel frameManagerPanel;
     /** Frame manager position. */
@@ -95,6 +107,8 @@ public final class MainFrame extends JFrame implements WindowListener,
     private final String version;
     /** Main split pane. */
     private SplitPane mainSplitPane;
+    /** Frame manager used for ctrl tab frame switching. */
+    private final CtrlTabWindowManager frameManager;
 
     /**
      * Creates new form MainFrame.
@@ -106,9 +120,11 @@ public final class MainFrame extends JFrame implements WindowListener,
 
         this.controller = controller;
 
+        focusOrder = new QueuedLinkedHashSet<TextFrame>();
         initComponents();
 
-        imageIcon = new ImageIcon(IconManager.getIconManager().getImage("icon"));
+        imageIcon = new ImageIcon(IconManager.getIconManager()
+                .getImage("icon"));
         setIconImage(imageIcon.getImage());
 
         CoreUIUtils.centreWindow(this);
@@ -149,8 +165,11 @@ public final class MainFrame extends JFrame implements WindowListener,
                 MenuSelectionManager.defaultManager().clearSelectedPath();
             }
         });
+        WindowManager.addSelectionListener(this);
+        controller.getWindowFactory().addWindowListener(this);
 
         setTitle(getTitlePrefix());
+        frameManager = new CtrlTabWindowManager(controller, rootPane);
     }
 
     /**
@@ -207,12 +226,12 @@ public final class MainFrame extends JFrame implements WindowListener,
             /** {@inheritDoc} */
             @Override
             public void run() {
-                setObject(desktopPane.getSelectedWindow());
+                setObject(activeFrame);
             }
         });
     }
 
-    /** {@inheritDoc */
+    /** {@inheritDoc} */
     @Override
     public MenuBar getJMenuBar() {
         return (MenuBar) super.getJMenuBar();
@@ -227,8 +246,7 @@ public final class MainFrame extends JFrame implements WindowListener,
     /** {@inheritDoc}. */
     @Override
     public void setTitle(final String title) {
-        if (title != null && getActiveFrame() != null && getActiveFrame().
-                isMaximum()) {
+        if (title != null && getActiveFrame() != null) {
             super.setTitle(getTitlePrefix() + " - " + title);
         } else {
             super.setTitle(getTitlePrefix());
@@ -241,31 +259,15 @@ public final class MainFrame extends JFrame implements WindowListener,
         return "DMDirc" + (showVersion ? " " + version : "");
     }
 
-    /** {@inheritDoc}. */
-    @Override
-    public boolean getMaximised() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<Boolean>() {
-
-            /** {@inheritDoc}. */
-            @Override
-            public void run() {
-                final Window window = getActiveFrame();
-                if (window == null) {
-                    setObject(false);
-                } else {
-                    setObject(getActiveFrame().isMaximum());
-                }
-            }
-        });
-    }
-
     /**
-     * Returns the desktop pane for the frame.
+     * {@inheritDoc}
      *
-     * @return JDesktopPane for the frame
+     * @deprecated MDI is no longer implemented
      */
-    public DMDircDesktopPane getDesktopPane() {
-        return desktopPane;
+    @Deprecated
+    @Override
+    public boolean getMaximised() {
+        return true;
     }
 
     /**
@@ -401,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());
+        activeFrame = null;
+        framePanel = new JPanel(new MigLayout("fill, ins 0"));
         mainSplitPane = new SplitPane(SplitPane.Orientation.HORIZONTAL);
 
         initFrameManagers();
@@ -453,7 +455,7 @@ public final class MainFrame extends JFrame implements WindowListener,
         switch (position) {
             case TOP:
                 mainSplitPane.setTopComponent(frameManagerPanel);
-                mainSplitPane.setBottomComponent(desktopPane);
+                mainSplitPane.setBottomComponent(framePanel);
                 mainSplitPane.setResizeWeight(0.0);
                 mainSplitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
                 frameManagerPanel.setPreferredSize(new Dimension(
@@ -462,7 +464,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                 break;
             case LEFT:
                 mainSplitPane.setLeftComponent(frameManagerPanel);
-                mainSplitPane.setRightComponent(desktopPane);
+                mainSplitPane.setRightComponent(framePanel);
                 mainSplitPane.setResizeWeight(0.0);
                 mainSplitPane.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
                 frameManagerPanel.setPreferredSize(new Dimension(
@@ -470,7 +472,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                         "frameManagerSize"), Integer.MAX_VALUE));
                 break;
             case BOTTOM:
-                mainSplitPane.setTopComponent(desktopPane);
+                mainSplitPane.setTopComponent(framePanel);
                 mainSplitPane.setBottomComponent(frameManagerPanel);
                 mainSplitPane.setResizeWeight(1.0);
                 mainSplitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
@@ -479,7 +481,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                         getOptionInt("ui", "frameManagerSize")));
                 break;
             case RIGHT:
-                mainSplitPane.setLeftComponent(desktopPane);
+                mainSplitPane.setLeftComponent(framePanel);
                 mainSplitPane.setRightComponent(frameManagerPanel);
                 mainSplitPane.setResizeWeight(1.0);
                 mainSplitPane.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
@@ -508,31 +510,23 @@ public final class MainFrame extends JFrame implements WindowListener,
     public void quit(final int exitCode) {
         if (exitCode == 0 && IdentityManager.getGlobalConfig().getOptionBool(
                 "ui", "confirmQuit")) {
-            new StandardQuestionDialog(this, ModalityType.APPLICATION_MODAL,
-                    "Quit confirm",
-                    "You are about to quit DMDirc, are you sure?") {
-
+            final StandardQuestionDialog dialog = new ConfirmQuitDialog(this) {
+                
                 /**
                  * A version number for this class. It should be changed
                  * whenever the class structure is changed (or anything else
                  * that would prevent serialized objects being unserialized
                  * with the new class).
                  */
-                private static final long serialVersionUID = 1;
+                private static final long serialVersionUID = 9;
 
                 /** {@inheritDoc} */
                 @Override
-                public boolean save() {
+                protected void handleQuit() {
                     doQuit(exitCode);
-                    return true;
-                }
-
-                /** {@inheritDoc} */
-                @Override
-                public void cancelled() {
-                    // Do nothing
                 }
-            }.display();
+            };
+            dialog.display();
             return;
         }
         doQuit(exitCode);
@@ -543,7 +537,7 @@ public final class MainFrame extends JFrame implements WindowListener,
      *
      * @param exitCode Exit code
      */
-    private void doQuit(final int exitCode) {
+    public void doQuit(final int exitCode) {
         this.exitCode = exitCode;
 
         new LoggingSwingWorker() {
@@ -575,7 +569,8 @@ public final class MainFrame extends JFrame implements WindowListener,
         if ("ui".equals(domain)) {
             if ("lookandfeel".equals(key)) {
                 controller.updateLookAndFeel();
-            } else if ("framemanager".equals(key) || "framemanagerPosition".equals(key)) {
+            } else if ("framemanager".equals(key)
+                    || "framemanagerPosition".equals(key)) {
                 UIUtilities.invokeLater(new Runnable() {
 
                     /** {@inheritDoc} */
@@ -603,4 +598,72 @@ public final class MainFrame extends JFrame implements WindowListener,
             });
         }
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void selectionChanged(final FrameContainer<?> window) {
+        activeFrame = (TextFrame) controller.getWindowFactory()
+                .getSwingWindow(window);
+        focusOrder.offerAndMove(activeFrame);
+        framePanel.setVisible(false);
+        framePanel.removeAll();
+        if (activeFrame == null) {
+            framePanel.add(new JPanel(), "grow");
+            setTitle(null);
+        } else {
+            framePanel.add(activeFrame, "grow");
+            setTitle(window.getTitle());
+        }
+        framePanel.setVisible(true);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void windowAdded(final Window parent, final Window window) {
+        if (activeFrame == null) {
+            window.getContainer().activateFrame();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void windowDeleted(final Window parent, final Window window) {
+        focusOrder.remove((TextFrame) window);
+        if (activeFrame.equals(window)) {
+            activeFrame = null;
+            framePanel.setVisible(false);
+            framePanel.removeAll();
+            framePanel.setVisible(true);
+            if (focusOrder.peek() == null) {
+                SwingUtilities.invokeLater(new Runnable() {
+
+                    /** {@inheritDoc} */
+                    @Override
+                    public void run() {
+                        frameManager.scrollUp();
+                    }
+                });
+            } else {
+                focusOrder.peek().getContainer().activateFrame();
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void iconChanged(final FrameContainer<?> window, final String icon) {
+        //Ignore
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void nameChanged(final FrameContainer<?> window, final String name) {
+        //Ignore
+    }
+
+    @Override
+    public void titleChanged(final FrameContainer<?> window,
+            final String title) {
+        setTitle(title);
+    }
 }

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

@@ -48,6 +48,7 @@ import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.SSLCertificateDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
 import com.dmdirc.addons.ui_swing.dialogs.url.URLDialog;
+import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.SwingFirstRunWizard;
 import com.dmdirc.config.Identity;
@@ -824,19 +825,14 @@ public class SwingController extends Plugin implements Serializable,
     private PreferencesCategory createAdvancedCategory() {
         final PreferencesCategory advanced = new PluginPreferencesCategory(
                 getPluginInfo(), "Advanced", "");
-        final Map<String, String> options = new HashMap<String, String>();
-
-        options.put("alwaysShow", "Always show");
-        options.put("neverShow", "Never show");
-        options.put("showWhenMaximised", "Show only when windows maximised");
 
         advanced.addSetting(new PreferencesSetting(PreferencesType.OPTIONALINTEGER,
                 new NumericalValidator(10, -1), "ui", "frameBufferSize",
                 "Window buffer size", "The maximum number of lines in a window"
                 + " buffer"));
-        advanced.addSetting(new PreferencesSetting("ui", "mdiBarVisibility",
-                "MDI Bar Visibility", "Controls the visibility of the MDI bar",
-                options));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "mdiBarVisibility",
+                "MDI Bar Visibility", "Controls the visibility of the MDI bar"));
         advanced.addSetting(
                 new PreferencesSetting(PreferencesType.BOOLEAN, "ui",
                 "useOneTouchExpandable", "Use one touch expandable split panes?",

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

@@ -169,7 +169,7 @@ public class SwingWindowFactory implements FrameListener {
                 }
 
                 if (focus) {
-                    childWindow.open();
+                    childWindow.activateFrame();
                 }
             }
         });

src/com/dmdirc/addons/ui_swing/actions/NextFrameAction.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.actions;
 
-import com.dmdirc.addons.ui_swing.components.desktopPane.DMDircDesktopPane;
+import com.dmdirc.addons.ui_swing.components.TreeScroller;
 
 import java.awt.event.ActionEvent;
 
@@ -39,18 +39,17 @@ public class NextFrameAction extends AbstractAction {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    /** Desktop pane. */
-    private final DMDircDesktopPane desktopPane;
+    /** Tree scroller used to go up and down the frame manager. */
+    private final TreeScroller manager;
 
     /**
      * Creates a new next frame action.
      *
-     * @param pane Desktop pane
+     * @param manager Tree scroller to scroll with
      */
-    public NextFrameAction(final DMDircDesktopPane pane) {
+    public NextFrameAction(final TreeScroller manager) {
         super();
-
-        desktopPane = pane;
+        this.manager = manager;
     }
 
     /**
@@ -60,6 +59,6 @@ public class NextFrameAction extends AbstractAction {
      */
     @Override
     public void actionPerformed(final ActionEvent evt) {
-        desktopPane.scrollDown();
+        manager.changeFocus(false);
     }
 }

src/com/dmdirc/addons/ui_swing/actions/PreviousFrameAction.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.actions;
 
-import com.dmdirc.addons.ui_swing.components.desktopPane.DMDircDesktopPane;
+import com.dmdirc.addons.ui_swing.components.TreeScroller;
 
 import java.awt.event.ActionEvent;
 
@@ -39,18 +39,17 @@ public class PreviousFrameAction extends AbstractAction {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    /** Desktop pane. */
-    private final DMDircDesktopPane desktopPane;
+    /** Tree scroller used to go up and down the frame manager. */
+    private final TreeScroller manager;
 
     /**
      * Creates a new previous frame action.
      *
-     * @param pane Desktop pane
+     * @param manager Tree scroller to scroll with
      */
-    public PreviousFrameAction(final DMDircDesktopPane pane) {
+    public PreviousFrameAction(final TreeScroller manager) {
         super();
-
-        desktopPane = pane;
+        this.manager = manager;
     }
 
     /**
@@ -60,6 +59,6 @@ public class PreviousFrameAction extends AbstractAction {
      */
     @Override
     public void actionPerformed(final ActionEvent evt) {
-        desktopPane.scrollUp();
+        manager.changeFocus(true);
     }
 }

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

@@ -35,6 +35,12 @@ import javax.swing.event.ChangeListener;
  */
 public class CheckBoxMenuItem extends JCheckBoxMenuItem {
 
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
     /** Menu path to use when clicked. */
     private static MenuElement[] path;
 

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

@@ -1,17 +1,16 @@
 /*
- * 
  * 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
@@ -27,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowListener;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
@@ -38,33 +36,36 @@ import com.dmdirc.ui.interfaces.Window;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 
-import javax.swing.JInternalFrame;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 
 import net.miginfocom.swing.MigLayout;
 
 /**
- * Provides an MDI style bar for restore/minimise/close.
+ * Provides an MDI style bar for closing frames.
  */
-public class MDIBar extends JPanel implements SwingWindowListener, SelectionListener,
-        PropertyChangeListener, ActionListener, ConfigChangeListener {
+public class MDIBar extends JPanel implements SwingWindowListener,
+        SelectionListener, ActionListener, ConfigChangeListener {
 
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
     private static final long serialVersionUID = -8028057596226636245L;
+    /** Icon size for the close button. */
     private static final int ICON_SIZE = 12;
-    private NoFocusButton closeButton;
-    private NoFocusButton minimiseButton;
-    private NoFocusButton restoreButton;
-    private MainFrame mainFrame;
-    private ConfigManager config;
-    private String visibility;
-    /** Active frame. */
-    private Window activeFrame;
-    /** Swing controller. */
-    private SwingController controller;
+    /** Button to close frames. */
+    private final NoFocusButton closeButton;
+    /** Main frame component bieng shown in. */
+    private final MainFrame mainFrame;
+    /** Config manager to get settings from. */
+    private final ConfigManager config;
+    /** Option domain. */
+    private final String configDomain;
+    /** Are we meant to be visible? */
+    private boolean visibility;
 
     /**
      * Instantiates a new MDI bar.
@@ -73,31 +74,25 @@ public class MDIBar extends JPanel implements SwingWindowListener, SelectionList
      * @param mainFrame Main frame instance
      */
     public MDIBar(final SwingController controller, final MainFrame mainFrame) {
+        super();
+
         this.mainFrame = mainFrame;
         this.config = IdentityManager.getGlobalConfig();
-        this.controller = controller;
-        visibility = config.getOption("ui", "mdiBarVisibility");
+        this.configDomain = controller.getDomain();
+        visibility = config.getOptionBool(configDomain, "mdiBarVisibility");
 
         closeButton = new NoFocusButton(IconManager.getIconManager().
                 getScaledIcon("close-12", ICON_SIZE, ICON_SIZE));
-        minimiseButton = new NoFocusButton(IconManager.getIconManager().
-                getScaledIcon("minimise-12", ICON_SIZE, ICON_SIZE));
-        restoreButton = new NoFocusButton(IconManager.getIconManager().
-                getScaledIcon("maximise-12", ICON_SIZE, ICON_SIZE));
 
         setOpaque(false);
         setLayout(new MigLayout("hmax 17, ins 1 0 0 0, fill"));
-        add(minimiseButton, "w 17!, h 17!, right");
-        add(restoreButton, "w 17!, h 17!, right");
         add(closeButton, "w 17!, h 17!, right");
 
         controller.getWindowFactory().addWindowListener(this);
 
         WindowManager.addSelectionListener(this);
         closeButton.addActionListener(this);
-        minimiseButton.addActionListener(this);
-        restoreButton.addActionListener(this);
-        config.addChangeListener("ui", "mdiBarVisibility", this);
+        config.addChangeListener(configDomain, "mdiBarVisibility", this);
 
         check();
     }
@@ -106,28 +101,19 @@ public class MDIBar extends JPanel implements SwingWindowListener, SelectionList
     @Override
     public void setEnabled(final boolean enabled) {
         closeButton.setEnabled(enabled);
-        minimiseButton.setEnabled(enabled);
-        restoreButton.setEnabled(enabled);
     }
 
+    /**
+     * Checks whether this MDI bar should be visible and active and sets itself
+     * accordingly.
+     */
     private void check() {
         SwingUtilities.invokeLater(new Runnable() {
 
             @Override
             public void run() {
-                boolean show = true;
-                if (mainFrame == null) {
-                    show = false;
-                    return;
-                } else if ("alwaysShow".equalsIgnoreCase(visibility)) {
-                    show = mainFrame.getDesktopPane().getAllFrames().length > 0;
-                } else if ("neverShow".equalsIgnoreCase(visibility)) {
-                    show = false;
-                } else if ("showWhenMaximised".equalsIgnoreCase(visibility)) {
-                    show = mainFrame.getMaximised();
-                }
-                setVisible(show);
-                setEnabled(mainFrame.getDesktopPane().getAllFrames().length > 0);
+                setVisible(visibility);
+                setEnabled(mainFrame.getActiveFrame() != null);
             }
         });
     }
@@ -135,31 +121,12 @@ public class MDIBar extends JPanel implements SwingWindowListener, SelectionList
     /** {@inheritDoc} */
     @Override
     public void windowAdded(final Window parent, final Window window) {
-        ((JInternalFrame) window).addPropertyChangeListener(
-                "maximum", this);
-
         check();
     }
 
     /** {@inheritDoc} */
     @Override
     public void windowDeleted(final Window parent, final Window window) {
-        ((JInternalFrame) window).removePropertyChangeListener(
-                this);
-
-        check();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void propertyChange(final PropertyChangeEvent evt) {
-        if ((Boolean) evt.getNewValue()) {
-            restoreButton.setIcon(IconManager.getIconManager().getScaledIcon(
-                    "restore-12", ICON_SIZE, ICON_SIZE));
-        } else {
-            restoreButton.setIcon(IconManager.getIconManager().getScaledIcon(
-                    "maximise-12", ICON_SIZE, ICON_SIZE));
-        }
         check();
     }
 
@@ -170,29 +137,24 @@ public class MDIBar extends JPanel implements SwingWindowListener, SelectionList
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        if (activeFrame == null) {
+        if (mainFrame.getActiveFrame() == null) {
             return;
         }
         if (closeButton.equals(e.getSource())) {
-            activeFrame.close();
-        } else if (minimiseButton.equals(e.getSource())) {
-            ((TextFrame) activeFrame).minimise();
-        } else if (restoreButton.equals(e.getSource())) {
-            activeFrame.toggleMaximise();
+            mainFrame.getActiveFrame().close();
         }
     }
 
     /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
-        visibility = config.getOption("ui", "mdiBarVisibility");
+        visibility = config.getOptionBool(configDomain, "mdiBarVisibility");
         check();
     }
 
     /** {@inheritDoc} */
     @Override
     public void selectionChanged(final FrameContainer<?> window) {
-        activeFrame = controller.getWindowFactory().getSwingWindow(window);
         check();
     }
 }

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

@@ -122,7 +122,9 @@ public class TreeScroller implements MouseWheelListener {
      * Removes this tree scroller from the tree.
      */
     public void unregister() {
-        tree.removeMouseWheelListener(this);
+        if (tree != null) {
+            tree.removeMouseWheelListener(this);
+        }
     }
 
     /**

src/com/dmdirc/addons/ui_swing/components/desktopPane/DMDircDesktopPane.java

@@ -1,471 +0,0 @@
-/*
- * 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.components.desktopPane;
-
-import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.BackgroundOption;
-import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.SwingWindowListener;
-import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.TreeScroller;
-import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewModel;
-import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewNode;
-import com.dmdirc.addons.ui_swing.framemanager.windowmenu.JInternalFrameComparator;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.interfaces.SelectionListener;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.interfaces.Window;
-import com.dmdirc.util.ReturnableThread;
-import com.dmdirc.util.URLBuilder;
-
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Stack;
-import java.util.concurrent.atomic.AtomicBoolean;
-import javax.imageio.ImageIO;
-
-import javax.swing.BorderFactory;
-import javax.swing.JComponent;
-import javax.swing.JDesktopPane;
-import javax.swing.JInternalFrame;
-import javax.swing.UIManager;
-import javax.swing.plaf.DesktopPaneUI;
-import javax.swing.tree.DefaultTreeSelectionModel;
-import javax.swing.tree.TreeNode;
-import javax.swing.tree.TreePath;
-import javax.swing.tree.TreeSelectionModel;
-
-/**
- * DMDirc Extentions to JDesktopPane.
- */
-public class DMDircDesktopPane extends JDesktopPane implements
-        SwingWindowListener, SelectionListener, PropertyChangeListener,
-        ConfigChangeListener {
-
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-    /** The current number of pixels to displace new frames in the X
-     * direction. */
-    private int xOffset;
-    /** The current number of pixels to displace new frames in the Y
-     * direction. */
-    private int yOffset;
-    /** The number of pixels each new internal frame is offset by. */
-    private static final int FRAME_OPENING_OFFSET = 30;
-    /** Node storage, used for adding and deleting nodes correctly. */
-    private final Map<Window, TreeViewNode> nodes;
-    /** Data model. */
-    private final TreeViewModel model;
-    /** Selected model. */
-    private final TreeSelectionModel selectionModel;
-    /** Tree Scroller. */
-    private final TreeScroller treeScroller;
-    /** Selected window. */
-    private Window selectedWindow;
-    /** Maximised state. */
-    private boolean maximised;
-    /** Changing maximisation. */
-    private final AtomicBoolean changing = new AtomicBoolean(false);
-    /** Main Frame. */
-    private final MainFrame mainFrame;
-    /** Background image. */
-    private Image backgroundImage;
-    /** Background image option. */
-    private BackgroundOption backgroundOption;
-    /** Config domain. */
-    private final String domain;
-    /** Swing controller. */
-    private final SwingController controller;
-
-    /**
-     * Initialises the DMDirc desktop pane.
-     *
-     * @param controller The controller that owns this desktop pane
-     * @param mainFrame Main frame
-     * @param domain Config domain
-     */
-    public DMDircDesktopPane(final SwingController controller,
-            final MainFrame mainFrame, final String domain) {
-        super();
-
-        this.mainFrame = mainFrame;
-        this.domain = domain;
-        this.controller = controller;
-        setBackground(UIManager.getColor("Panel.background"));
-        setBorder(BorderFactory.createEtchedBorder());
-
-        nodes = new HashMap<Window, TreeViewNode>();
-        model = new TreeViewModel(new TreeViewNode(null, null));
-        selectionModel = new DefaultTreeSelectionModel();
-        treeScroller = new TreeScroller(model, selectionModel, false) {
-
-            /** {@inheritDoc} */
-            @Override
-            protected void setPath(final TreePath path) {
-                super.setPath(path);
-                ((TreeViewNode) path.getLastPathComponent()).getWindow().
-                        activateFrame();
-            }
-        };
-
-        controller.getWindowFactory().addWindowListener(this);
-
-        IdentityManager.getGlobalConfig().addChangeListener(domain,
-                "desktopbackground", this);
-        IdentityManager.getGlobalConfig().addChangeListener(domain,
-                "desktopbackgroundoption", this);
-
-        updateCachedSettings();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void paintComponent(final Graphics g) {
-        if (backgroundImage == null) {
-            super.paintComponent(g);
-        } else {
-            UIUtilities.paintBackground((Graphics2D) g, getBounds(),
-                    backgroundImage, backgroundOption);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setUI(final DesktopPaneUI ui) {
-        if (ui instanceof ProxyDesktopPaneUI) {
-            super.setUI(ui);
-        } else {
-            super.setUI(new ProxyDesktopPaneUI(ui, this));
-        }
-    }
-
-    /**
-     * Add a specified component at the specified index.
-     *
-     * @param comp Component to add
-     * @param index Index for insertion
-     */
-    public void add(final JComponent comp, final int index) {
-        addImpl(comp, null, index);
-
-        // Make sure it'll fit with our offsets
-        if (comp.getWidth() + xOffset > getWidth()) {
-            xOffset = 0;
-        }
-        if (comp.getHeight() + yOffset > getHeight()) {
-            yOffset = 0;
-        }
-
-        // Position the frame
-        comp.setLocation(xOffset, yOffset);
-
-        // Increase the offsets
-        xOffset += FRAME_OPENING_OFFSET;
-        yOffset += FRAME_OPENING_OFFSET;
-    }
-
-    /**
-     * Arranges the windows in the specified number of rows and columns.
-     *
-     * @param windows Windows to arranges
-     * @param columns Number of columns to use
-     * @param rows Number of rows to use
-     */
-    private void tileWindows(final JInternalFrame[] windows, final int columns,
-            final int rows) {
-        ((TextFrame) windows[0]).restore();
-        final int total = windows.length;
-        final int windowWidth = getWidth() / columns;
-        final int windowHeight = getHeight() / rows;
-
-        int column = 0;
-        int x = 0;
-        int y = 0;
-        for (int i = 0; i < total; i++) {
-            windows[i].setBounds(x, y, windowWidth, windowHeight);
-            column++;
-            x += windowWidth;
-            if (column >= columns) {
-                column = 0;
-                x = 0;
-                y += windowHeight;
-            }
-        }
-    }
-
-    /**
-     * Arranges the windows to be equal size in a grid.
-     */
-    public void tileWindows() {
-        if (getAllFrames().length == 0) {
-            return;
-        }
-        final JInternalFrame[] windows = getAllFrames();
-        Arrays.sort(windows, new JInternalFrameComparator());
-        final int total = windows.length;
-        final int columns = (int) Math.floor(Math.sqrt(total));
-        final int rows = (int) (Math.ceil(((double) total) / columns));
-        tileWindows(windows, columns, rows);
-    }
-
-    /**
-     * Arranges the windows to be equal size in a horizontal row.
-     */
-    public void tileHorizontally() {
-        if (getAllFrames().length == 0) {
-            return;
-        }
-        final JInternalFrame[] windows = getAllFrames();
-        Arrays.sort(windows, new JInternalFrameComparator());
-        tileWindows(windows, 1, windows.length);
-    }
-
-    /**
-     * Arranges the windows to be equal size in a vertical row.
-     */
-    public void tileVertically() {
-        if (getAllFrames().length == 0) {
-            return;
-        }
-        final JInternalFrame[] windows = getAllFrames();
-        Arrays.sort(windows, new JInternalFrameComparator());
-        tileWindows(windows, windows.length, 1);
-    }
-
-    /**
-     * Returns the select window.
-     *
-     * @return Selected window, or null.
-     */
-    public Window getSelectedWindow() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<Window>() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                setObject(selectedWindow);
-            }
-        });
-    }
-
-    @Override
-    public void windowAdded(final Window parent, final Window window) {
-        UIUtilities.invokeAndWait(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                synchronized (nodes) {
-                    addWindow(parent == null ? model.getRootNode() : nodes.get(
-                            parent), window);
-                }
-            }
-        });
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void windowDeleted(final Window parent, final Window window) {
-        UIUtilities.invokeAndWait(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                remove((JInternalFrame) window);
-                if (nodes == null || nodes.get(window) == null) {
-                    return;
-                }
-                final TreeViewNode 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);
-                window.getContainer().removeSelectionListener(
-                        DMDircDesktopPane.this);
-                ((TextFrame) window).removePropertyChangeListener(
-                        DMDircDesktopPane.this);
-                if (getAllFrames().length == 0) {
-                    mainFrame.setTitle(null);
-                }
-            }
-        });
-    }
-
-    /**
-     * Adds a window to the frame container.
-     *
-     * @param parent Parent node
-     * @param window Window to add
-     */
-    public void addWindow(final TreeViewNode parent, final Window window) {
-        UIUtilities.invokeAndWait(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                add((JInternalFrame) window, getAllFrames().length - 1);
-                final TreeViewNode node = new TreeViewNode(null, window.
-                        getContainer());
-                synchronized (nodes) {
-                    nodes.put(window, node);
-                }
-                node.setUserObject(window);
-                model.insertNodeInto(node, parent);
-                window.getContainer().addSelectionListener(
-                        DMDircDesktopPane.this);
-                ((TextFrame) window).addPropertyChangeListener(
-                        DMDircDesktopPane.this);
-            }
-        });
-    }
-
-    /** Scrolls up. */
-    public void scrollUp() {
-        treeScroller.changeFocus(true);
-    }
-
-    /** Scrolls down. */
-    public void scrollDown() {
-        treeScroller.changeFocus(false);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void selectionChanged(final FrameContainer<?> window) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                selectedWindow = controller.getWindowFactory().getSwingWindow(
-                        window);
-                final TreeNode[] path = model.getPathToRoot(nodes.get(
-                        selectedWindow));
-                if (path != null && path.length > 0) {
-                    selectionModel.setSelectionPath(new TreePath(path));
-                }
-                if (selectedWindow instanceof InputTextFrame) {
-                    ((InputTextFrame) selectedWindow).requestInputFieldFocus();
-                }
-                mainFrame.setTitle(selectedWindow.getContainer().getTitle());
-            }
-        });
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void propertyChange(final PropertyChangeEvent evt) {
-        if ("title".equals(evt.getPropertyName())) {
-            handleTitleEvent((Window) evt.getSource(),
-                    ((Window) evt.getSource()).getContainer().getTitle());
-        } else if ("maximum".equals(evt.getPropertyName())) {
-            handleMaximiseEvent((Boolean) evt.getNewValue(),
-                    ((Window) evt.getSource()).getContainer().getTitle());
-        }
-    }
-
-    private void handleTitleEvent(final Window window, final String title) {
-        if (maximised && window == selectedWindow) {
-            mainFrame.setTitle(title);
-        } else if (!maximised) {
-            mainFrame.setTitle(null);
-        }
-    }
-
-    private void handleMaximiseEvent(final boolean isMaximised,
-            final String title) {
-        if (changing.getAndSet(true)) {
-            return;
-        }
-
-        maximised = isMaximised;
-        final Stack<JInternalFrame> stack = new Stack<JInternalFrame>();
-        stack.addAll(Arrays.asList(getAllFrames()));
-
-        while (!stack.empty()) {
-            final JInternalFrame frame = stack.pop();
-            if (isMaximised && !frame.isMaximum()) {
-                ((Window) frame).maximise();
-            } else if (!isMaximised && frame.isMaximum()) {
-                ((Window) frame).restore();
-            }
-        }
-        if (selectedWindow != null) {
-            selectedWindow.activateFrame();
-        }
-        mainFrame.setTitle(isMaximised ? title : null);
-        changing.set(false);
-    }
-
-    private void updateCachedSettings() {
-        final String backgroundPath = IdentityManager.getGlobalConfig().
-                getOption(domain, "desktopbackground");
-        UIUtilities.invokeAndWait(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                try {
-                    final URL url = URLBuilder.buildURL(backgroundPath);
-                    if (url != null) {
-                        backgroundImage = ImageIO.read(url);
-                    }
-                } catch (IOException ex) {
-                    backgroundImage = null;
-                }
-            }
-        });
-        backgroundOption = BackgroundOption.valueOf(IdentityManager
-                .getGlobalConfig().getOption(domain,
-                "desktopbackgroundoption"));
-        repaint();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void configChanged(final String domain, final String key) {
-        updateCachedSettings();
-    }
-}

src/com/dmdirc/addons/ui_swing/components/desktopPane/ProxyDesktopPaneUI.java

@@ -1,93 +0,0 @@
-/*
- *
- * 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.components.desktopPane;
-
-import com.dmdirc.addons.ui_swing.actions.NextFrameAction;
-import com.dmdirc.addons.ui_swing.actions.PreviousFrameAction;
-
-import javax.swing.ActionMap;
-import javax.swing.DefaultDesktopManager;
-import javax.swing.InputMap;
-import javax.swing.JComponent;
-import javax.swing.JDesktopPane;
-import javax.swing.KeyStroke;
-import javax.swing.plaf.DesktopPaneUI;
-
-/**
- * Proxy desktop pane ui, proxies and adds custom key bindings.
- */
-public class ProxyDesktopPaneUI extends DesktopPaneUI {
-
-    private final DesktopPaneUI ui;
-    private final DMDircDesktopPane desktopPane;
-    private InputMap inputMap;
-    private ActionMap actionMap;
-
-    /**
-     * Creates a new proxying desktop pane ui.
-     *
-     * @param ui UI to proxy to
-     * @param desktopPane desktop pane to use
-     */
-    public ProxyDesktopPaneUI(final DesktopPaneUI ui,
-            final DMDircDesktopPane desktopPane) {
-        super();
-
-        this.ui = ui;
-        this.desktopPane = desktopPane;
-        initInputActionMap();
-    }
-
-    private void initInputActionMap() {
-        inputMap = new InputMap();
-        actionMap = new ActionMap();
-
-        inputMap.put(KeyStroke.getKeyStroke("ctrl shift pressed TAB"),
-                "selectPreviousFrame");
-        inputMap.put(KeyStroke.getKeyStroke("ctrl pressed TAB"),
-                "selectNextFrame");
-
-        actionMap.put("selectNextFrame", new NextFrameAction(desktopPane));
-        actionMap.put("selectPreviousFrame",
-                new PreviousFrameAction(desktopPane));
-    }
-
-    /** @inheritDoc} */
-    @Override
-    public void installUI(final JComponent c) {
-        ui.installUI(c);
-        c.setInputMap(JDesktopPane.WHEN_IN_FOCUSED_WINDOW, null);
-        c.setInputMap(JDesktopPane.WHEN_FOCUSED, null);
-        c.setInputMap(JDesktopPane.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT,
-                inputMap);
-        c.setActionMap(actionMap);
-        ((JDesktopPane) c).setDesktopManager(new DefaultDesktopManager());
-    }
-
-    /** @inheritDoc} */
-    @Override
-    public void uninstallUI(final JComponent c) {
-        ui.uninstallUI(c);
-    }
-}

src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java

@@ -65,16 +65,14 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 10;
-    /** This channel's command parser. */
-    private final CommandParser commandParser;
+    /** The channel object that owns this frame. */
+    private final Channel parentChannel;
+    /** Identity. */
+    private final Identity identity;
     /** split pane. */
     private SplitPane splitPane;
     /** popup menu item. */
     private JMenuItem settingsMI;
-    /** The channel object that owns this frame. */
-    private final Channel parentChannel;
-    /** Identity. */
-    private Identity identity;
     /** Nicklist. */
     private NickList nicklist;
     /** Topic bar. */
@@ -104,10 +102,8 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
                 "shownicklist", this);
         ActionManager.addListener(this, CoreActionType.CLIENT_CLOSING);
 
-        commandParser = owner.getCommandParser();
-
-        setInputHandler(new SwingInputHandler(getInputField(), commandParser,
-                this));
+        setInputHandler(new SwingInputHandler(getInputField(), 
+                owner.getCommandParser(), this));
 
         identity = IdentityManager.getChannelConfig(getChannel().getServer().
                 getNetwork(), getChannel().getChannelInfo().getName());
@@ -191,13 +187,12 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
 
         splitPane = new SplitPane(SplitPane.Orientation.HORIZONTAL);
 
-        getContentPane().setLayout(new MigLayout(
-                "fill, ins 0, hidemode 3, wrap 1"));
+        setLayout(new MigLayout("fill, ins 0, hidemode 3, wrap 1"));
 
-        getContentPane().add(topicBar, "growx, pushx");
-        getContentPane().add(splitPane, "grow, push");
-        getContentPane().add(getSearchBar(), "growx, pushx");
-        getContentPane().add(inputPanel, "growx, pushx");
+        add(topicBar, "growx");
+        add(splitPane, "grow, push");
+        add(getSearchBar(), "growx");
+        add(inputPanel, "growx");
 
         splitPane.setLeftComponent(getTextPane());
         if (getContainer().getConfigManager().getOptionBool(getController()
@@ -208,8 +203,6 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         }
         splitPane.setResizeWeight(1);
         splitPane.setDividerLocation(-1);
-
-        pack();
     }
 
     /**

src/com/dmdirc/addons/ui_swing/components/frames/CustomFrame.java

@@ -31,8 +31,6 @@ import net.miginfocom.swing.MigLayout;
 
 /**
  * A very basic custom frame.
- * 
- * @author chris
  */
 public class CustomFrame extends TextFrame {
 
@@ -49,7 +47,8 @@ public class CustomFrame extends TextFrame {
      * @param owner The frame container that owns this frame
      * @param controller Swing controller
      */
-    public CustomFrame(final SwingController controller, final FrameContainer<?> owner) {
+    public CustomFrame(final SwingController controller,
+            final FrameContainer<?> owner) {
         super(owner, controller);
 
         initComponents();
@@ -59,11 +58,9 @@ public class CustomFrame extends TextFrame {
      * Initialises components in this frame.
      */
     private void initComponents() {
-        getContentPane().setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
-        getContentPane().add(getTextPane(), "grow, push");
-        getContentPane().add(getSearchBar(), "growx, pushx");
-
-        pack();
+        setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
+        add(getTextPane(), "grow, push");
+        add(getSearchBar(), "growx, pushx");
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/components/frames/CustomInputFrame.java

@@ -36,8 +36,6 @@ import net.miginfocom.swing.MigLayout;
 /**
  * A custom frame that includes an input field (for use with writable
  * containers).
- * 
- * @author chris
  */
 public class CustomInputFrame extends InputTextFrame {
 
@@ -50,7 +48,7 @@ public class CustomInputFrame extends InputTextFrame {
 
     /**
      * Creates a new instance of CustomInputFrame.
-     * 
+     *
      * @param owner The frame container that owns this frame
      * @param controller Swing controller
      */
@@ -58,7 +56,8 @@ public class CustomInputFrame extends InputTextFrame {
             final WritableFrameContainer<? extends InputWindow> owner) {
         super(controller, owner);
 
-        setInputHandler(new SwingInputHandler(getInputField(), owner.getCommandParser(), this));
+        setInputHandler(new SwingInputHandler(getInputField(),
+                owner.getCommandParser(), this));
 
         initComponents();
     }
@@ -68,19 +67,18 @@ public class CustomInputFrame extends InputTextFrame {
     @Deprecated
     @SuppressWarnings("unchecked")
     public final CommandParser getCommandParser() {
-        return ((WritableFrameContainer<? extends InputWindow>) frameParent).getCommandParser();
+        return ((WritableFrameContainer<? extends InputWindow>) frameParent)
+                .getCommandParser();
     }
 
     /**
      * Initialises components in this frame.
      */
     private void initComponents() {
-        getContentPane().setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
-        getContentPane().add(getTextPane(), "grow, push");
-        getContentPane().add(getSearchBar(), "growx, pushx");
-        getContentPane().add(inputPanel, "growx, pushx");
-
-        pack();
+        setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
+        add(getTextPane(), "grow, push");
+        add(getSearchBar(), "growx, pushx");
+        add(inputPanel, "growx, pushx");
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

@@ -52,7 +52,6 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.KeyStroke;
-import javax.swing.event.InternalFrameEvent;
 
 import net.miginfocom.layout.PlatformDefaults;
 
@@ -318,7 +317,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             if (point != null) {
                 initPopupMenu();
                 inputFieldPopup.show(this, (int) point.getX(),
-                        (int) point.getY() + getTextPane().getHeight() + (int) PlatformDefaults.
+                        (int) point.getY() + getTextPane().getHeight()
+                        + (int) PlatformDefaults.
                         getUnitValueX("related").getValue());
             }
         }
@@ -339,13 +339,14 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         }
 
         try {
-            //get the contents of the input field and combine it with the clipboard
+            //get the contents of the input field and combine it with the
+            //clipboard
             clipboard = (String) Toolkit.getDefaultToolkit().
                     getSystemClipboard().getData(DataFlavor.stringFlavor);
             doPaste(clipboard);
         } catch (IOException ex) {
-            Logger.userError(ErrorLevel.LOW, "Unable to get clipboard contents: " + ex.
-                    getMessage());
+            Logger.userError(ErrorLevel.LOW,
+                    "Unable to get clipboard contents: " + ex.getMessage());
         } catch (UnsupportedFlavorException ex) {
             Logger.userError(ErrorLevel.LOW, "Unsupported clipboard type", ex);
         }
@@ -479,17 +480,15 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         }
     }
 
-    /**
-     * Activates the input field on frame focus. {@inheritDoc}
-     *
-     * @param event Internal frame event
-     */
+    /** {@inheritDoc} */
     @Override
-    public void internalFrameActivated(final InternalFrameEvent event) {
-        super.internalFrameActivated(event);
+    public void activateFrame() {
+        super.activateFrame();
         if (useAwayIndicator && getContainer().getServer() != null) {
             awayLabel.setVisible(getContainer().getServer().isAway());
         }
         inputField.requestFocusInWindow();
     }
+
+
 }

src/com/dmdirc/addons/ui_swing/components/frames/QueryFrame.java

@@ -43,12 +43,10 @@ public final class QueryFrame extends InputTextFrame implements QueryWindow {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 8;
-    /** This channel's command parser. */
-    private final CommandParser commandParser;
 
     /**
      * Creates a new QueryFrame.
-     * 
+     *
      * @param owner Parent Frame container
      * @param controller Swing controller
      */
@@ -57,9 +55,8 @@ public final class QueryFrame extends InputTextFrame implements QueryWindow {
 
         initComponents();
 
-        commandParser = owner.getCommandParser();
-
-        setInputHandler(new SwingInputHandler(getInputField(), commandParser, this));
+        setInputHandler(new SwingInputHandler(getInputField(),
+                owner.getCommandParser(), this));
     }
 
     /** {@inheritDoc} */
@@ -73,12 +70,10 @@ public final class QueryFrame extends InputTextFrame implements QueryWindow {
      * Initialises components in this frame.
      */
     private void initComponents() {
-        getContentPane().setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
-        getContentPane().add(getTextPane(), "grow, push");
-        getContentPane().add(getSearchBar(), "growx, pushx");
-        getContentPane().add(inputPanel, "growx, pushx");
-
-        pack();
+        setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
+        add(getTextPane(), "grow, push");
+        add(getSearchBar(), "growx, pushx");
+        add(inputPanel, "growx, pushx");
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/components/frames/ServerFrame.java

@@ -51,14 +51,12 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 9;
-    /** This channel's command parser. */
-    private final CommandParser commandParser;
     /** popup menu item. */
     private JMenuItem settingsMI;
 
     /**
      * Creates a new ServerFrame.
-     * 
+     *
      * @param owner Parent Frame container
      * @param controller Swing controller
      */
@@ -66,10 +64,9 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
         super(controller, owner);
 
         initComponents();
-        
-        commandParser = owner.getCommandParser();
 
-        setInputHandler(new SwingInputHandler(getInputField(), commandParser, this));
+        setInputHandler(new SwingInputHandler(getInputField(),
+                owner.getCommandParser(), this));
     }
 
     /** {@inheritDoc} */
@@ -86,17 +83,15 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
         settingsMI = new JMenuItem("Settings");
         settingsMI.addActionListener(this);
 
-        getContentPane().setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
-        getContentPane().add(getTextPane(), "grow, push");
-        getContentPane().add(getSearchBar(), "growx, pushx");
-        getContentPane().add(inputPanel, "growx, pushx");
-
-        pack();
+        setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
+        add(getTextPane(), "grow, push");
+        add(getSearchBar(), "growx, pushx");
+        add(inputPanel, "growx, pushx");
     }
 
-    /** 
+    /**
      * {@inheritDoc}.
-     * 
+     *
      * @param actionEvent Action event
      */
     @Override
@@ -134,7 +129,8 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
     /** {@inheritDoc} */
     @Override
     public void addCustomPopupItems(final JPopupMenu popupMenu) {
-        if (getContainer().getServer().getState().equals(ServerState.CONNECTED)) {
+        if (getContainer().getServer().getState()
+                .equals(ServerState.CONNECTED)) {
             settingsMI.setEnabled(true);
         } else {
             settingsMI.setEnabled(false);
@@ -143,7 +139,7 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
         if (popupMenu.getComponentCount() > 0) {
             popupMenu.addSeparator();
         }
-        
+
         popupMenu.add(settingsMI);
     }
 
@@ -151,8 +147,8 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
     @Override
     public void close() {
         if (ServerSettingsDialog.hasServerSettingsDialog()) {
-            ServerSettingsDialog.getServerSettingsDialog(getContainer().getServer(),
-                getController().getMainFrame()).dispose();
+            ServerSettingsDialog.getServerSettingsDialog(getContainer()
+                    .getServer(), getController().getMainFrame()).dispose();
         }
         super.close();
     }

src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -33,7 +33,6 @@ import com.dmdirc.addons.ui_swing.actions.HyperlinkCopyAction;
 import com.dmdirc.addons.ui_swing.actions.InputFieldCopyAction;
 import com.dmdirc.addons.ui_swing.actions.NicknameCopyAction;
 import com.dmdirc.addons.ui_swing.actions.SearchAction;
-import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.SwingSearchBar;
 import com.dmdirc.addons.ui_swing.textpane.ClickTypeValue;
 import com.dmdirc.addons.ui_swing.textpane.MouseEventType;
@@ -54,33 +53,20 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameCloseListener;
-import com.dmdirc.interfaces.FrameInfoListener;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.common.ChannelJoinRequest;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.util.StringTranscoder;
 
-import java.awt.Container;
-import java.awt.Dimension;
 import java.awt.Point;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyVetoException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.Charset;
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
-import java.util.logging.Level;
 
-import javax.swing.BorderFactory;
 import javax.swing.JComponent;
-import javax.swing.JInternalFrame;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.JPanel;
@@ -88,26 +74,15 @@ import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-import javax.swing.WindowConstants;
-import javax.swing.event.InternalFrameEvent;
-import javax.swing.event.InternalFrameListener;
-import javax.swing.plaf.basic.BasicInternalFrameUI;
-import javax.swing.plaf.synth.SynthLookAndFeel;
-
-import net.miginfocom.layout.PlatformDefaults;
+
 import net.miginfocom.swing.MigLayout;
 
 /**
  * Implements a generic (internal) frame.
  */
-public abstract class TextFrame extends JInternalFrame implements Window,
-        PropertyChangeListener, InternalFrameListener, ConfigChangeListener,
-        FrameInfoListener, TextPaneListener, FrameCloseListener {
-
-    /** Logger to use. */
-    private static final java.util.logging.Logger LOGGER =
-            java.util.logging.Logger.getLogger(TextFrame.class.getName());
+public abstract class TextFrame extends JPanel implements Window,
+        ConfigChangeListener, TextPaneListener, FrameCloseListener {
+    
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
@@ -122,16 +97,10 @@ public abstract class TextFrame extends JInternalFrame implements Window,
     private SwingSearchBar searchBar;
     /** String transcoder. */
     private StringTranscoder transcoder;
-    /** Are we closing? */
-    private boolean closing = false;
     /** Command parser for popup commands. */
     private final CommandParser commandParser;
     /** Swing controller. */
     private final SwingController controller;
-    /** Are we maximising/restoring? */
-    private boolean maximiseRestoreInProgress = false;
-    /** Content pane. */
-    private final JPanel panel;
 
     /**
      * Creates a new instance of Frame.
@@ -147,9 +116,6 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
         final ConfigManager config = owner.getConfigManager();
 
-        setFrameIcon(IconManager.getIconManager().getIcon(owner.getIcon()));
-
-        owner.addFrameInfoListener(this);
         owner.addCloseListener(this);
         owner.setTitle(frameParent.getTitle());
 
@@ -167,17 +133,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         commandParser = findCommandParser();
 
         initComponents();
-        setMaximizable(true);
-        setClosable(true);
-        setResizable(true);
-        setIconifiable(true);
         setFocusable(true);
-        setPreferredSize(new Dimension(controller.getMainFrame().getWidth() / 2,
-                controller.getMainFrame().getHeight() / 3));
-        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 
-        addPropertyChangeListener("UI", this);
-        addInternalFrameListener(this);
         getTextPane().addTextPaneListener(this);
 
         config.addChangeListener("ui", "foregroundcolour", this);
@@ -185,10 +142,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         config.addChangeListener("ui", "frameBufferSize", this);
         updateColours();
 
-        addPropertyChangeListener("maximum", this);
-
-        panel = new JPanel(new MigLayout("fill"));
-        super.getContentPane().add(panel);
+        setLayout(new MigLayout("fill"));
     }
 
     /**
@@ -216,90 +170,6 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         return localParser;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public Container getContentPane() {
-        return panel;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated Should use {@link FrameContainer#setTitle(java.lang.String)}
-     */
-    @Override
-    @Deprecated
-    public void setTitle(final String title) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                TextFrame.super.setTitle(title);
-            }
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated Use {@link FrameContainer#getTitle()} instead
-     */
-    @Override
-    @Deprecated
-    public String getTitle() {
-        return super.getTitle();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    @Deprecated
-    public void setVisible(final boolean isVisible) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (isVisible() && isVisible) {
-                    open();
-                } else {
-                    TextFrame.super.setVisible(isVisible);
-                }
-            }
-        });
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void open() {
-        final boolean pref = frameParent.getConfigManager()
-                .getOptionBool("ui", "maximisewindows");
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                if (!isVisible()) {
-                    TextFrame.super.setVisible(true);
-                }
-                try {
-                    if ((pref || controller.getMainFrame().getMaximised())
-                            && !isMaximum()) {
-                        setMaximum(true);
-                    }
-                } catch (PropertyVetoException ex) {
-                    //Ignore
-                }
-
-                try {
-                    if (!isSelected()) {
-                        setSelected(true);
-                    }
-                } catch (PropertyVetoException ex) {
-                    //Ignore
-                }
-            }
-        });
-    }
-
     /** {@inheritDoc} */
     @Override
     public void activateFrame() {
@@ -307,20 +177,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
             @Override
             public void run() {
-                try {
-                    if (isIcon()) {
-                        setIcon(false);
-                    }
-                    setMaximum(controller.getMainFrame().getMaximised());
-                    if (!isVisible()) {
-                        TextFrame.super.setVisible(true);
-                    }
-                    if (!isSelected()) {
-                        setSelected(true);
-                    }
-                } catch (PropertyVetoException ex) {
-                    //Ignore
-                }
+                frameParent.windowActivated();
             }
         });
     }
@@ -332,122 +189,53 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
             @Override
             public void run() {
-                if (closing) {
-                    return;
-                }
-
-                closing = true;
-
-                try {
-                    if (!isClosed()) {
-                        setClosed(true);
-                    }
-                } catch (PropertyVetoException ex) {
-                    Logger.userError(ErrorLevel.LOW, "Unable to close frame");
-                }
-
+                frameParent.handleWindowClosing();
             }
         });
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated MDI has been removed, these methods are useless
+     */
+    @Deprecated
     @Override
     public void minimise() {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                try {
-                    if (!isIcon()) {
-                        setIcon(true);
-                    }
-                } catch (PropertyVetoException ex) {
-                    Logger.userError(ErrorLevel.LOW,
-                            "Unable to minimise frame");
-                }
-            }
-        });
+        //Ignore
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated MDI has been removed, these methods are useless
+     */
+    @Deprecated
     @Override
     public void maximise() {
-        LOGGER.finest("maximise(): About to invokeAndWait");
-
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                LOGGER.finest("maximise(): Running");
-
-                try {
-                    if (isMaximum()) {
-                        return;
-                    }
-
-                    maximiseRestoreInProgress = true;
-                    LOGGER.finest("maximise(): About to set icon");
-                    if (isIcon()) {
-                        setIcon(false);
-                    }
-                    LOGGER.finest("maximise(): About to set maximum");
-                    setMaximum(true);
-                    LOGGER.finest("maximise(): Done?");
-                } catch (PropertyVetoException ex) {
-                    Logger.userError(ErrorLevel.LOW,
-                            "Unable to minimise frame");
-                }
-                maximiseRestoreInProgress = false;
-
-                LOGGER.finest("maximise(): Done running");
-            }
-        });
-        LOGGER.finest("maximise(): Done");
+        //Ignore
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated MDI has been removed, these methods are useless
+     */
+    @Deprecated
     @Override
     public void restore() {
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                try {
-                    if (!isMaximum()) {
-                        return;
-                    }
-
-                    maximiseRestoreInProgress = true;
-                    if (isIcon()) {
-                        setIcon(false);
-                    }
-                    setMaximum(false);
-                } catch (PropertyVetoException ex) {
-                    Logger.userError(ErrorLevel.LOW,
-                            "Unable to minimise frame");
-                }
-                maximiseRestoreInProgress = false;
-            }
-        });
+        //Ignore
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated MDI has been removed, these methods are useless
+     */
+    @Deprecated
     @Override
     public void toggleMaximise() {
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                if (isMaximum()) {
-                    restore();
-                } else {
-                    maximise();
-                }
-            }
-        });
+        //Ignore
     }
 
     /**
@@ -553,205 +341,6 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         getActionMap().put("endAction", new TextPaneEndAction(getTextPane()));
     }
 
-    /**
-     * Removes and reinserts the border of an internal frame on maximising.
-     * {@inheritDoc}
-     *
-     * @param event Property change event
-     */
-    @Override
-    public final void propertyChange(final PropertyChangeEvent event) {
-        LOGGER.log(Level.FINER, "Property change: name: {0}  value: {1} -> {3}"
-                , new Object[]{event.getPropertyName(), event.getOldValue(),
-                event.getNewValue()});
-        if ("UI".equals(event.getPropertyName())) {
-            if (isMaximum()) {
-                hideTitlebar();
-            }
-        } else {
-            if ((Boolean) event.getNewValue()) {
-                hideTitlebar();
-            } else {
-                showTitlebar();
-            }
-        }
-        LOGGER.finest("Done property change");
-    }
-
-    /** Hides the titlebar for this frame. */
-    private void hideTitlebar() {
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                panel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-                setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-                ((BasicInternalFrameUI) getUI()).setNorthPane(null);
-            }
-        });
-    }
-
-    /** Shows the titlebar for this frame. */
-    private void showTitlebar() {
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                final Class<?> c;
-                Object temp = null;
-                Constructor<?> constructor;
-
-                final String componentUI = (String) UIManager.get(
-                        "InternalFrameUI");
-
-                if ("javax.swing.plaf.synth.SynthLookAndFeel"
-                        .equals(componentUI)) {
-                    temp = SynthLookAndFeel.createUI(TextFrame.this);
-                } else {
-                    try {
-                        c = getClass().getClassLoader().loadClass(componentUI);
-                        constructor = c.getConstructor(new Class[]{
-                                    javax.swing.JInternalFrame.class});
-                        temp = constructor.newInstance(new Object[]{
-                                    TextFrame.this});
-                    } catch (ClassNotFoundException ex) {
-                        Logger.appError(ErrorLevel.MEDIUM,
-                                "Unable to readd titlebar", ex);
-                    } catch (NoSuchMethodException ex) {
-                        Logger.appError(ErrorLevel.MEDIUM,
-                                "Unable to readd titlebar", ex);
-                    } catch (InstantiationException ex) {
-                        Logger.appError(ErrorLevel.MEDIUM,
-                                "Unable to readd titlebar", ex);
-                    } catch (IllegalAccessException ex) {
-                        Logger.appError(ErrorLevel.MEDIUM,
-                                "Unable to readd titlebar", ex);
-                    } catch (InvocationTargetException ex) {
-                        Logger.appError(ErrorLevel.MEDIUM,
-                                "Unable to readd titlebar", ex);
-                    }
-
-                }
-
-                setBorder(UIManager.getBorder("InternalFrame.border"));
-                if (temp == null) {
-                    temp = new BasicInternalFrameUI(TextFrame.this);
-                }
-
-                setUI((BasicInternalFrameUI) temp);
-                final int size = (int) PlatformDefaults.getPanelInsets(0).
-                        getValue();
-                panel.setBorder(BorderFactory.createEmptyBorder(size, size,
-                        size, size));
-            }
-        });
-    }
-
-    /**
-     * Not needed for this class. {@inheritDoc}
-     *
-     * @param event Internal frame event
-     */
-    @Override
-    public void internalFrameOpened(final InternalFrameEvent event) {
-        //Ignore
-    }
-
-    /**
-     * Not needed for this class. {@inheritDoc}
-     *
-     * @param event Internal frame event
-     */
-    @Override
-    public void internalFrameClosing(final InternalFrameEvent event) {
-        new LoggingSwingWorker() {
-
-            /** {@inheritDoc} */
-            @Override
-            protected Object doInBackground() {
-                frameParent.handleWindowClosing();
-                return null;
-            }
-        }.executeInExecutor();
-    }
-
-    /**
-     * Not needed for this class. {@inheritDoc}
-     *
-     * @param event Internal frame event
-     */
-    @Override
-    public void internalFrameClosed(final InternalFrameEvent event) {
-        //Ignore.
-    }
-
-    /**
-     * Makes the internal frame invisible. {@inheritDoc}
-     *
-     * @param event Internal frame event
-     */
-    @Override
-    public void internalFrameIconified(final InternalFrameEvent event) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                event.getInternalFrame().setVisible(false);
-            }
-        });
-    }
-
-    /**
-     * Not needed for this class. {@inheritDoc}
-     *
-     * @param event Internal frame event
-     */
-    @Override
-    public void internalFrameDeiconified(final InternalFrameEvent event) {
-        //Ignore.
-    }
-
-    /**
-     * Activates the input field on frame focus. {@inheritDoc}
-     *
-     * @param event Internal frame event
-     */
-    @Override
-    public void internalFrameActivated(final InternalFrameEvent event) {
-        LOGGER.log(Level.FINER, "{0} : internalFrameActivated()",
-                new Object[] {getName()});
-
-        if (maximiseRestoreInProgress) {
-            return;
-        }
-        new LoggingSwingWorker() {
-
-            /** {@inheritDoc} */
-            @Override
-            protected Object doInBackground() {
-                LOGGER.log(Level.FINER,
-                        "{0} : internalFrameActivated(): doInBackground",
-                        new Object[]{getName()});
-                frameParent.windowActivated();
-                return null;
-            }
-        }.executeInExecutor();
-    }
-
-    /**
-     * Not needed for this class. {@inheritDoc}
-     *
-     * @param event Internal frame event
-     */
-    @Override
-    public void internalFrameDeactivated(final InternalFrameEvent event) {
-        if (maximiseRestoreInProgress) {
-            return;
-        }
-    }
-
     /** {@inheritDoc} */
     @Override
     public FrameContainer<?> getContainer() {
@@ -1019,7 +608,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
     /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
-        if (getConfigManager() == null || getTextPane() == null) {
+        if (getContainer().getConfigManager() == null
+                || getTextPane() == null) {
             return;
         }
 
@@ -1031,59 +621,88 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /** {@inheritDoc} */
     @Override
-    public void iconChanged(final FrameContainer<?> window, final String icon) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                setFrameIcon(IconManager.getIconManager().getIcon(icon));
-            }
-        });
+    public void windowClosing(final FrameContainer<?> window) {
+        setVisible(false);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void nameChanged(final FrameContainer<?> window,
-            final String name) {
-        //Ignore
+    public SwingController getController() {
+        return controller;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * Updates colour settings from their config values.
+     */
+    private void updateColours() {
+        getTextPane().setForeground(getConfigManager().
+                        getOptionColour("ui", "foregroundcolour"));
+        getTextPane().setBackground(getConfigManager().
+                        getOptionColour("ui", "backgroundcolour"));
+    }
+
+
+
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Use {@link FrameContainer#getTitle()} instead
+     */
+    @Deprecated
     @Override
-    public void titleChanged(final FrameContainer<?> window,
-            final String title) {
-        UIUtilities.invokeLater(new Runnable() {
+    public String getTitle() {
+        return getContainer().getTitle();
+    }
 
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                // TODO: Can be changed back to setTitle once the deprecated
-                // method is removed
-                TextFrame.super.setTitle(title);
-            }
-        });
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated MDI is no longer implemented, windows are always maximised.
+     */
+    @Override
+    @Deprecated
+    public boolean isMaximum() {
+        return true;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Should use {@link FrameContainer#setTitle(java.lang.String)}
+     */
+    @Deprecated
     @Override
-    public void windowClosing(final FrameContainer<?> window) {
-        setVisible(false);
+    public void setTitle(final String title) {
+        getContainer().setTitle(title);
     }
 
     /** {@inheritDoc} */
     @Override
-    public SwingController getController() {
-        return controller;
+    public void open() {
+        //Yay, we're open.
     }
 
     /**
-     * Updates colour settings from their config values.
+     * {@inheritDoc}
+     *
+     * @deprecated Should not be used outside the UI, can be removed when the
+     * interface method is removed
      */
-    private void updateColours() {
-        getTextPane().setForeground(getConfigManager().
-                        getOptionColour("ui", "foregroundcolour"));
-        getTextPane().setBackground(getConfigManager().
-                        getOptionColour("ui", "backgroundcolour"));
+    @Deprecated
+    @Override
+    public void setVisible(final boolean visible) {
+        super.setVisible(visible);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Should not be used outside the UI, can be removed when the
+     * interface method is removed
+     */
+    @Deprecated
+    @Override
+    public boolean isVisible() {
+        return super.isVisible();
     }
 }

src/com/dmdirc/addons/ui_swing/components/menubar/MenuBar.java

@@ -96,7 +96,7 @@ public class MenuBar extends JMenuBar {
         JMenu menu = null;
         for (int i = 0; i < getMenuCount(); i++) {
             menu = getMenu(i);
-            if (menu instanceof JMenu && menu.getText().equals(parentMenu)) {
+            if (menu != null && menu.getText().equals(parentMenu)) {
                 break;
             }
             menu = null;

src/com/dmdirc/addons/ui_swing/dialogs/ConfirmQuitDialog.java

@@ -0,0 +1,66 @@
+/*
+ * 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.dialogs;
+
+import java.awt.Window;
+
+/**
+ * A simple dialog to confirm and handle the quitting of the client.
+ */
+public abstract class ConfirmQuitDialog extends StandardQuestionDialog {
+
+    /**
+     * A version number for this class. It should be changed
+     * whenever the class structure is changed (or anything else
+     * that would prevent serialized objects being unserialized
+     * with the new class).
+     */
+    private static final long serialVersionUID = 1;
+
+    /**
+     * Creates a new client quit confirmation dialog.
+     *
+     * @param window Parent window
+     */
+    public ConfirmQuitDialog(final Window window) {
+        super(window, ModalityType.APPLICATION_MODAL, "Quit confirm",
+                    "You are about to quit DMDirc, are you sure?");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean save() {
+        handleQuit();
+        return true;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void cancelled() {
+        // Do nothing
+    }
+
+    /**
+     * Called when the user confirms they wish to quit the client.
+     */
+    protected abstract void handleQuit();
+}

src/com/dmdirc/addons/ui_swing/dialogs/StandardDialog.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs;
 
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.ui.CoreUIUtils;
 
 import java.awt.Component;
@@ -31,6 +32,7 @@ import java.awt.Frame;
 import java.awt.Window;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.util.concurrent.Semaphore;
 
 import javax.swing.JButton;
 import javax.swing.JDialog;
@@ -148,17 +150,27 @@ public class StandardDialog extends JDialog {
      * @param owner Window to center on
      */
     public void displayBlocking(final Component owner) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            throw new IllegalStateException("Unable to display blocking dialog"
+                    + " in the EDT.");
+        }
+        final Semaphore semaphore = new Semaphore(0);
         SwingUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */
             @Override
             public void run() {
                 display(owner);
+                addWindowListener(new WindowAdapter() {
+
+                    @Override
+                    public void windowClosed(final WindowEvent e) {
+                        semaphore.release();
+                    }
+                });
             }
         });
-        while (isVisible()) {
-            Thread.yield();
-        }
+        semaphore.acquireUninterruptibly();
     }
 
 

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

@@ -0,0 +1,184 @@
+/*
+ * 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.ctrltab;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.SwingWindowFactory;
+import com.dmdirc.addons.ui_swing.SwingWindowListener;
+import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.actions.NextFrameAction;
+import com.dmdirc.addons.ui_swing.actions.PreviousFrameAction;
+import com.dmdirc.addons.ui_swing.components.TreeScroller;
+import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewModel;
+import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewNode;
+import com.dmdirc.interfaces.SelectionListener;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.interfaces.Window;
+
+import java.awt.event.KeyEvent;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.JComponent;
+import javax.swing.KeyStroke;
+import javax.swing.tree.DefaultTreeSelectionModel;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+import javax.swing.tree.TreeSelectionModel;
+
+/**
+ * A Window manager to handle ctrl[+shift]+tab switching between windows.
+ */
+public class CtrlTabWindowManager implements SwingWindowListener,
+        SelectionListener {
+
+    /** Node storage, used for adding and deleting nodes correctly. */
+    private final Map<Window, TreeViewNode> nodes;
+    /** Data model. */
+    private final TreeViewModel model;
+    /** Tree Scroller. */
+    private final TreeScroller treeScroller;
+    /** Window factory. */
+    private final SwingWindowFactory windowFactory;
+    /** Selection model for the tree scroller. */
+    private final TreeSelectionModel selectionModel;
+
+    /**
+     * Creates a new ctrl tab window manager.
+     *
+     * @param controller Parent controller
+     * @param component Component to add listen to events on
+     */
+    public CtrlTabWindowManager(final SwingController controller,
+            final JComponent component) {
+        nodes = new HashMap<Window, TreeViewNode>();
+        model = new TreeViewModel(new TreeViewNode(null, null));
+        selectionModel = new DefaultTreeSelectionModel();
+        treeScroller = new TreeScroller(model, selectionModel, false) {
+
+            /** {@inheritDoc} */
+            @Override
+            protected void setPath(final TreePath path) {
+                super.setPath(path);
+                ((TreeViewNode) path.getLastPathComponent()).getWindow().
+                        activateFrame();
+            }
+        };
+        windowFactory = controller.getWindowFactory();
+        windowFactory.addWindowListener(this);
+        component.getActionMap().put("prevFrameAction",
+                new PreviousFrameAction(treeScroller));
+        component.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+                .put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB,
+                KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK),
+                "prevFrameAction");
+        component.getActionMap().put(
+                "nextFrameAction", new NextFrameAction(treeScroller));
+        component.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+                .put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB,
+                KeyEvent.CTRL_DOWN_MASK), "nextFrameAction");
+    }
+
+    /* {@inheritDoc} */
+    @Override
+    public void windowAdded(final Window parent, final Window window) {
+        final TreeViewNode parentNode;
+        if (parent == null) {
+            parentNode = model.getRootNode();
+        } else {
+            parentNode = nodes.get(parent);
+        }
+        window.getContainer().addSelectionListener(this);
+        UIUtilities.invokeAndWait(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                final TreeViewNode node = new TreeViewNode(null, window.
+                        getContainer());
+                synchronized (nodes) {
+                    nodes.put(window, node);
+                }
+                node.setUserObject(window);
+                model.insertNodeInto(node, parentNode);
+            }
+        });
+    }
+
+    /* {@inheritDoc} */
+    @Override
+    public void windowDeleted(final Window parent, final Window window) {
+         window.getContainer().removeSelectionListener(this);
+         UIUtilities.invokeAndWait(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                if (nodes == null || nodes.get(window) == null) {
+                    return;
+                }
+                final TreeViewNode 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);
+            }
+        });
+    }
+
+    /** Scrolls up. */
+    public void scrollUp() {
+        treeScroller.changeFocus(true);
+    }
+
+    /** Scrolls down. */
+    public void scrollDown() {
+        treeScroller.changeFocus(false);
+    }
+
+    /* {@inheritDoc} */
+    @Override
+    public void selectionChanged(final FrameContainer<?> window) {
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                final Window selectedWindow = windowFactory.getSwingWindow(
+                        window);
+                final TreeNode[] path = model.getPathToRoot(nodes.get(
+                        selectedWindow));
+                if (path != null && path.length > 0) {
+                    selectionModel.setSelectionPath(new TreePath(path));
+                }
+            }
+        });
+    }
+}

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

@@ -326,7 +326,8 @@ public final class TreeFrameManager implements FrameManager,
                         addWindow(nodes.get(window), childWindow);
                     }
                 }
-                if (controller.getMainFrame().getActiveFrame() != null) {
+                if (controller.getMainFrame() != null
+                        && controller.getMainFrame().getActiveFrame() != null) {
                     selectionChanged(controller.getMainFrame().getActiveFrame()
                             .getContainer());
                 }

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

@@ -1,99 +0,0 @@
-/*
- * 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.windowmenu;
-
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.ui.IconManager;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-
-/**
- * Menu to add window arrangement options.
- */
-public class ArrangeWindows extends JMenu implements ActionListener {
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-    /** Menu items for tiling grid, vertical, horizontal. */
-    private final JMenuItem grid, vertical, horizontal;
-    /** Desktop pane. */
-    private SwingController controller;
-
-    /**
-     * Creates a new arrange windows menu.  Provides options to arrange windows
-     * in a grid, tile vertically and tile horizontally.
-     *
-     * @param controller Swing controller to request mainframe/desktop pane.
-     */
-    public ArrangeWindows(final SwingController controller) {
-        super();
-
-        this.controller = controller;
-
-        setIcon(IconManager.getIconManager().getIcon("dmdirc"));
-        setMnemonic('a');
-        setText("Arrange Windows");
-
-        grid = new JMenuItem(IconManager.getIconManager().getIcon("dmdirc"));
-        grid.setMnemonic('g');
-        grid.setText("Arrange in grid");
-        grid.setActionCommand("grid");
-        grid.addActionListener(this);
-        add(grid);
-
-        horizontal = new JMenuItem(IconManager.getIconManager().getIcon(
-                "dmdirc"));
-        horizontal.setMnemonic('h');
-        horizontal.setText("Arrange horizontally");
-        horizontal.setActionCommand("horizontal");
-        horizontal.addActionListener(this);
-        add(horizontal);
-
-        vertical = new JMenuItem(IconManager.getIconManager().getIcon(
-                "dmdirc"));
-        vertical.setMnemonic('v');
-        vertical.setText("Arrange vertically");
-        vertical.setActionCommand("vertical");
-        vertical.addActionListener(this);
-        add(vertical);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getActionCommand().equals("grid")) {
-            controller.getMainFrame().getDesktopPane().tileWindows();
-        } else if (e.getActionCommand().equals("horizontally")) {
-            controller.getMainFrame().getDesktopPane().tileHorizontally();
-        } else if (e.getActionCommand().equals("verticallt")) {
-            controller.getMainFrame().getDesktopPane().tileVertically();
-        }
-    }
-}

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/JInternalFrameComparator.java → src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/TextFrameComparator.java

@@ -28,13 +28,11 @@ import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import java.io.Serializable;
 import java.util.Comparator;
 
-import javax.swing.JInternalFrame;
-
 /**
- * A comparator that proxies JInternalFrame arrays to a Frame container
+ * A comparator that proxies TextFrame comparisons to a Frame container
  * comparator if appropriate.
  */
-public class JInternalFrameComparator implements Comparator<JInternalFrame>,
+public class TextFrameComparator implements Comparator<TextFrame>,
         Serializable {
 
     /**
@@ -56,11 +54,7 @@ public class JInternalFrameComparator implements Comparator<JInternalFrame>,
      * +1 if item1 is after item2.
      */
     @Override
-    public int compare(final JInternalFrame item1, final JInternalFrame item2) {
-        if (!(item1 instanceof TextFrame) || (!(item2 instanceof TextFrame))) {
-            return 0;
-        }
-        return comparator.compare(((TextFrame) item1).getContainer(),
-                ((TextFrame) item2).getContainer());
+    public int compare(final TextFrame item1, final TextFrame item2) {
+        return comparator.compare(item1.getContainer(), item2.getContainer());
     }
 }

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

@@ -48,14 +48,12 @@ import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
-import javax.swing.event.MenuEvent;
-import javax.swing.event.MenuListener;
 
 /**
  * Manages the window menu window list.
  */
 public final class WindowMenuFrameManager extends JMenu implements
-        SwingWindowListener, ActionListener, SelectionListener, MenuListener {
+        SwingWindowListener, ActionListener, SelectionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -68,13 +66,10 @@ public final class WindowMenuFrameManager extends JMenu implements
             new FrameContainerComparator();
     /** Non frame container menu count. */
     private final int itemCount;
-    /** Menu items for toggling, closing and minimising. */
-    private final JMenuItem toggleStateMenuItem, closeMenuItem,
-            minimiseMenuItem;
+    /** Menu items closing the active window. */
+    private final JMenuItem closeMenuItem;
     /** Seperator. */
     private final JSeparator separator;
-    /** Active window. */
-    private Window activeWindow;
     /** Enabled menu items? */
     private final AtomicBoolean enabledMenuItems = new AtomicBoolean(false);
     /** Swing controller. */
@@ -103,23 +98,6 @@ public final class WindowMenuFrameManager extends JMenu implements
         setText("Window");
         setMnemonic('w');
         controller.getWindowFactory().addWindowListener(this);
-        addMenuListener(this);
-
-        minimiseMenuItem = new JMenuItem(IconManager.getIconManager().getIcon(
-                "minimise"));
-        minimiseMenuItem.setMnemonic('n');
-        minimiseMenuItem.setText("Minimise");
-        minimiseMenuItem.setActionCommand("Minimise");
-        minimiseMenuItem.addActionListener(this);
-        add(minimiseMenuItem);
-
-        toggleStateMenuItem = new JMenuItem(IconManager.getIconManager().getIcon(
-                "maximise"));
-        toggleStateMenuItem.setMnemonic('m');
-        toggleStateMenuItem.setText("Maximise");
-        toggleStateMenuItem.setActionCommand("ToggleState");
-        toggleStateMenuItem.addActionListener(this);
-        add(toggleStateMenuItem);
 
         closeMenuItem = new JMenuItem(IconManager.getIconManager().getIcon(
                 "close"));
@@ -129,13 +107,10 @@ public final class WindowMenuFrameManager extends JMenu implements
         closeMenuItem.addActionListener(this);
         add(closeMenuItem);
 
-        add(new ArrangeWindows(controller));
-
         separator = new JPopupMenu.Separator();
         add(separator);
 
         itemCount = getMenuComponentCount();
-        checkToggleState();
 
         new WindowMenuScroller(this, controller.getDomain(), itemCount);
     }
@@ -148,8 +123,6 @@ public final class WindowMenuFrameManager extends JMenu implements
         enabledMenuItems.set((getMenuComponentCount() > itemCount));
         separator.setVisible(enabledMenuItems.get());
         closeMenuItem.setEnabled(enabledMenuItems.get());
-        toggleStateMenuItem.setEnabled(enabledMenuItems.get());
-        minimiseMenuItem.setEnabled(enabledMenuItems.get());
     }
 
     /** {@inheritDoc} */
@@ -317,12 +290,8 @@ public final class WindowMenuFrameManager extends JMenu implements
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (enabledMenuItems.get()) {
-            if (e.getActionCommand().equals("ToggleState")) {
-                activeWindow.toggleMaximise();
-            } else if (e.getActionCommand().equals("Minimise")) {
-                activeWindow.minimise();
-            } else if (e.getActionCommand().equals("Close")) {
-                activeWindow.close();
+            if (e.getActionCommand().equals("Close")) {
+                controller.getMainFrame().getActiveFrame().close();
             }
         }
     }
@@ -335,8 +304,7 @@ public final class WindowMenuFrameManager extends JMenu implements
         synchronized (menus) {
             synchronized (items) {
                 synchronized (menuItems) {
-                    activeWindow = controller.getWindowFactory().getSwingWindow(
-                            window);
+                    checkMenuItems();
                     values.addAll(menus.values());
                     values.addAll(items.values());
                     values.addAll(menuItems.values());
@@ -366,30 +334,6 @@ public final class WindowMenuFrameManager extends JMenu implements
         }
     }
 
-    /**
-     * Checks and sets the state of the toggle menu item.
-     */
-    private void checkToggleState() {
-        checkMenuItems();
-        if (activeWindow != null) {
-            toggleStateMenuItem.setEnabled(true);
-            closeMenuItem.setEnabled(true);
-            minimiseMenuItem.setEnabled(true);
-
-            if (activeWindow.isMaximum()) {
-                toggleStateMenuItem.setText("Restore");
-                toggleStateMenuItem.setIcon(IconManager.getIconManager().getIcon(
-                        "restore"));
-                toggleStateMenuItem.setMnemonic('r');
-            } else {
-                toggleStateMenuItem.setText("Maximise");
-                toggleStateMenuItem.setIcon(IconManager.getIconManager().getIcon(
-                        "maximise"));
-                toggleStateMenuItem.setMnemonic('m');
-            }
-        }
-    }
-
     /**
      * Compares the new child with the existing children or parent to decide
      * where it needs to be inserted.
@@ -474,22 +418,4 @@ public final class WindowMenuFrameManager extends JMenu implements
 
         return comparator.compare(newChild, child) >= 1;
     }
-
-    /** {@inheritDoc} */
-    @Override
-    public void menuSelected(final MenuEvent e) {
-        checkToggleState();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void menuDeselected(final MenuEvent e) {
-        //Ignore
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void menuCanceled(final MenuEvent e) {
-        //Ignore
-    }
 }

src/com/dmdirc/addons/ui_swing/plugin.config

@@ -40,6 +40,7 @@ defaults:
     showjrewarning=true
     showtreeexpands=true
     textpanelinenotification=true
+    mdiBarVisibility=true
 
 exports:
   getController in com.dmdirc.addons.ui_swing.SwingController as getController