Major hackage of how closing windows works. Away listeners should be properly removed now. We need to take a better look at the closing process at some point in the future

git-svn-id: http://svn.dmdirc.com/trunk@2958 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/Channel.java

@@ -373,6 +373,8 @@ public final class Channel extends MessageTarget
         
         window.setVisible(false);
         Main.getUI().getMainWindow().delChild(window);
+        WindowManager.removeWindow(window);
+        window.close();
         window = null;
         server = null;
     }

src/com/dmdirc/CustomWindow.java

@@ -39,7 +39,7 @@ public class CustomWindow extends FrameContainer {
     /** This custom window's title. */
     private final String title;
 
-    private final Window window;
+    private Window window;
 
     private Window parent = null;
 
@@ -98,6 +98,9 @@ public class CustomWindow extends FrameContainer {
 
         WindowManager.removeWindow(window);
         Main.getUI().getMainWindow().delChild(window);
+        
+        window.close();
+        window = null; // NOPMD
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/GlobalWindow.java

@@ -71,7 +71,9 @@ public class GlobalWindow extends WritableFrameContainer {
 
     public void close() {
         window.setVisible(false);
+        window.close();
         WindowManager.removeWindow(window);
+        Main.getUI().getMainWindow().delChild(window);
     }
 
     public Server getServer() {

src/com/dmdirc/Query.java

@@ -349,6 +349,8 @@ public final class Query extends MessageTarget implements
         }
         
         Main.getUI().getMainWindow().delChild(window);
+        WindowManager.removeWindow(window);
+        window.close();
         
         window = null;
         server = null;

src/com/dmdirc/Raw.java

@@ -55,6 +55,8 @@ public final class Raw extends WritableFrameContainer implements IDataIn,
     /** An InputWindow used for displaying the raw data.*/
     private InputWindow window;
     
+    private boolean isClosing = false;
+    
     /**
      * Creates a new instance of Raw.
      *
@@ -101,7 +103,7 @@ public final class Raw extends WritableFrameContainer implements IDataIn,
         Main.getUI().getMainWindow().delChild(window);
         
         server.delRaw();
-        
+        window.close();
         window = null;
         server = null;
     }

src/com/dmdirc/Server.java

@@ -463,7 +463,6 @@ public final class Server extends WritableFrameContainer implements Serializable
      * closed).
      */
     public void delRaw() {
-        WindowManager.removeWindow(raw.getFrame());
         raw = null; //NOPMD
     }
 
@@ -474,8 +473,6 @@ public final class Server extends WritableFrameContainer implements Serializable
      */
     public void delChannel(final String chan) {
         tabCompleter.removeEntry(chan);
-        WindowManager.removeWindow(
-                channels.get(parser.toLowerCase(chan)).getFrame());
         channels.remove(parser.toLowerCase(chan));
     }
 
@@ -518,8 +515,6 @@ public final class Server extends WritableFrameContainer implements Serializable
      */
     public void delQuery(final String host) {
         tabCompleter.removeEntry(ClientInfo.parseHost(host));
-        WindowManager.removeWindow(
-                queries.get(parser.toLowerCase(ClientInfo.parseHost(host))).getFrame());
         queries.remove(parser.toLowerCase(ClientInfo.parseHost(host)));
     }
 
@@ -820,12 +815,15 @@ public final class Server extends WritableFrameContainer implements Serializable
         if (raw != null) {
             raw.close();
         }
+        
         // Unregister ourselves with the server manager
         ServerManager.getServerManager().unregisterServer(this);
 
         if (window != null) {
             window.setVisible(false);
+            WindowManager.removeWindow(window);
             Main.getUI().getMainWindow().delChild(window);
+            window.close();
             window = null; //NOPMD
         }
 

src/com/dmdirc/ServerManager.java

@@ -86,8 +86,6 @@ public final class ServerManager {
         if (!closing) {
             servers.remove(server);
         }
-        
-        WindowManager.removeWindow(server.getFrame());
     }
     
     /**

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

@@ -22,11 +22,8 @@
 
 package com.dmdirc.addons.dcc;
 
-import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.IconManager;
 import com.dmdirc.Main;
-import com.dmdirc.Server;
-import com.dmdirc.config.IdentityManager;
+
 /**
  * This class links DCC Chat objects to a window.
  *

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

@@ -234,5 +234,7 @@ public abstract class DCCFrame extends WritableFrameContainer {
 		myWindow.setVisible(false);
 		Main.getUI().getMainWindow().delChild(myWindow);
 		WindowManager.removeWindow(myWindow);
+                myWindow.close();
+                myWindow = null;
 	}   
 }

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

@@ -39,8 +39,6 @@ import com.dmdirc.interfaces.ActionListener;
 
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
 
 import javax.swing.SwingConstants;
 import javax.swing.JOptionPane;

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

@@ -44,7 +44,7 @@ public class HistoryWindow extends FrameContainer {
     private final String title;
        
     /** The window we're using. */
-    private final Window myWindow;
+    private Window myWindow;
     
     /** Our parent window. */
     private final Window parent;
@@ -94,6 +94,8 @@ public class HistoryWindow extends FrameContainer {
         myWindow.setVisible(false);
         Main.getUI().getMainWindow().delChild(myWindow);
         WindowManager.removeWindow(myWindow);
+        myWindow.close();
+        myWindow = null;
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/addons/redirectplugin/FakeInputWindow.java

@@ -56,93 +56,117 @@ public class FakeInputWindow implements InputWindow {
     }
 
     /** {@inheritDoc} */
+    @Override
     public CommandParser getCommandParser() {
         return target.getFrame().getCommandParser();
     }
 
     /** {@inheritDoc} */
+    @Override
     public InputHandler getInputHandler() {
         return target.getFrame().getInputHandler();
     }
 
     /** {@inheritDoc} */
+    @Override
     public void setAwayIndicator(final boolean isAway) {
         // Do nothing
     }
 
     /** {@inheritDoc} */
+    @Override
     public void addLine(final String messageType, final Object... args) {
         target.sendLine(Formatter.formatMessage(messageType, args));
     }
 
     /** {@inheritDoc} */
+    @Override
     public void addLine(final StringBuffer messageType, final Object... args) {
         addLine(messageType.toString(), args);
     }
 
     /** {@inheritDoc} */
+    @Override
     public void addLine(final String line, final boolean timestamp) {
         target.sendLine(line);
     }
 
     /** {@inheritDoc} */
+    @Override
     public void clear() {
         // Do nothing
     }
 
     /** {@inheritDoc} */
+    @Override
     public ConfigManager getConfigManager() {
         return target.getFrame().getConfigManager();
     }
 
     /** {@inheritDoc} */
+    @Override
     public FrameContainer getContainer() {
         return target;
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean isVisible() {
         return false;
     }
 
     /** {@inheritDoc} */
+    @Override
     public void setVisible(final boolean isVisible) {
         // Do nothing
     }
 
     /** {@inheritDoc} */
+    @Override
     public String getTitle() {
         return "Fake window";
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean isMaximum() {
         return false;
     }
 
     /** {@inheritDoc} */
+    @Override
     public void setMaximum(final boolean b) throws PropertyVetoException {
         // Do nothing
     }
 
     /** {@inheritDoc} */
+    @Override
     public void setTitle(final String title) {
         // Do nothing
     }
 
     /** {@inheritDoc} */
+    @Override
     public void open() {
         // Do nothing
     }
 
     /** {@inheritDoc} */
+    @Override
     public void setFrameIcon(final Icon icon) {
         // Do nothing
     }
 
     /** {@inheritDoc} */
+    @Override
     public StringTranscoder getTranscoder() {
         return new StringTranscoder(Charset.defaultCharset());
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public void close() {
+        /// Do nothing
+    }
+
 }

src/com/dmdirc/ui/WindowManager.java

@@ -138,16 +138,18 @@ public class WindowManager {
     /**
      * Removes a window from the Window Manager. If the specified window
      * has child windows, they are recursively removed before the target window.
+     * If the window hasn't previously been added, the reques to remove it is
+     * ignored.
      *
      * @param window The window to be removed
      */
-    @Precondition({
-        "The specified Window is not null",
-        "The specified Window has already been added and not removed"
-    })
+    @Precondition("The specified Window is not null")
     public static void removeWindow(final Window window) {
         assert(window != null);
-        assert(childWindows.containsKey(window));
+        
+        if (!childWindows.containsKey(window)) {
+            return;
+        }
 
         if (childWindows.get(window) != null && !childWindows.get(window).isEmpty()) {
             for (Window child : new ArrayList<Window>(childWindows.get(window))) {

src/com/dmdirc/ui/dummy/DummyChannelWindow.java

@@ -170,5 +170,11 @@ public final class DummyChannelWindow implements ChannelWindow {
     public StringTranscoder getTranscoder() {
         return new StringTranscoder(Charset.defaultCharset());
     }
+    
+    /** {@inheritDoc} */
+    @Override
+    public void close() {
+        // Do nothing
+    }    
 
 }

src/com/dmdirc/ui/dummy/DummyInputWindow.java

@@ -151,5 +151,11 @@ public final class DummyInputWindow implements InputWindow {
     public StringTranscoder getTranscoder() {
         return new StringTranscoder(Charset.defaultCharset());
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void close() {
+        // Do nothing
+    }
     
 }

src/com/dmdirc/ui/dummy/DummyServerWindow.java

@@ -153,4 +153,10 @@ public final class DummyServerWindow implements ServerWindow {
         return new StringTranscoder(Charset.defaultCharset());
     }
     
+    /** {@inheritDoc} */
+    @Override
+    public void close() {
+        // Do nothing
+    }    
+    
 }

src/com/dmdirc/ui/interfaces/Window.java

@@ -113,7 +113,7 @@ public interface Window {
      * Sets the maximised state of this window.
      * 
      * @param b true if the frame should be maximised, false otherwise
-     * @throws PropertyVetoException if the change is vetoed
+     * @throws java.beans.PropertyVetoException if the change is vetoed
      */
     void setMaximum(boolean b) throws PropertyVetoException;
     
@@ -143,4 +143,7 @@ public interface Window {
      */
     StringTranscoder getTranscoder();
     
+    /** Closes this window. */
+    void close();
+    
 }

src/com/dmdirc/ui/swing/ServerFrame.java

@@ -27,14 +27,12 @@ import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.ServerWindow;
 import com.dmdirc.ui.swing.components.InputTextFrame;
 import com.dmdirc.ui.swing.dialogs.serversetting.ServerSettingsDialog;
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 
-import java.awt.BorderLayout;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
@@ -82,6 +80,7 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
      * Retrieves the command Parser for this command window.
      * @return This window's command Parser
      */
+    @Override
     public CommandParser getCommandParser() {
         return commandParser;
     }
@@ -120,6 +119,7 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
     }
     
     /** {@inheritDoc}. */
+    @Override
     public void actionPerformed(final ActionEvent actionEvent) {
         super.actionPerformed(actionEvent);
         if (actionEvent.getSource() == settingsMI) {
@@ -128,6 +128,7 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void popupMenuWillBecomeVisible(final PopupMenuEvent e) {
         if (getContainer().getServer().getState().equals(ServerState.CONNECTED)) {
             settingsMI.setEnabled(true);
@@ -137,11 +138,13 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void popupMenuWillBecomeInvisible(final PopupMenuEvent e) {
         //Ignore
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void popupMenuCanceled(final PopupMenuEvent e) {
         //Ignore
     }

src/com/dmdirc/ui/swing/components/InputTextFrame.java

@@ -555,5 +555,15 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     public void onBack() {
         setAwayIndicator(false);
     }
-    
+
+    /** {@inheritDoc} */
+    @Override
+    public void close() {
+        super.close();
+        
+        if (getContainer() != null && getContainer().getServer() != null) {
+            getContainer().getServer().removeAwayStateListener(this);
+        }
+    }
+
 }

src/com/dmdirc/ui/swing/components/TextFrame.java

@@ -130,6 +130,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
     /** Quick copy? */
     private boolean quickCopy;
     
+    private boolean closing = false;
+    
     /**
      * Creates a new instance of Frame.
      *
@@ -629,7 +631,13 @@ public abstract class TextFrame extends JInternalFrame implements Window,
     }
     
     /** Closes this frame. */
+    @Override
     public void close() {
+        if (closing) {
+            return;
+        }
+        closing = true;
+        
         try {
             setClosed(true);
         } catch (PropertyVetoException ex) {