Remove window open and close methods

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

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

@@ -141,7 +141,7 @@ public class TransferWindow extends EmptyWindow implements ActionListener,
                 button.setText("Close Window");
             }
         } else if (e.getActionCommand().equals("Close Window")) {
-            close();
+            getContainer().close();
         } else if (e.getSource() == openButton) {
             final File file = new File(dcc.getFileName());
             try {

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

@@ -59,18 +59,6 @@ public class DummyInputWindow implements InputWindow {
         return container;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void open() {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void close() {
-        container.handleWindowClosing();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void activateFrame() {

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

@@ -30,6 +30,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.AwayStateListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.FrameCloseListener;
 
 import javax.swing.JLabel;
 
@@ -37,7 +38,7 @@ import javax.swing.JLabel;
  * Simple panel to show when a user is away or not.
  */
 public class AwayLabel extends JLabel implements ConfigChangeListener,
-        AwayStateListener, ActionListener {
+        AwayStateListener, ActionListener, FrameCloseListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -62,10 +63,14 @@ public class AwayLabel extends JLabel implements ConfigChangeListener,
         setVisible(false);
         useAwayIndicator = container.getConfigManager().getOptionBool("ui",
                 AWAY_INDICATOR);
+
         if (container.getServer() != null) {
             setVisible(container.getServer().isAway());
             container.getServer().addAwayStateListener(this);
         }
+
+        container.addCloseListener(this);
+
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.CLIENT_FRAME_CHANGED);
     }
@@ -121,14 +126,17 @@ public class AwayLabel extends JLabel implements ConfigChangeListener,
     @Override
     public void processEvent(final ActionType type, final StringBuffer format,
             final Object... arguments) {
-        if (type == CoreActionType.CLIENT_FRAME_CHANGED) {
-            if (useAwayIndicator && container.getServer() != null) {
-                setVisible(container.getServer().isAway());
-            }
-        } else { //TODO Change to listener when written
-            if (container != null && container.getServer() != null) {
-                container.getServer().removeAwayStateListener(this);
-            }
+        if (type == CoreActionType.CLIENT_FRAME_CHANGED && useAwayIndicator
+                && container.getServer() != null) {
+            setVisible(container.getServer().isAway());
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void windowClosing(final FrameContainer window) {
+        if (container != null && container.getServer() != null) {
+            container.getServer().removeAwayStateListener(this);
         }
     }
 }

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

@@ -141,7 +141,7 @@ public class MDIBar extends JPanel implements SwingWindowListener,
             return;
         }
         if (closeButton.equals(e.getSource())) {
-            mainFrame.getActiveFrame().close();
+            mainFrame.getActiveFrame().getContainer().close();
         }
     }
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
@@ -217,14 +218,6 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         saveSplitPanePosition();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void close() {
-        saveSplitPanePosition();
-        topicBar.close();
-        super.close();
-    }
-
     private void saveSplitPanePosition() {
         UIUtilities.invokeAndWait(new Runnable() {
 
@@ -277,4 +270,13 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         }
         popupMenu.add(settingsMI);
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void windowClosing(final FrameContainer window) {
+        saveSplitPanePosition();
+        topicBar.close();
+
+        super.windowClosing(window);
+    }
 }

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

@@ -398,14 +398,6 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void close() {
-        super.close();
-         //TODO Remove when close listeners are added
-        awayLabel.processEvent(null, null, (Object) null);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void activateFrame() {

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.SwingController;
@@ -146,19 +147,8 @@ public final class ServerFrame extends InputTextFrame implements
 
         popupMenu.add(settingsMI);
     }
-
     /** {@inheritDoc} */
     @Override
-    public void close() {
-        if (ServerSettingsDialog.hasServerSettingsDialog()) {
-            ServerSettingsDialog.getServerSettingsDialog(getContainer()
-                    .getServer(), getController().getMainFrame()).dispose();
-        }
-        super.close();
-    }
-
-    /** {@inhertiDoc} */
-    @Override
     public void certificateProblemEncountered(final X509Certificate[] chain,
             final Collection<CertificateException> problems,
             final CertificateManager certificateManager) {
@@ -174,4 +164,15 @@ public final class ServerFrame extends InputTextFrame implements
             sslDialog.dispose();
         }
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void windowClosing(final FrameContainer window) {
+        if (ServerSettingsDialog.hasServerSettingsDialog()) {
+            ServerSettingsDialog.getServerSettingsDialog(getContainer()
+                    .getServer(), getController().getMainFrame()).dispose();
+        }
+
+        super.windowClosing(window);
+    }
 }

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

@@ -164,18 +164,6 @@ public abstract class TextFrame extends JPanel implements Window,
         });
     }
 
-    /** Closes this frame. */
-    @Override
-    public void close() {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                frameParent.handleWindowClosing();
-            }
-        });
-    }
-
     /**
      * Initialises the components for this frame.
      */
@@ -505,10 +493,4 @@ public abstract class TextFrame extends JPanel implements Window,
         getTextPane().setBackground(getContainer().getConfigManager()
                 .getOptionColour("ui", "backgroundcolour"));
     }
-
-    /** {@inheritDoc} */
-    @Override
-    public void open() {
-        //Yay, we're open.
-    }
 }

src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java

@@ -38,7 +38,7 @@ import com.dmdirc.ui.interfaces.StatusBarComponent;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
-import java.util.List;
+import java.util.Collection;
 
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
@@ -59,16 +59,22 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
+
     /** Active server. */
     private Server activeServer;
+
     /** Invite popup menu. */
     private final JPopupMenu menu;
+
     /** Dismiss invites menu item. */
     private final JMenuItem dismiss;
+
     /** Accept invites menu item. */
     private final JMenuItem accept;
+
     /** Parent window. */
     private final MainFrame mainFrame;
+
     /** Active frame. */
     private FrameContainer activeFrame;
 
@@ -121,7 +127,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
     private void popuplateMenu() {
         menu.removeAll();
 
-        final List<Invite> invites = activeServer.getInvites();
+        final Collection<Invite> invites = activeServer.getInvites();
         for (Invite invite : invites) {
             menu.add(new JMenuItem(new InviteAction(invite)));
         }

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

@@ -294,7 +294,7 @@ public final class WindowMenuFrameManager extends JMenu implements
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (enabledMenuItems.get() && e.getActionCommand().equals("Close")) {
-            controller.getMainFrame().getActiveFrame().close();
+            controller.getMainFrame().getActiveFrame().getContainer().close();
         }
     }
 

src/com/dmdirc/addons/ui_web/WebWindowManager.java

@@ -127,7 +127,6 @@ public class WebWindowManager implements FrameListener {
     @Override
     public void delWindow(final FrameContainer window) {
         if (windows.containsKey(window)) {
-            windows.get(window).close();
             windows.remove(window);
         }
     }

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

@@ -27,6 +27,7 @@ import com.dmdirc.addons.ui_web.DynamicRequestHandler;
 import com.dmdirc.addons.ui_web.Event;
 import com.dmdirc.addons.ui_web.Message;
 import com.dmdirc.addons.ui_web.WebInterfaceUI;
+import com.dmdirc.interfaces.FrameCloseListener;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.ui.interfaces.UIController;
 import com.dmdirc.ui.interfaces.Window;
@@ -45,11 +46,10 @@ import java.util.Map;
 import org.apache.commons.lang.StringEscapeUtils;
 
 /**
- *
- * @author chris
+ * A server-side representation of a "window" in the Web UI.
  */
 public class WebWindow implements Window, IRCDocumentListener,
-        FrameInfoListener {
+        FrameInfoListener, FrameCloseListener {
 
     protected static int counter = 0;
 
@@ -110,18 +110,6 @@ public class WebWindow implements Window, IRCDocumentListener,
         return parent;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void open() {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void close() {
-        DynamicRequestHandler.addEvent(new Event("closewindow", myID));
-    }
-
     public String getId() {
         return String.valueOf(myID);
     }
@@ -270,9 +258,14 @@ public class WebWindow implements Window, IRCDocumentListener,
 
     /** {@inheritDoc} */
     @Override
-    public void titleChanged(final FrameContainer window,
-            final String title) {
+    public void titleChanged(final FrameContainer window, final String title) {
         this.title = title;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public void windowClosing(final FrameContainer window) {
+        DynamicRequestHandler.addEvent(new Event("closewindow", myID));
+    }
+
 }