Merge branch 'dcc-architecture'

Fixes issue 4035

Change-Id: I7c29ec0d55ba00295e85c94e7364ad59bf9bbaa3
Reviewed-on: http://gerrit.dmdirc.com/1220
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

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

@@ -22,8 +22,10 @@
 
 package com.dmdirc.addons.dcc;
 
+import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.dcc.actions.DCCActions;
+import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
@@ -31,7 +33,7 @@ import com.dmdirc.ui.interfaces.InputWindow;
  *
  * @author Shane 'Dataforce' McCormack
  */
-public class DCCChatWindow extends DCCFrame<InputWindow> implements DCCChatHandler {
+public class ChatContainer extends DCCFrameContainer<InputWindow> implements DCCChatHandler {
 
     /** The DCCChat object we are a window for */
     private final DCCChat dcc;
@@ -51,7 +53,7 @@ public class DCCChatWindow extends DCCFrame<InputWindow> implements DCCChatHandl
      * @param nick My Current Nickname
      * @param targetNick Nickname of target
      */
-    public DCCChatWindow(final DCCPlugin plugin, final DCCChat dcc,
+    public ChatContainer(final DCCPlugin plugin, final DCCChat dcc,
             final String title, final String nick, final String targetNick) {
         super(plugin, title, "dcc-chat-inactive", InputWindow.class,
                 DCCCommandParser.getDCCCommandParser());
@@ -60,9 +62,7 @@ public class DCCChatWindow extends DCCFrame<InputWindow> implements DCCChatHandl
         nickname = nick;
         otherNickname = targetNick;
 
-        plugin.addWindow(this);
-
-        setTitle(title);
+        WindowManager.addWindow(plugin.getContainer(), this);
     }
 
     /**

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

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.dcc;
 
+import com.dmdirc.addons.dcc.io.DCCChat;
+
 /**
  * This interfaces allows DCC Chat Windows to receive data from a DCCChat
  *

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

@@ -22,6 +22,9 @@
 
 package com.dmdirc.addons.dcc;
 
+import com.dmdirc.addons.dcc.io.DCCTransfer;
+import com.dmdirc.addons.dcc.io.DCC;
+import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.Server;
@@ -97,7 +100,7 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
             if (type.equalsIgnoreCase("chat")) {
                 final DCCChat chat = new DCCChat();
                 if (myPlugin.listen(chat)) {
-                    final DCCChatWindow window = new DCCChatWindow(myPlugin, chat,
+                    final ChatContainer window = new ChatContainer(myPlugin, chat,
                             "*Chat: " + target, myNickname, target);
 
                     parser.sendCTCP(target, "DCC", "CHAT chat "
@@ -189,7 +192,7 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
 
                     if (IdentityManager.getGlobalConfig().getOptionBool(
                             myPlugin.getDomain(), "send.reverse")) {
-                        new DCCTransferWindow(myPlugin, send, "Send: "
+                        new TransferContainer(myPlugin, send, "Send: "
                                 + target, target, server);
                         parser.sendCTCP(target, "DCC", "SEND \""
                                 + jc.getSelectedFile().getName() + "\" "
@@ -198,7 +201,7 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
                                 + (send.isTurbo() ? " T" : ""));
                     } else {
                         if (myPlugin.listen(send)) {
-                            new DCCTransferWindow(myPlugin, send, "*Send: "
+                            new TransferContainer(myPlugin, send, "*Send: "
                                     + target, target, server);
                             parser.sendCTCP(target, "DCC", "SEND \""
                                     + jc.getSelectedFile().getName() + "\" "

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

@@ -24,20 +24,12 @@ package com.dmdirc.addons.dcc;
 
 import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
-
-import java.awt.Container;
-
-import javax.swing.JPopupMenu;
+import com.dmdirc.ui.interfaces.Window;
 
 /**
  * This class links DCC objects to a window.
@@ -45,68 +37,7 @@ import javax.swing.JPopupMenu;
  * @param <T> The type of window which corresponds to this DCC frame
  * @author Shane 'Dataforce' McCormack
  */
-public abstract class DCCFrame<T extends InputWindow> extends WritableFrameContainer<T> {
-
-    /**
-     * Empty Frame.
-     */
-    static class EmptyFrame extends InputTextFrame {
-
-        /** A version number for this class. */
-        private static final long serialVersionUID = 200711271;
-
-        /**
-         * Creates a new instance of EmptyFrame.
-         *
-         * @param owner The frame container that owns this frame
-         */
-        public EmptyFrame(final SwingController controller, final WritableFrameContainer<?> owner) {
-            super(controller, owner);
-            setTextPane(null);
-            pack();
-        }
-
-        /**
-         * Retrieves the command Parser for this input window.
-         *
-         * @return This window's command parser
-         */
-        @Override
-        public final CommandParser getCommandParser() {
-            return GlobalCommandParser.getGlobalCommandParser();
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public PopupType getNicknamePopupType() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public PopupType getChannelPopupType() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public PopupType getHyperlinkPopupType() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public PopupType getNormalPopupType() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void addCustomPopupItems(final JPopupMenu popupMenu) {
-            //Add no custom popup items
-        }
-
-    }
+public abstract class DCCFrameContainer<T extends InputWindow> extends WritableFrameContainer<T> {
 
     /** The dcc plugin that owns this frame */
     protected final DCCPlugin plugin;
@@ -123,7 +54,7 @@ public abstract class DCCFrame<T extends InputWindow> extends WritableFrameConta
      * @param windowClass The class of window to use for this container
      * @param parser Command parser to use for this window
      */
-    public DCCFrame(final DCCPlugin plugin, final String title, final String icon,
+    public DCCFrameContainer(final DCCPlugin plugin, final String title, final String icon,
             final Class<T> windowClass, final CommandParser parser) {
         super(icon, title, title, windowClass, IdentityManager.getGlobalConfig(), parser);
         this.plugin = plugin;
@@ -149,15 +80,6 @@ public abstract class DCCFrame<T extends InputWindow> extends WritableFrameConta
         return 512;
     }
 
-    /**
-     * Returns the content pane of the internal frame associated with this object.
-     *
-     * @return The content pane of the internal frame associated with this object
-     */
-    public Container getContentPane() {
-        return ((TextFrame) getFrame()).getContentPane();
-    }
-
     /**
      * Returns the server instance associated with this container.
      *
@@ -189,15 +111,14 @@ public abstract class DCCFrame<T extends InputWindow> extends WritableFrameConta
         windowClosing = true;
 
         // 1: Make the window non-visible
-        getFrame().setVisible(false);
+        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.delWindow(this);
-
         // 6: Remove the window from the window manager
         WindowManager.removeWindow(this);
     }

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

@@ -22,19 +22,16 @@
 
 package com.dmdirc.addons.dcc;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.dcc.io.DCCTransfer;
+import com.dmdirc.addons.dcc.io.DCC;
+import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
-import com.dmdirc.addons.dcc.DCCFrame.EmptyFrame;
 import com.dmdirc.addons.dcc.kde.KFileChooser;
 import com.dmdirc.addons.dcc.actions.DCCActions;
-import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
@@ -51,11 +48,8 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.WindowManager;
 
-import java.awt.Dialog.ModalityType;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
@@ -74,10 +68,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
     private DCCCommand command;
 
     /** Our DCC Container window. */
-    private DCCFrame container;
-
-    /** Child Frames. */
-    private final List<DCCFrame> childFrames = new ArrayList<DCCFrame>();
+    private PlaceholderContainer container;
 
     /**
      * Creates a new instance of the DCC Plugin.
@@ -164,7 +155,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
                         }
                     }
                     if (reverse && !token.isEmpty()) {
-                        new DCCTransferWindow(DCCPlugin.this, send, "*Receive: " + nickname, nickname, null);
+                        new TransferContainer(DCCPlugin.this, send, "*Receive: " + nickname, nickname, null);
                         send.setToken(token);
                         if (resume) {
                             if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.reverse.sendtoken")) {
@@ -180,7 +171,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
                             }
                         }
                     } else {
-                        new DCCTransferWindow(DCCPlugin.this, send, "Receive: " + nickname, nickname, null);
+                        new TransferContainer(DCCPlugin.this, send, "Receive: " + nickname, nickname, null);
                         if (resume) {
                             parser.sendCTCP(nickname, "DCC", "RESUME " + sendFilename + " " + send.getPort() + " " + jc.getSelectedFile().length());
                         } else {
@@ -261,7 +252,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
                             return;
                         }
                         final String myNickname = ((Server) arguments[0]).getParser().getLocalClient().getNickname();
-                        final DCCFrame f = new DCCChatWindow(this, chat, "Chat: " + nickname, myNickname, nickname);
+                        final DCCFrameContainer<?> f = new ChatContainer(this, chat, "Chat: " + nickname, myNickname, nickname);
                         f.addLine("DCCChatStarting", nickname, chat.getHost(), chat.getPort());
                         chat.connect();
                     } else {
@@ -394,7 +385,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
 
                         // Now look for a dcc that matches.
                         for (DCCTransfer send : DCCTransfer.getTransfers()) {
-                            if (send.port == port && (new File(send.getFileName())).getName().equalsIgnoreCase(filename)) {
+                            if (send.getPort() == port && (new File(send.getFileName())).getName().equalsIgnoreCase(filename)) {
                                 if ((!token.isEmpty() && !send.getToken().isEmpty()) && (!token.equals(send.getToken()))) {
                                     continue;
                                 }
@@ -429,59 +420,34 @@ public final class DCCPlugin extends Plugin implements ActionListener {
     }
 
     /**
-     * Create the container window.
-     */
-    protected void createContainer() {
-        container = new PlaceholderDCCFrame(this);
-        final TextLabel label = new TextLabel("This is a placeholder window to group DCCs together.");
-        label.setText(label.getText() + "\n\nClosing this window will close all the active DCCs");
-        ((TextFrame) container.getFrame()).getContentPane().add(label);
-        WindowManager.addWindow(container);
-        container.getFrame().open();
-    }
-
-    /**
-     * Add a window to the container window.
+     * Retrieves the container for the placeholder.
      *
-     * @param window Window to remove
+     * @since 0.6.4
+     * @return This plugin's placeholder container
      */
-    protected synchronized void addWindow(final DCCFrame window) {
-        if (window == container) {
-            return;
-        }
+    public synchronized PlaceholderContainer getContainer() {
         if (container == null) {
             createContainer();
         }
 
-        WindowManager.addWindow(container, window);
-        childFrames.add(window);
-        window.getFrame().open();
+        return container;
     }
 
     /**
-     * Remove a window from the container window.
+     * Removes the cached container.
      *
-     * @param window Window to remove
+     * @since 0.6.4
      */
-    protected synchronized void delWindow(final DCCFrame window) {
-        if (container == null) {
-            return;
-        }
-        if (window == container) {
-            container = null;
-            for (DCCFrame win : childFrames) {
-                if (win != window) {
-                    win.close();
-                }
-            }
-            childFrames.clear();
-        } else {
-            childFrames.remove(window);
-            if (childFrames.isEmpty()) {
-                container.close();
-                container = null;
-            }
-        }
+    public synchronized void removeContainer() {
+        container = null;
+    }
+
+    /**
+     * Create the container window.
+     */
+    protected void createContainer() {
+        container = new PlaceholderContainer(this);
+        WindowManager.addWindow(container);
     }
 
     /** {@inheritDoc} */
@@ -621,65 +587,4 @@ public final class DCCPlugin extends Plugin implements ActionListener {
                 "Show the current percentage of transfers in the DCC window title"));
     }
 
-}
-
-/**
- * Creates a placeholder DCC Frame.
- */
-class PlaceholderDCCFrame extends DCCFrame<EmptyFrame> {
-
-    /**
-     * Creates a placeholder dcc frame.
-     *
-     * @param plugin Parent plugin
-     */
-    public PlaceholderDCCFrame(final DCCPlugin plugin) {
-        super(plugin, "DCCs", "dcc", EmptyFrame.class, DCCCommandParser.getDCCCommandParser());
-    }
-
-    @Override
-    public void close() {
-        int dccs = 0;
-        for (FrameContainer<?> window : getChildren()) {
-            if (window instanceof DCCTransferWindow) {
-                if (((DCCTransferWindow) window).getDCC().isActive()) {
-                    dccs++;
-                }
-            } else if (window instanceof DCCChatWindow) {
-                if (((DCCChatWindow) window).getDCC().isActive()) {
-                    dccs++;
-                }
-            }
-        }
-
-        if (dccs > 0) {
-            new StandardQuestionDialog(
-                    (MainFrame) Main.getUI().getMainWindow(),
-                    ModalityType.MODELESS, "Close confirmation",
-                    "Closing this window will cause all existing DCCs " +
-                    "to terminate, are you sure you want to do this?") {
-                /**
-                 * A version number for this class. It should be changed whenever the class
-                 * structure is changed (or anything else that would prevent serialized
-                 * objects being unserialized with the new class).
-                 */
-                private static final long serialVersionUID = 1;
-
-                /** {@inheritDoc} */
-                @Override
-                public boolean save() {
-                    PlaceholderDCCFrame.super.close();
-                    return true;
-                }
-
-                /** {@inheritDoc} */
-                @Override
-                public void cancelled() {
-                }
-            }.display();
-        } else {
-            super.close();
-        }
-    }
-}
-
+}

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

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.dcc;
 
+import com.dmdirc.addons.dcc.io.DCCTransfer;
+
 /**
  * This interfaces allows DCC Transfer Windows to receive data from a
  * DCCTransfer.

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

@@ -1,419 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.dcc;
-
-import com.dmdirc.Server;
-import com.dmdirc.ServerState;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.addons.dcc.DCCFrame.EmptyFrame;
-import com.dmdirc.addons.dcc.actions.DCCActions;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
-
-import java.awt.Desktop;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-import java.io.IOException;
-import java.util.Date;
-
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JProgressBar;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * This class links DCC Send objects to a window.
- *
- * @author Shane 'Dataforce' McCormack
- */
-public class DCCTransferWindow extends DCCFrame<EmptyFrame> implements DCCTransferHandler,
-        ActionListener, SocketCloseListener {
-
-    /** The DCCSend object we are a window for */
-    private final DCCTransfer dcc;
-
-    /** Other Nickname */
-    private final String otherNickname;
-
-    /** Total data transfered */
-    private volatile long transferCount = 0;
-
-    /** Time Started */
-    private long timeStarted = 0;
-
-    /** Progress Bar */
-    private final JProgressBar progress = new JProgressBar();
-
-    /** Status Label */
-    private final JLabel status = new JLabel("Status: Waiting");
-
-    /** Speed Label */
-    private final JLabel speed = new JLabel("Speed: Unknown");
-
-    /** Time Label */
-    private final JLabel remaining = new JLabel("Time Remaining: Unknown");
-
-    /** Time Taken */
-    private final JLabel taken = new JLabel("Time Taken: 00:00");
-
-    /** Button */
-    private final JButton button = new JButton("Cancel");
-
-    /** Open Button */
-    private final JButton openButton = new JButton("Open");
-
-    /** Plugin that this send belongs to. */
-    private final DCCPlugin myPlugin;
-
-    /** IRC Parser that caused this send */
-    private Parser parser = null;
-
-    /** Server that caused this send */
-    private Server server = null;
-
-    /** Show open button. */
-    private boolean showOpen = Desktop.isDesktopSupported() &&
-            Desktop.getDesktop().isSupported(Desktop.Action.OPEN);
-
-    /**
-     * Creates a new instance of DCCTransferWindow with a given DCCTransfer object.
-     *
-     * @param plugin the DCC Plugin responsible for this window
-     * @param dcc The DCCTransfer object this window wraps around
-     * @param title The title of this window
-     * @param targetNick Nickname of target
-     * @param server The server that initiated this send
-     */
-    public DCCTransferWindow(final DCCPlugin plugin, final DCCTransfer dcc,
-            final String title, final String targetNick, final Server server) {
-        super(plugin, title, dcc.getType() == DCCTransfer.TransferType.SEND
-                ? "dcc-send-inactive" : "dcc-receive-inactive",
-                EmptyFrame.class, DCCCommandParser.getDCCCommandParser());
-        this.dcc = dcc;
-        this.server = server;
-        this.parser = server == null ? null : server.getParser();
-        this.myPlugin = plugin;
-
-        if (parser != null) {
-            parser.getCallbackManager().addNonCriticalCallback(SocketCloseListener.class, this);
-        }
-        dcc.setHandler(this);
-
-        otherNickname = targetNick;
-
-        getContentPane().setLayout(new MigLayout("hidemode 0"));
-
-        progress.setMinimum(0);
-        progress.setMaximum(100);
-        progress.setStringPainted(true);
-        progress.setValue(0);
-
-        if (dcc.getType() == DCCTransfer.TransferType.SEND) {
-            getContentPane().add(new JLabel("Sending: " + dcc.getShortFileName()), "wrap");
-            getContentPane().add(new JLabel("To: " + targetNick), "wrap");
-        } else {
-            getContentPane().add(new JLabel("Recieving: " + dcc.getShortFileName()), "wrap");
-            getContentPane().add(new JLabel("From: " + targetNick), "wrap");
-        }
-        getContentPane().add(status, "wrap");
-        getContentPane().add(speed, "wrap");
-        getContentPane().add(remaining, "wrap");
-        getContentPane().add(taken, "wrap");
-        getContentPane().add(progress, "growx, wrap");
-
-        button.addActionListener(this);
-        openButton.addActionListener(this);
-        openButton.setVisible(false);
-
-        getContentPane().add(openButton, "split 2, align right");
-        getContentPane().add(button, "align right");
-
-        plugin.addWindow(this);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void onSocketClosed(final Parser tParser, final Date date) {
-        // Remove our reference to the parser (and its reference to us)
-        parser.getCallbackManager().delAllCallback(this);
-        parser = null;
-        // Can't resend without the parser.
-        if ("Resend".equals(button.getText())) {
-            button.setText("Close Window");
-        }
-    }
-
-    /**
-     * Get the DCCSend Object associated with this window
-     *
-     * @return The DCCSend Object associated with this window
-     */
-    public DCCTransfer getDCC() {
-        return dcc;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Action event
-     */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getActionCommand().equals("Cancel")) {
-            if (dcc.getType() == DCCTransfer.TransferType.SEND) {
-                button.setText("Resend");
-            } else {
-                button.setText("Close Window");
-            }
-            status.setText("Status: Cancelled");
-            dcc.close();
-        } else if (e.getActionCommand().equals("Resend")) {
-            button.setText("Cancel");
-            status.setText("Status: Resending...");
-            synchronized (this) {
-                transferCount = 0;
-            }
-            dcc.reset();
-            if (parser != null && server.getState() == ServerState.CONNECTED) {
-                final String myNickname = parser.getLocalClient().getNickname();
-                // Check again incase we have changed nickname to the same nickname that
-                // this send is for.
-                if (parser.getStringConverter().equalsIgnoreCase(otherNickname, myNickname)) {
-                    final Thread errorThread = new Thread(new Runnable() {
-
-                        /** {@inheritDoc} */
-                        @Override
-                        public void run() {
-                            JOptionPane.showMessageDialog(null,
-                                    "You can't DCC yourself.", "DCC Error",
-                                    JOptionPane.ERROR_MESSAGE);
-                        }
-
-                    });
-                    errorThread.start();
-                    return;
-                } else {
-                    if (IdentityManager.getGlobalConfig().getOptionBool(
-                            plugin.getDomain(), "send.reverse")) {
-                        parser.sendCTCP(otherNickname, "DCC", "SEND \"" +
-                                new File(dcc.getFileName()).getName() + "\" "
-                                + DCC.ipToLong(myPlugin.getListenIP(parser))
-                                + " 0 " + dcc.getFileSize() + " " + dcc.makeToken()
-                                + ((dcc.isTurbo()) ? " T" : ""));
-                        return;
-                    } else if (plugin.listen(dcc)) {
-                        parser.sendCTCP(otherNickname, "DCC", "SEND \""
-                                + new File(dcc.getFileName()).getName() + "\" "
-                                + DCC.ipToLong(myPlugin.getListenIP(parser)) + " "
-                                + dcc.getPort() + " " + dcc.getFileSize()
-                                + ((dcc.isTurbo()) ? " T" : ""));
-                        return;
-                    }
-                }
-            } else {
-                status.setText("Status: Resend failed.");
-                button.setText("Close Window");
-            }
-        } else if (e.getActionCommand().equals("Close Window")) {
-            close();
-        } else if (e.getSource() == openButton) {
-            final File file = new File(dcc.getFileName());
-            try {
-                Desktop.getDesktop().open(file);
-            } catch (IllegalArgumentException ex) {
-                    Logger.userError(ErrorLevel.LOW, "Unable to open file: " +
-                            file, ex);
-                    openButton.setEnabled(false);
-            } catch (IOException ex) {
-                try {
-                    Desktop.getDesktop().open(file.getParentFile());
-                } catch (IllegalArgumentException ex1) {
-                    Logger.userError(ErrorLevel.LOW, "Unable to open folder: " +
-                            file.getParentFile(), ex1);
-                    openButton.setEnabled(false);
-                } catch (IOException ex1) {
-                    Logger.userError(ErrorLevel.LOW, "No associated handler " +
-                            "to open file or directory.", ex1);
-                    openButton.setEnabled(false);
-                }
-            }
-        }
-    }
-
-    /**
-     * Called when data is sent/recieved
-     *
-     * @param dcc The DCCSend that this message is from
-     * @param bytes The number of new bytes that were transfered
-     */
-    @Override
-    public void dataTransfered(final DCCTransfer dcc, final int bytes) {
-        final double percent;
-        synchronized (this) {
-            transferCount += bytes;
-            percent = (100.00 / dcc.getFileSize()) * (transferCount + dcc.getFileStart());
-        }
-
-        boolean percentageInTitle = IdentityManager.getGlobalConfig().getOptionBool(
-                            plugin.getDomain(), "general.percentageInTitle");
-
-        if (dcc.getType() == DCCTransfer.TransferType.SEND) {
-            status.setText("Status: Sending");
-        } else {
-            status.setText("Status: Recieving");
-        }
-
-        if (percentageInTitle) {
-            final StringBuilder title = new StringBuilder();
-            if (dcc.isListenSocket()) { title.append("*"); }
-            title.append(dcc.getType() == DCCTransfer.TransferType.SEND ? "Sending: " : "Recieving: ");
-            title.append(otherNickname);
-            title.append(" ("+ String.format("%.0f", Math.floor(percent)) +"%)");
-            setName(title.toString());
-            setTitle(title.toString());
-        }
-
-        updateSpeedAndTime();
-
-        progress.setValue((int) Math.floor(percent));
-
-        ActionManager.processEvent(DCCActions.DCC_SEND_DATATRANSFERED, null, this, bytes);
-    }
-
-    /**
-     * Update the transfer speed, time remaining and time taken labels.
-     */
-    public void updateSpeedAndTime() {
-        final long time = (System.currentTimeMillis() - timeStarted) / 1000;
-        final double bytesPerSecond;
-        synchronized (this) {
-            bytesPerSecond = (time > 0) ? (transferCount / time) : transferCount;
-        }
-
-        if (bytesPerSecond > 1048576) {
-            speed.setText(String.format("Speed: %.2f MB/s", (bytesPerSecond / 1048576)));
-        } else if (bytesPerSecond > 1024) {
-            speed.setText(String.format("Speed: %.2f KB/s", (bytesPerSecond / 1024)));
-        } else {
-            speed.setText(String.format("Speed: %.2f B/s", bytesPerSecond));
-        }
-
-        final long remaningBytes;
-        synchronized (this) {
-            remaningBytes = dcc.getFileSize() - dcc.getFileStart() - transferCount;
-        }
-        final double remainingSeconds = bytesPerSecond > 0
-                ? (remaningBytes / bytesPerSecond) : 1;
-
-        remaining.setText(String.format("Time Remaining: %s", duration(
-                (int) Math.floor(remainingSeconds))));
-        taken.setText(String.format("Time Taken: %s", timeStarted == 0
-                ? "N/A" : duration(time)));
-    }
-
-    /**
-     * Get the duration in seconds as a string.
-     *
-     * @param secondsInput to get duration for
-     * @return Duration as a string
-     */
-    private String duration(final long secondsInput) {
-        final StringBuilder result = new StringBuilder();
-        final long hours = (secondsInput / 3600);
-        final long minutes = (secondsInput / 60 % 60);
-        final long seconds = (secondsInput % 60);
-
-        if (hours > 0) {
-            result.append(hours + ":");
-        }
-        result.append(String.format("%0,2d:%0,2d", minutes, seconds));
-
-        return result.toString();
-    }
-
-    /**
-     * Called when the socket is closed
-     *
-     * @param dcc The DCCSend that this message is from
-     */
-    @Override
-    public void socketClosed(final DCCTransfer dcc) {
-        ActionManager.processEvent(DCCActions.DCC_SEND_SOCKETCLOSED, null, this);
-        if (!isWindowClosing()) {
-            synchronized (this) {
-                if (transferCount == dcc.getFileSize() - dcc.getFileStart()) {
-                    status.setText("Status: Transfer Compelete.");
-
-                    if (showOpen && dcc.getType() == DCCTransfer.TransferType.RECEIVE) {
-                        openButton.setVisible(true);
-                    }
-                    progress.setValue(100);
-                    setIcon(dcc.getType() == DCCTransfer.TransferType.SEND
-                            ? "dcc-send-done" : "dcc-receive-done");
-                    button.setText("Close Window");
-                } else {
-                    status.setText("Status: Transfer Failed.");
-                    setIcon(dcc.getType() == DCCTransfer.TransferType.SEND
-                            ? "dcc-send-failed" : "dcc-receive-failed");
-                    if (dcc.getType() == DCCTransfer.TransferType.SEND) {
-                        button.setText("Resend");
-                    } else {
-                        button.setText("Close Window");
-                    }
-                }
-            }
-            updateSpeedAndTime();
-        }
-    }
-
-    /**
-     * Called when the socket is opened
-     *
-     * @param dcc The DCCSend that this message is from
-     */
-    @Override
-    public void socketOpened(final DCCTransfer dcc) {
-        ActionManager.processEvent(DCCActions.DCC_SEND_SOCKETOPENED, null, this);
-        status.setText("Status: Socket Opened");
-        timeStarted = System.currentTimeMillis();
-        setIcon(dcc.getType() == DCCTransfer.TransferType.SEND
-                ? "dcc-send-active" : "dcc-receive-active");
-    }
-
-    /**
-     * Closes this container (and it's associated frame).
-     */
-    @Override
-    public void windowClosing() {
-        super.windowClosing();
-        dcc.removeFromTransfers();
-        dcc.close();
-    }
-
-}

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

@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.Main;
+import com.dmdirc.Server;
+import com.dmdirc.addons.dcc.ui.PlaceholderWindow;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.interfaces.Window;
+import java.awt.Dialog.ModalityType;
+
+/**
+ * Creates a placeholder DCC Frame.
+ */
+public class PlaceholderContainer extends FrameContainer<PlaceholderWindow> {
+
+    /** The plugin which owns this placeholder. */
+    private final DCCPlugin plugin;
+
+    /**
+     * Creates a placeholder dcc frame.
+     *
+     * @param plugin The plugin which owns this placeholder
+     */
+    public PlaceholderContainer(final DCCPlugin plugin) {
+        super("dcc", "DCCs", "DCCs", PlaceholderWindow.class, IdentityManager.getGlobalConfig());
+
+        this.plugin = plugin;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void close() {
+        int dccs = 0;
+        for (FrameContainer<?> window : getChildren()) {
+            if (window instanceof TransferContainer) {
+                if (((TransferContainer) window).getDCC().isActive()) {
+                    dccs++;
+                }
+            } else if (window instanceof ChatContainer) {
+                if (((ChatContainer) window).getDCC().isActive()) {
+                    dccs++;
+                }
+            }
+        }
+
+        if (dccs > 0) {
+            new StandardQuestionDialog(
+                    (MainFrame) Main.getUI().getMainWindow(),
+                    ModalityType.MODELESS, "Close confirmation",
+                    "Closing this window will cause all existing DCCs " +
+                    "to terminate, are you sure you want to do this?") {
+                /**
+                 * A version number for this class. It should be changed whenever the class
+                 * structure is changed (or anything else that would prevent serialized
+                 * objects being unserialized with the new class).
+                 */
+                private static final long serialVersionUID = 1;
+
+                /** {@inheritDoc} */
+                @Override
+                public boolean save() {
+                    PlaceholderContainer.super.close();
+                    return true;
+                }
+
+                /** {@inheritDoc} */
+                @Override
+                public void cancelled() {
+                }
+            }.display();
+        } else {
+            super.close();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Server getServer() {
+        return null;
+    }
+
+    /** {@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} */
+    @Override
+    public void windowClosed() {
+        // 7: Remove any references to the window and parents
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void removeChild(final FrameContainer<?> child) {
+        super.removeChild(child);
+
+        if (getChildren().isEmpty()) {
+            close();
+        }
+    }
+}

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

@@ -0,0 +1,381 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.Server;
+import com.dmdirc.ServerState;
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.addons.dcc.actions.DCCActions;
+import com.dmdirc.addons.dcc.io.DCC;
+import com.dmdirc.addons.dcc.io.DCCTransfer;
+import com.dmdirc.addons.dcc.ui.TransferWindow;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
+import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.interfaces.Window;
+
+import java.awt.Desktop;
+import java.io.File;
+import java.util.Date;
+
+import javax.swing.JOptionPane;
+
+/**
+ * This class links DCC Send objects to a window.
+ *
+ * @author Shane 'Dataforce' McCormack
+ */
+public class TransferContainer extends FrameContainer<TransferWindow> implements
+        DCCTransferHandler, SocketCloseListener {
+
+    /** The dcc plugin that owns this frame */
+    protected final DCCPlugin plugin;
+
+    /** The Window we're using. */
+    private boolean windowClosing = false;
+
+    /** The DCCSend object we are a window for */
+    private final DCCTransfer dcc;
+
+    /** Other Nickname */
+    private final String otherNickname;
+
+    /** Total data transfered */
+    private volatile long transferCount = 0;
+
+    /** Time Started */
+    private long timeStarted = 0;
+
+    /** Plugin that this send belongs to. */
+    private final DCCPlugin myPlugin;
+
+    /** IRC Parser that caused this send */
+    private Parser parser = null;
+
+    /** Server that caused this send */
+    private Server server = null;
+
+    /** Show open button. */
+    private boolean showOpen = Desktop.isDesktopSupported() &&
+            Desktop.getDesktop().isSupported(Desktop.Action.OPEN);
+
+    /**
+     * Creates a new instance of DCCTransferWindow with a given DCCTransfer object.
+     *
+     * @param plugin the DCC Plugin responsible for this window
+     * @param dcc The DCCTransfer object this window wraps around
+     * @param title The title of this window
+     * @param targetNick Nickname of target
+     * @param server The server that initiated this send
+     */
+    public TransferContainer(final DCCPlugin plugin, final DCCTransfer dcc,
+            final String title, final String targetNick, final Server server) {
+        super(dcc.getType() == DCCTransfer.TransferType.SEND
+                ? "dcc-send-inactive" : "dcc-receive-inactive",
+                title, title, TransferWindow.class, IdentityManager.getGlobalConfig());
+        this.plugin = plugin;
+        this.dcc = dcc;
+        this.server = server;
+        this.parser = server == null ? null : server.getParser();
+        this.myPlugin = plugin;
+
+        if (parser != null) {
+            parser.getCallbackManager().addNonCriticalCallback(SocketCloseListener.class, this);
+        }
+        dcc.addHandler(this);
+
+        otherNickname = targetNick;
+
+        WindowManager.addWindow(plugin.getContainer(), this);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void onSocketClosed(final Parser parser, final Date date) {
+        // Remove our reference to the parser (and its reference to us)
+        this.parser.getCallbackManager().delAllCallback(this);
+        this.parser = null;
+    }
+
+    /**
+     * Get the DCCSend Object associated with this window
+     *
+     * @return The DCCSend Object associated with this window
+     */
+    public DCCTransfer getDCC() {
+        return dcc;
+    }
+
+    /**
+     * Retrieves the nickname of the other party involved in this transfer.
+     *
+     * @return The other party's nickname
+     * @since 0.6.4
+     */
+    public String getOtherNickname() {
+        return otherNickname;
+    }
+
+    /**
+     * Called when data is sent/recieved
+     *
+     * @param dcc The DCCSend that this message is from
+     * @param bytes The number of new bytes that were transfered
+     */
+    @Override
+    public void dataTransfered(final DCCTransfer dcc, final int bytes) {
+        final double percent;
+        synchronized (this) {
+            transferCount += bytes;
+            percent = getPercent();
+        }
+
+        boolean percentageInTitle = IdentityManager.getGlobalConfig().getOptionBool(
+                            plugin.getDomain(), "general.percentageInTitle");
+
+        if (percentageInTitle) {
+            final StringBuilder title = new StringBuilder();
+            if (dcc.isListenSocket()) { title.append("*"); }
+            title.append(dcc.getType() == DCCTransfer.TransferType.SEND ? "Sending: " : "Recieving: ");
+            title.append(otherNickname);
+            title.append(" ("+ String.format("%.0f", Math.floor(percent)) +"%)");
+            setName(title.toString());
+            setTitle(title.toString());
+        }
+
+        ActionManager.processEvent(DCCActions.DCC_SEND_DATATRANSFERED, null, this, bytes);
+    }
+
+    /**
+     * Retrieves the current percentage progress of this transfer.
+     *
+     * @since 0.6.4
+     * @return The percentage of this transfer that has been completed
+     */
+    public double getPercent() {
+        return (100.00 / dcc.getFileSize()) * (transferCount + dcc.getFileStart());
+    }
+
+    /**
+     * Retrieves the current transfer speed of this transfer.
+     *
+     * @since 0.6.4
+     * @return The speed of this transfer in Bytes/Sec
+     */
+    public double getBytesPerSecond() {
+        final long time = getElapsedTime();
+
+        synchronized (this) {
+            return time > 0 ? (transferCount / time) : transferCount;
+        }
+    }
+
+    /**
+     * Retrieves the estimated time remaining for this transfer.
+     *
+     * @since 0.6.4
+     * @return The number of seconds estimated for this transfer to complete
+     */
+    public double getRemainingTime() {
+        final double bytesPerSecond = getBytesPerSecond();
+        final long remaningBytes;
+
+        synchronized (this) {
+            remaningBytes = dcc.getFileSize() - dcc.getFileStart() - transferCount;
+        }
+
+        return bytesPerSecond > 0 ? (remaningBytes / bytesPerSecond) : 1;
+    }
+
+    /**
+     * Retrieves the timestamp at which this transfer started.
+     *
+     * @since 0.6.4
+     * @return The timestamp (milliseconds since 01/01/1970) at which this transfer started.
+     */
+    public long getStartTime() {
+        return timeStarted;
+    }
+
+    /**
+     * Retrieves the number of seconds that this transfer has been running for.
+     *
+     * @since 0.6.4
+     * @return The number of seconds elapsed since this transfer started
+     */
+    public long getElapsedTime() {
+        return (System.currentTimeMillis() - timeStarted) / 1000;
+    }
+
+    /**
+     * Determines whether this transfer is complete or not.
+     *
+     * @since 0.6.4
+     * @return True if the transfer is complete, false otherwise
+     */
+    public boolean isComplete() {
+        return transferCount == dcc.getFileSize() - dcc.getFileStart();
+    }
+
+    /**
+     * Determines whether the "Open" button should be displayed for this
+     * transfer.
+     *
+     * @since 0.6.4
+     * @return True if the open button should be displayed, false otherwise
+     */
+    public boolean shouldShowOpenButton() {
+        return showOpen && dcc.getType() == DCCTransfer.TransferType.RECEIVE;
+    }
+
+    /**
+     * Called when the socket is closed
+     *
+     * @param dcc The DCCSend that this message is from
+     */
+    @Override
+    public void socketClosed(final DCCTransfer dcc) {
+        ActionManager.processEvent(DCCActions.DCC_SEND_SOCKETCLOSED, null, this);
+        if (!windowClosing) {
+            synchronized (this) {
+                if (transferCount == dcc.getFileSize() - dcc.getFileStart()) {
+                    setIcon(dcc.getType() == DCCTransfer.TransferType.SEND
+                            ? "dcc-send-done" : "dcc-receive-done");
+                } else {
+                    setIcon(dcc.getType() == DCCTransfer.TransferType.SEND
+                            ? "dcc-send-failed" : "dcc-receive-failed");
+                }
+            }
+        }
+    }
+
+    /**
+     * Called when the socket is opened
+     *
+     * @param dcc The DCCSend that this message is from
+     */
+    @Override
+    public void socketOpened(final DCCTransfer dcc) {
+        ActionManager.processEvent(DCCActions.DCC_SEND_SOCKETOPENED, null, this);
+        timeStarted = System.currentTimeMillis();
+        setIcon(dcc.getType() == DCCTransfer.TransferType.SEND
+                ? "dcc-send-active" : "dcc-receive-active");
+    }
+
+    /**
+     * Attempts to resend the transfer.
+     *
+     * @since 0.6.4
+     * @return True if the transfer could be resent, false otherwise
+     */
+    public boolean resend() {
+        synchronized (this) {
+            transferCount = 0;
+        }
+        dcc.reset();
+
+        if (server != null && server.getState() == ServerState.CONNECTED) {
+            final String myNickname = server.getParser().getLocalClient().getNickname();
+            // Check again incase we have changed nickname to the same nickname that
+            // this send is for.
+            if (server.getParser().getStringConverter().equalsIgnoreCase(
+                    otherNickname, myNickname)) {
+                final Thread errorThread = new Thread(new Runnable() {
+
+                    /** {@inheritDoc} */
+                    @Override
+                    public void run() {
+                        JOptionPane.showMessageDialog(null,
+                                "You can't DCC yourself.", "DCC Error",
+                                JOptionPane.ERROR_MESSAGE);
+                    }
+
+                });
+                errorThread.start();
+            } else {
+                if (IdentityManager.getGlobalConfig().getOptionBool(
+                        plugin.getDomain(), "send.reverse")) {
+                    parser.sendCTCP(otherNickname, "DCC", "SEND \"" +
+                            new File(dcc.getFileName()).getName() + "\" "
+                            + DCC.ipToLong(myPlugin.getListenIP(parser))
+                            + " 0 " + dcc.getFileSize() + " " + dcc.makeToken()
+                            + ((dcc.isTurbo()) ? " T" : ""));
+                } else if (plugin.listen(dcc)) {
+                    parser.sendCTCP(otherNickname, "DCC", "SEND \""
+                            + new File(dcc.getFileName()).getName() + "\" "
+                            + DCC.ipToLong(myPlugin.getListenIP(parser)) + " "
+                            + dcc.getPort() + " " + dcc.getFileSize()
+                            + ((dcc.isTurbo()) ? " T" : ""));
+                }
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Closes this container (and it's associated frame).
+     */
+    @Override
+    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} */
+    @Override
+    public void windowClosed() {
+        // 7: Remove any references to the window and parents
+    }
+
+    public void addSocketCloseCallback(final SocketCloseListener listener) {
+        if (server != null && server.getParser() != null) {
+            server.getParser().getCallbackManager()
+                    .addNonCriticalCallback(SocketCloseListener.class, listener);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Server getServer() {
+        return null;
+    }
+
+}

src/com/dmdirc/addons/dcc/actions/DCCEvents.java

@@ -25,8 +25,8 @@ package com.dmdirc.addons.dcc.actions;
 import com.dmdirc.Server;
 import com.dmdirc.actions.interfaces.ActionMetaType;
 
-import com.dmdirc.addons.dcc.DCCChatWindow;
-import com.dmdirc.addons.dcc.DCCTransferWindow;
+import com.dmdirc.addons.dcc.ChatContainer;
+import com.dmdirc.addons.dcc.TransferContainer;
 
 import java.io.File;
 
@@ -42,19 +42,19 @@ public enum DCCEvents implements ActionMetaType {
     /** DCC Chat Request Sent. */
     DCC_CHAT_REQUEST_SENT(new String[]{"server", "client"}, Server.class, String.class),
     /** DCC Message from another person. */
-    DCC_CHAT_MESSAGE(new String[]{"DCCChatWindow", "Nickname", "Message"}, DCCChatWindow.class, String.class, String.class),
+    DCC_CHAT_MESSAGE(new String[]{"DCCChatWindow", "Nickname", "Message"}, ChatContainer.class, String.class, String.class),
     /** DCC Message to another person. */
-    DCC_CHAT_SELFMESSAGE(new String[]{"DCCChatWindow", "Message"}, DCCChatWindow.class, String.class),
+    DCC_CHAT_SELFMESSAGE(new String[]{"DCCChatWindow", "Message"}, ChatContainer.class, String.class),
     /** DCC Chat Socket Closed. */
-    DCC_CHAT_SOCKETCLOSED(new String[]{"DCCChatWindow"}, DCCChatWindow.class),
+    DCC_CHAT_SOCKETCLOSED(new String[]{"DCCChatWindow"}, ChatContainer.class),
     /** DCC Chat Socket Opened. */
-    DCC_CHAT_SOCKETOPENED(new String[]{"DCCChatWindow"}, DCCChatWindow.class),
+    DCC_CHAT_SOCKETOPENED(new String[]{"DCCChatWindow"}, ChatContainer.class),
     /** DCC Send Socket Closed. */
-    DCC_SEND_SOCKETCLOSED(new String[]{"DCCSendWindow"}, DCCTransferWindow.class),
+    DCC_SEND_SOCKETCLOSED(new String[]{"DCCSendWindow"}, TransferContainer.class),
     /** DCC Send Socket Opened. */
-    DCC_SEND_SOCKETOPENED(new String[]{"DCCSendWindow"}, DCCTransferWindow.class),
+    DCC_SEND_SOCKETOPENED(new String[]{"DCCSendWindow"}, TransferContainer.class),
     /** DCC Send Data Transfered */
-    DCC_SEND_DATATRANSFERED(new String[]{"DCCSendWindow", "Bytes Transfered"}, DCCTransferWindow.class, int.class),
+    DCC_SEND_DATATRANSFERED(new String[]{"DCCSendWindow", "Bytes Transfered"}, TransferContainer.class, int.class),
     /** DCC Send Request. */
     DCC_SEND_REQUEST(new String[]{"server", "client", "file"}, Server.class, String.class, String.class),
     /** DCC Send Request Sent. */

src/com/dmdirc/addons/dcc/DCC.java → src/com/dmdirc/addons/dcc/io/DCC.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.dcc;
+package com.dmdirc.addons.dcc.io;
 
 import java.net.Socket;
 import java.net.ServerSocket;
@@ -206,7 +206,7 @@ public abstract class DCC implements Runnable {
     /**
      * Called to close the socket
      */
-    protected void close() {
+    public void close() {
         boolean haveSLS = false;
 
         while (!serverSocketSem.tryAcquire() && !(haveSLS = serverListeningSem.tryAcquire())) {

src/com/dmdirc/addons/dcc/DCCChat.java → src/com/dmdirc/addons/dcc/io/DCCChat.java

@@ -20,8 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.dcc;
+package com.dmdirc.addons.dcc.io;
 
+import com.dmdirc.addons.dcc.DCCChatHandler;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;

src/com/dmdirc/addons/dcc/DCCTransfer.java → src/com/dmdirc/addons/dcc/io/DCCTransfer.java

@@ -20,7 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.dcc;
+package com.dmdirc.addons.dcc.io;
+
+import com.dmdirc.addons.dcc.DCCTransferHandler;
+import com.dmdirc.util.ListenerList;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -52,8 +55,8 @@ public class DCCTransfer extends DCC {
     /** The File transfer type for this file. */
     private TransferType transferType = TransferType.RECEIVE;
 
-    /** The handler for this DCCSend. */
-    private DCCTransferHandler handler;
+    /** The handlers for this DCCSend. */
+    private final ListenerList handlers = new ListenerList();
 
     /** Used to send data out the socket. */
     private DataOutputStream out;
@@ -326,8 +329,8 @@ public class DCCTransfer extends DCC {
      *
      * @param handler A class implementing DCCTransferHandler
      */
-    public void setHandler(final DCCTransferHandler handler) {
-        this.handler = handler;
+    public void addHandler(final DCCTransferHandler handler) {
+        handlers.add(DCCTransferHandler.class, handler);
     }
 
     /** {@inheritDoc} */
@@ -342,7 +345,8 @@ public class DCCTransfer extends DCC {
             }
             out = new DataOutputStream(socket.getOutputStream());
             in = new DataInputStream(socket.getInputStream());
-            if (handler != null) {
+
+            for (DCCTransferHandler handler : handlers.get(DCCTransferHandler.class)) {
                 handler.socketOpened(this);
             }
         } catch (IOException ioe) {
@@ -368,7 +372,8 @@ public class DCCTransfer extends DCC {
         }
         out = null;
         in = null;
-        if (handler != null) {
+        
+        for (DCCTransferHandler handler : handlers.get(DCCTransferHandler.class)) {
             handler.socketClosed(this);
         }
         // Try to delete empty files.
@@ -408,7 +413,7 @@ public class DCCTransfer extends DCC {
             readSize = readSize + bytesRead;
 
             if (bytesRead > 0) {
-                if (handler != null) {
+                for (DCCTransferHandler handler : handlers.get(DCCTransferHandler.class)) {
                     handler.dataTransfered(this, bytesRead);
                 }
                 fileOut.write(data, 0, bytesRead);
@@ -453,7 +458,7 @@ public class DCCTransfer extends DCC {
             readSize = readSize + bytesRead;
 
             if (bytesRead > 0) {
-                if (handler != null) {
+                for (DCCTransferHandler handler : handlers.get(DCCTransferHandler.class)) {
                     handler.dataTransfered(this, bytesRead);
                 }
                 out.write(data, 0, bytesRead);

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

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.ui;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.commandparser.PopupType;
+
+import javax.swing.JPopupMenu;
+
+/**
+ * Empty Frame.
+ */
+public class EmptyWindow extends TextFrame {
+
+    /** A version number for this class. */
+    private static final long serialVersionUID = 2l;
+
+    /**
+     * Creates a new empty window for the specified UI controller and owner.
+     *
+     * @param controller The UIController that owns this window
+     * @param owner The frame container that owns this window
+     */
+    public EmptyWindow(final SwingController controller, final FrameContainer<?> owner) {
+        super(owner, controller);
+        setTextPane(null);
+        pack();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public PopupType getNicknamePopupType() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public PopupType getChannelPopupType() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public PopupType getHyperlinkPopupType() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public PopupType getNormalPopupType() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void addCustomPopupItems(final JPopupMenu popupMenu) {
+        //Add no custom popup items
+    }
+}

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

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.ui;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+
+/**
+ * A virtually empty window which serves as a top-level placeholder for other
+ * DCC windows.
+ * 
+ * @author chris
+ * @since 0.6.4
+ */
+public class PlaceholderWindow extends EmptyWindow {
+
+    /** A version number for this class. */
+    private static final long serialVersionUID = 1l;
+
+    /**
+     * Creates a new placeholder window for the specified UI controller and owner.
+     *
+     * @param controller The UIController that owns this window
+     * @param owner The frame container that owns this window
+     */
+    public PlaceholderWindow(final SwingController controller,
+            final FrameContainer<?> owner) {
+        super(controller, owner);
+
+        add(new TextLabel(
+                "This is a placeholder window to group DCCs together."
+                + "\n\nClosing this window will close all the active DCCs"));
+    }
+
+}

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

@@ -0,0 +1,278 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.dcc.ui;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.dcc.DCCTransferHandler;
+import com.dmdirc.addons.dcc.TransferContainer;
+import com.dmdirc.addons.dcc.io.DCCTransfer;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
+
+import java.awt.Desktop;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.IOException;
+import java.util.Date;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JProgressBar;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * A window for displaying the progress of DCC transfers.
+ *
+ * @author chris
+ * @since 0.6.4
+ */
+public class TransferWindow extends EmptyWindow implements ActionListener,
+        SocketCloseListener, DCCTransferHandler {
+
+    /** A version number for this class. */
+    private static final long serialVersionUID = 1l;
+
+    /** Progress Bar */
+    private final JProgressBar progress = new JProgressBar();
+
+    /** Status Label */
+    private final JLabel status = new JLabel("Status: Waiting");
+
+    /** Speed Label */
+    private final JLabel speed = new JLabel("Speed: Unknown");
+
+    /** Time Label */
+    private final JLabel remaining = new JLabel("Time Remaining: Unknown");
+
+    /** Time Taken */
+    private final JLabel taken = new JLabel("Time Taken: 00:00");
+
+    /** Button */
+    private final JButton button = new JButton("Cancel");
+
+    /** Open Button */
+    private final JButton openButton = new JButton("Open");
+
+    /** The transfer that this window is showing. */
+    private final DCCTransfer dcc;
+
+    /**
+     * Creates a new transfer window for the specified UI controller and owner.
+     *
+     * @param controller The UIController that owns this window
+     * @param owner The frame container that owns this window
+     */
+    public TransferWindow(final SwingController controller, final FrameContainer<?> owner) {
+        super(controller, owner);
+        
+        final TransferContainer container = (TransferContainer) owner;
+        dcc = container.getDCC();
+
+        dcc.addHandler(this);
+        container.addSocketCloseCallback(this);
+
+        setLayout(new MigLayout("hidemode 0"));
+
+        if (dcc.getType() == DCCTransfer.TransferType.SEND) {
+            add(new JLabel("Sending: " + dcc.getShortFileName()), "wrap");
+            add(new JLabel("To: " + container.getOtherNickname()), "wrap");
+        } else {
+            add(new JLabel("Recieving: " + dcc.getShortFileName()), "wrap");
+            add(new JLabel("From: " + container.getOtherNickname()), "wrap");
+        }
+
+        add(status, "wrap");
+        add(speed, "wrap");
+        add(remaining, "wrap");
+        add(taken, "wrap");
+        add(progress, "growx, wrap");
+
+        button.addActionListener(this);
+        openButton.addActionListener(this);
+        openButton.setVisible(false);
+
+        add(openButton, "split 2, align right");
+        add(button, "align right");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        if (e.getActionCommand().equals("Cancel")) {
+            if (dcc.getType() == DCCTransfer.TransferType.SEND) {
+                button.setText("Resend");
+            } else {
+                button.setText("Close Window");
+            }
+            status.setText("Status: Cancelled");
+            dcc.close();
+        } else if (e.getActionCommand().equals("Resend")) {
+            button.setText("Cancel");
+            status.setText("Status: Resending...");
+
+            if (!((TransferContainer) frameParent).resend()) {
+                status.setText("Status: Resend failed.");
+                button.setText("Close Window");
+            }
+        } else if (e.getActionCommand().equals("Close Window")) {
+            close();
+        } else if (e.getSource() == openButton) {
+            final File file = new File(dcc.getFileName());
+            try {
+                Desktop.getDesktop().open(file);
+            } catch (IllegalArgumentException ex) {
+                Logger.userError(ErrorLevel.LOW, "Unable to open file: " + file, ex);
+                openButton.setEnabled(false);
+            } catch (IOException ex) {
+                try {
+                    Desktop.getDesktop().open(file.getParentFile());
+                } catch (IllegalArgumentException ex1) {
+                    Logger.userError(ErrorLevel.LOW, "Unable to open folder: " +
+                            file.getParentFile(), ex1);
+                    openButton.setEnabled(false);
+                } catch (IOException ex1) {
+                    Logger.userError(ErrorLevel.LOW, "No associated handler " +
+                            "to open file or directory.", ex1);
+                    openButton.setEnabled(false);
+                }
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void onSocketClosed(final Parser parser, final Date date) {
+        // Can't resend without the parser.
+        if ("Resend".equals(button.getText())) {
+            button.setText("Close Window");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void socketClosed(final DCCTransfer dcc) {
+        UIUtilities.invokeLater(new Runnable() {
+
+            private final TransferContainer container = (TransferContainer) frameParent;
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                if (container.isComplete()) {
+                    status.setText("Status: Transfer Compelete.");
+
+                    if (container.shouldShowOpenButton()) {
+                        openButton.setVisible(true);
+                    }
+                    
+                    progress.setValue(100);
+                    button.setText("Close Window");
+                } else {
+                    status.setText("Status: Transfer Failed.");
+                    if (dcc.getType() == DCCTransfer.TransferType.SEND) {
+                        button.setText("Resend");
+                    } else {
+                        button.setText("Close Window");
+                    }
+                }
+            }
+        });
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void socketOpened(final DCCTransfer dcc) {
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                status.setText("Status: Socket Opened");
+            }
+
+        });
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void dataTransfered(final DCCTransfer dcc, final int bytes) {
+        UIUtilities.invokeLater(new Runnable() {
+
+            private final TransferContainer container = (TransferContainer) frameParent;
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                if (dcc.getType() == DCCTransfer.TransferType.SEND) {
+                    status.setText("Status: Sending");
+                } else {
+                    status.setText("Status: Recieving");
+                }
+
+                progress.setValue((int) container.getPercent());
+
+                final double bytesPerSecond = container.getBytesPerSecond();
+
+                if (bytesPerSecond > 1048576) {
+                    speed.setText(String.format("Speed: %.2f MiB/s", bytesPerSecond / 1048576));
+                } else if (bytesPerSecond > 1024) {
+                    speed.setText(String.format("Speed: %.2f KiB/s", bytesPerSecond / 1024));
+                } else {
+                    speed.setText(String.format("Speed: %.2f B/s", bytesPerSecond));
+                }
+
+                remaining.setText(String.format("Time Remaining: %s",
+                        duration((int) container.getRemainingTime())));
+                taken.setText(String.format("Time Taken: %s", container.getStartTime() == 0
+                        ? "N/A" : duration(container.getElapsedTime())));
+            }
+        });
+    }
+
+    /**
+     * Get the duration in seconds as a string.
+     *
+     * @param secondsInput to get duration for
+     * @return Duration as a string
+     */
+    private String duration(final long secondsInput) {
+        final StringBuilder result = new StringBuilder();
+        final long hours = (secondsInput / 3600);
+        final long minutes = (secondsInput / 60 % 60);
+        final long seconds = (secondsInput % 60);
+
+        if (hours > 0) {
+            result.append(hours + ":");
+        }
+        result.append(String.format("%0,2d:%0,2d", minutes, seconds));
+
+        return result.toString();
+    }
+
+}

test/com/dmdirc/addons/dcc/IpToLongTest.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.dcc;
 
+import com.dmdirc.addons.dcc.io.DCC;
 import java.util.Arrays;
 import java.util.List;