Update plugins with new window closing logic

Change-Id: I97f44a9269288f876a7a71b412302cec4238d9d4
Depends-On: I4ea9fbf6c939a5b16f15ade230255b948e210c2c
Reviewed-on: http://gerrit.dmdirc.com/1601
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

src/com/dmdirc/addons/dcc/DCCFrameContainer.java

@@ -110,17 +110,10 @@ public abstract class DCCFrameContainer<T extends InputWindow> extends WritableF
     public void windowClosing() {
         windowClosing = true;
 
-        // 1: Make the window non-visible
-        for (Window window : getWindows()) {
-            window.setVisible(false);
-        }
-
         // 2: Remove any callbacks or listeners
         // 3: Trigger any actions neccessary
         // 4: Trigger action for the window closing
         // 5: Inform any parents that the window is closing
-        // 6: Remove the window from the window manager
-        WindowManager.removeWindow(this);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/dcc/PlaceholderContainer.java

@@ -107,19 +107,11 @@ public class PlaceholderContainer extends FrameContainer<PlaceholderWindow> {
     /** {@inheritDoc} */
     @Override
     public void windowClosing() {
-        // 1: Make the window non-visible
-        for (Window window : getWindows()) {
-            window.setVisible(false);
-        }
-
         // 2: Remove any callbacks or listeners
         // 3: Trigger any actions neccessary
         // 4: Trigger action for the window closing
         // 5: Inform any parents that the window is closing
         plugin.removeContainer();
-
-        // 6: Remove the window from the window manager
-        WindowManager.removeWindow(this);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/dcc/TransferContainer.java

@@ -344,19 +344,12 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
     public void windowClosing() {
         windowClosing = true;
 
-        // 1: Make the window non-visible
-        for (Window window : getWindows()) {
-            window.setVisible(false);
-        }
-
         // 2: Remove any callbacks or listeners
         // 3: Trigger any actions neccessary
         dcc.removeFromTransfers();
         
         // 4: Trigger action for the window closing
         // 5: Inform any parents that the window is closing
-        // 6: Remove the window from the window manager
-        WindowManager.removeWindow(this);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/logging/HistoryWindow.java

@@ -57,18 +57,10 @@ public class HistoryWindow extends FrameContainer<Window> {
     /** {@inheritDoc} */
     @Override
     public void windowClosing() {
-        // 1: Make the window non-visible
-        for (Window window : getWindows()) {
-            window.setVisible(false);
-        }
-
         // 2: Remove any callbacks or listeners
         // 3: Trigger any actions neccessary
         // 4: Trigger action for the window closing
         // 5: Inform any parents that the window is closing
-
-        // 6: Remove the window from the window manager
-        WindowManager.removeWindow(this);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/parserdebug/DebugWindow.java

@@ -42,7 +42,7 @@ public class DebugWindow extends FrameContainer<Window> {
     protected Parser parser;
     /** The Server window we are a child of */
     protected Server server;
-    
+
     /**
      * Creates a new instance of DebugWindow.
      *
@@ -59,7 +59,7 @@ public class DebugWindow extends FrameContainer<Window> {
 
         WindowManager.addWindow(server, this);
     }
-       
+
     /**
      * Returns the server instance associated with this container.
      *
@@ -69,7 +69,7 @@ public class DebugWindow extends FrameContainer<Window> {
     public Server getServer() {
         return server;
     }
-    
+
     /**
      * Set the parser to null to stop us holding onto parsers when the server
      * connection is closed.
@@ -79,29 +79,21 @@ public class DebugWindow extends FrameContainer<Window> {
         addLine("Unset parser: "+parser, true);
         parser = null;
     }
-    
+
 
     /**
      * Closes this container (and it's associated frame).
      */
     @Override
     public void windowClosing() {
-        // 1: Make the window non-visible
-        for (Window window : getWindows()) {
-            window.setVisible(false);
-        }
-        
         // 2: Remove any callbacks or listeners
         if (parser != null) {
             parser.getCallbackManager().delCallback(DebugInfoListener.class, plugin);
         }
-        
+
         // 3: Trigger any actions neccessary
         // 4: Trigger action for the window closing
         // 5: Inform any parents that the window is closing
-        
-        // 6: Remove the window from the window manager
-        WindowManager.removeWindow(this);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_dummy/DummyInputWindow.java

@@ -127,6 +127,7 @@ public class DummyInputWindow implements InputWindow {
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public void setVisible(final boolean isVisible) {
         visible = isVisible;
     }
@@ -176,7 +177,7 @@ public class DummyInputWindow implements InputWindow {
     /** {@inheritDoc} */
     @Override
     public void close() {
-        container.windowClosing();
+        container.handleWindowClosing();
     }
 
     /** {@inheritDoc} */

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

@@ -53,6 +53,7 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 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;
@@ -102,7 +103,7 @@ import net.miginfocom.swing.MigLayout;
  */
 public abstract class TextFrame extends JInternalFrame implements Window,
         PropertyChangeListener, InternalFrameListener, ConfigChangeListener,
-        FrameInfoListener, TextPaneListener {
+        FrameInfoListener, TextPaneListener, FrameCloseListener {
 
     /** Logger to use. */
     private static final java.util.logging.Logger LOGGER =
@@ -149,6 +150,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         setFrameIcon(IconManager.getIconManager().getIcon(owner.getIcon()));
 
         owner.addFrameInfoListener(this);
+        owner.addCloseListener(this);
         owner.setTitle(frameParent.getTitle());
 
         try {
@@ -251,6 +253,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public void setVisible(final boolean isVisible) {
         UIUtilities.invokeLater(new Runnable() {
 
@@ -668,7 +671,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
             /** {@inheritDoc} */
             @Override
             protected Object doInBackground() {
-                frameParent.windowClosing();
+                frameParent.handleWindowClosing();
                 return null;
             }
         }.executeInExecutor();
@@ -1058,6 +1061,12 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         });
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public void windowClosing(final FrameContainer<?> window) {
+        setVisible(false);
+    }
+
     /** {@inheritDoc} */
     @Override
     public SwingController getController() {

src/com/dmdirc/addons/ui_web/uicomponents/WebWindow.java

@@ -148,12 +148,14 @@ public class WebWindow implements Window, IRCDocumentListener, FrameInfoListener
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public boolean isVisible() {
         return true;
     }
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public void setVisible(boolean isVisible) {
         // Do nothing
     }