Change popout handling.

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

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

@@ -22,16 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
-import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameTitleChangedEvent;
-import com.dmdirc.interfaces.FrameCloseListener;
 
 import java.awt.Point;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 
 import javax.swing.JFrame;
 
@@ -43,7 +38,7 @@ import net.engio.mbassy.listener.Invoke;
 /**
  * Frame that contains popped out windows
  */
-public class DesktopWindowFrame extends JFrame implements FrameCloseListener {
+public class DesktopWindowFrame extends JFrame {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
@@ -61,15 +56,6 @@ public class DesktopWindowFrame extends JFrame implements FrameCloseListener {
         this.windowWindow = windowWindow;
         initialLocation = windowWindow.getLocationOnScreen();
 
-        addWindowListener(new WindowAdapter() {
-
-            @Override
-            public void windowClosing(final WindowEvent e) {
-                windowWindow.setPopout(false);
-            }
-        });
-        windowWindow.getContainer().addCloseListener(this);
-
         setLayout(new MigLayout("fill, ins rel"));
         add(windowWindow, "grow");
         setPreferredSize(windowWindow.getSize());
@@ -87,17 +73,6 @@ public class DesktopWindowFrame extends JFrame implements FrameCloseListener {
         setLocation(initialLocation);
     }
 
-    @Override
-    public void windowClosing(final FrameContainer window) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                windowWindow.setPopout(false);
-            }
-        });
-    }
-
     @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
     public void iconChanged(final FrameIconChangedEvent event) {
         if (event.getContainer().equals(windowWindow.getContainer())) {

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

@@ -69,6 +69,8 @@ import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -167,6 +169,13 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
             popoutPlaceholder = new DesktopPlaceHolderFrame();
             popoutFrame = new DesktopWindowFrame(this);
             eventBus.subscribe(popoutFrame);
+            popoutFrame.addWindowListener(new WindowAdapter() {
+
+                @Override
+                public void windowClosing(final WindowEvent e) {
+                    setPopout(false);
+                }
+            });
             popoutFrame.display();
         } else if (popoutFrame != null) {
             popoutPlaceholder = null;
@@ -496,6 +505,9 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
 
             @Override
             public void run() {
+                if (popout) {
+                    setPopout(false);
+                }
                 setVisible(false);
                 getTextPane().close();
             }