Make swing UI detach on unload

Fixes CLIENT-11

Change-Id: I192562e176615f337df2f7686d0f6c50e00d9b27
Reviewed-on: http://gerrit.dmdirc.com/1969
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

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

@@ -149,4 +149,10 @@ public class DMDircEventQueue extends EventQueue {
             }
         }
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void pop() { //NOPMD
+        super.pop();
+    }
 }

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

@@ -730,4 +730,12 @@ public final class MainFrame extends JFrame implements WindowListener,
     public void notificationCleared(final FrameContainer window) {
         //Ignore
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void dispose() {
+        removeWindowListener(this);
+        IdentityManager.getGlobalConfig().removeListener(this);
+        super.dispose();
+    }
 }

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

@@ -110,6 +110,10 @@ public class SwingController extends BasePlugin implements UIController {
     private final List<java.awt.Window> windows;
     /** Error dialog. */
     private ErrorListDialog errorDialog;
+    /** DMDirc event queue. */
+    private DMDircEventQueue eventQueue;
+    /** Key listener to handle dialog key events. */
+    private DialogKeyListener keyListener;
 
     /** Instantiates a new SwingController. */
     public SwingController() {
@@ -460,10 +464,11 @@ public class SwingController extends BasePlugin implements UIController {
                     "Swing UI can't be run in a headless environment");
         }
 
-        Toolkit.getDefaultToolkit().getSystemEventQueue().
-                push(new DMDircEventQueue(this));
+        eventQueue = new DMDircEventQueue(this);
+        keyListener = new DialogKeyListener();
+        Toolkit.getDefaultToolkit().getSystemEventQueue().push(eventQueue);
         KeyboardFocusManager.getCurrentKeyboardFocusManager().
-                addKeyEventDispatcher(new DialogKeyListener());
+                addKeyEventDispatcher(keyListener);
 
         UIUtilities.invokeAndWait(new Runnable() {
 
@@ -492,7 +497,18 @@ public class SwingController extends BasePlugin implements UIController {
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
-        // Do nothing
+        errorDialog.dispose();
+        WindowManager.removeFrameListener(windowFactory);
+        mainFrameCreated.set(false);
+        me.dispose();
+        windowFactory.dispose();
+        StatusBarManager.getStatusBarManager().registerStatusBar(statusBar);
+        eventQueue.pop();
+        KeyboardFocusManager.getCurrentKeyboardFocusManager().
+                removeKeyEventDispatcher(keyListener);
+        for (java.awt.Window window : getTopLevelWindows()) {
+            window.dispose();
+        }
     }
 
     /** {@inheritDoc} */

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

@@ -206,4 +206,15 @@ public class SwingWindowFactory implements FrameListener {
             }
         });
     }
+
+    /** Disposes of this window factory, removing all listeners. */
+    public void dispose() {
+        for (SwingWindowListener listener : listeners.get(
+                SwingWindowListener.class)) {
+            listeners.remove(SwingWindowListener.class, listener);
+        }
+        for (TextFrame frame : windows.values()) {
+            frame.dispose();
+        }
+    }
 }

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

@@ -73,7 +73,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     /** Topic bar. */
     private TopicBar topicBar;
     /** UI controller. */
-    private SwingController controller;
+    private final SwingController controller;
 
     /**
      * Creates a new instance of ChannelFrame. Sets up callbacks and handlers,
@@ -279,4 +279,12 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
 
         super.windowClosing(window);
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void dispose() {
+        ActionManager.getActionManager().unregisterListener(this);
+        IdentityManager.getGlobalConfig().removeListener(this);
+        super.dispose();
+    }
 }

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

@@ -404,4 +404,11 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         super.activateFrame();
         inputField.requestFocusInWindow();
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void dispose() {
+        frameParent.getConfigManager().removeListener(this);
+        super.dispose();
+    }
 }

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

@@ -57,10 +57,8 @@ public final class ServerFrame extends InputTextFrame implements
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 9;
-
     /** popup menu item. */
     private JMenuItem settingsMI;
-
     /** The SSL certificate dialog we're displaying for this server, if any. */
     private SSLCertificateDialog sslDialog = null;
 
@@ -175,4 +173,11 @@ public final class ServerFrame extends InputTextFrame implements
 
         super.windowClosing(window);
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void dispose() {
+        ((Server) frameParent).removeCertificateProblemListener(this);
+        super.dispose();
+    }
 }

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

@@ -495,4 +495,10 @@ public abstract class TextFrame extends JPanel implements Window,
         getTextPane().setBackground(getContainer().getConfigManager()
                 .getOptionColour("ui", "backgroundcolour"));
     }
+
+    /** Disposes of this window, removing any listeners. */
+    public void dispose() {
+        frameParent.getConfigManager().removeListener(this);
+        frameParent.removeCloseListener(this);
+    }
 }

src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorListDialog.java

@@ -290,4 +290,11 @@ public final class ErrorListDialog extends StandardDialog implements
         super.display();
         setSize(new Dimension(600, 550));
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void dispose() {
+        tableModel.dispose();
+        super.dispose();
+    }
 }

src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorTableModel.java

@@ -48,6 +48,8 @@ public final class ErrorTableModel extends AbstractTableModel implements
     private static final long serialVersionUID = 2;
     /** Data list. */
     private final List<ProgramError> errors;
+    /** Are we ready? */
+    private boolean ready = false;
 
     /** Creates a new instance of ErrorTableModel. */
     public ErrorTableModel() {
@@ -65,6 +67,7 @@ public final class ErrorTableModel extends AbstractTableModel implements
         this.errors = Collections.synchronizedList(errors);
 
         ErrorManager.getErrorManager().addErrorListener(this);
+        ready = true;
     }
 
     /**
@@ -294,6 +297,14 @@ public final class ErrorTableModel extends AbstractTableModel implements
     /** {@inheritDoc} */
     @Override
     public boolean isReady() {
-        return true;
+        return ready;
+    }
+
+    /**
+     * Disposes of this model, removing any added listeners.
+     */
+    public void dispose() {
+        ErrorManager.getErrorManager().removeErrorListener(this);
+        ready = false;
     }
 }

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

@@ -15,7 +15,6 @@ metadata:
   description=The standard DMDirc user interface
   name=ui_swing
   nicename=Swing UI
-  unloadable=no
 
 updates:
   id=42