Initial work on componentising DCC plugin (and all windows)

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

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

@@ -32,7 +32,10 @@ import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
 import com.dmdirc.addons.dcc.kde.KFileChooser;
+import com.dmdirc.addons.dcc.ui.PlaceholderWindow;
+import com.dmdirc.addons.dcc.ui.TransferWindow;
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -53,12 +56,14 @@ import java.io.File;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.HashSet;
 
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 
 /**
- * This plugin adds DCC to dmdirc.
+ * This plugin adds DCC to DMDirc.
  */
 public final class DCCPlugin extends BasePlugin implements ActionListener {
 
@@ -69,6 +74,15 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
     public DCCPlugin() {
         super();
         registerCommand(new DCCCommand(this), DCCCommand.INFO);
+        final SwingWindowFactory factory = ((SwingController) PluginManager
+                .getPluginManager().getPluginInfoByName("ui_swing").getPlugin())
+                .getWindowFactory();
+        factory.registerImplementation(new HashSet<String>(Arrays.asList(
+                "com.dmdirc.addons.dcc.ui.PlaceholderPanel")),
+                PlaceholderWindow.class);
+        factory.registerImplementation(new HashSet<String>(Arrays.asList(
+                "com.dmdirc.addons.dcc.ui.TransferPanel")),
+                TransferWindow.class);
     }
 
     /**

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

@@ -31,7 +31,7 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.plugins.PluginManager;
 
 import java.awt.Dialog.ModalityType;
-import java.util.Collections;
+import java.util.Arrays;
 
 /**
  * Creates a placeholder DCC Frame.
@@ -42,13 +42,14 @@ public class PlaceholderContainer extends FrameContainer {
     private final DCCPlugin plugin;
 
     /**
-     * Creates a placeholder dcc frame.
+     * 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(), Collections.<String>emptyList());
+                IdentityManager.getGlobalConfig(),
+                Arrays.asList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
 
         this.plugin = plugin;
     }

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

@@ -37,7 +37,7 @@ import com.dmdirc.ui.WindowManager;
 
 import java.awt.Desktop;
 import java.io.File;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.Date;
 
 import javax.swing.JOptionPane;
@@ -95,7 +95,7 @@ public class TransferContainer extends FrameContainer implements
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
                 title, title, TransferWindow.class,
                 IdentityManager.getGlobalConfig(),
-                Collections.<String>emptyList());
+                Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel"));
         this.plugin = plugin;
         this.dcc = dcc;
         this.server = server;

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

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2006-2011 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.addons.ui_swing.components.text.TextLabel;
+
+import javax.swing.JPanel;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * A panel which serves as a top-level placeholder for other DCC windows.
+ *
+ * @since 0.6.6
+ */
+public class PlaceholderPanel extends JPanel {
+
+    /** A version number for this class. */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a new placeholder window for the specified UI controller and
+     * owner.
+     */
+    public PlaceholderPanel() {
+        super(new MigLayout("fill, alignx center, aligny center"));
+        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/PlaceholderWindow.java

@@ -24,13 +24,11 @@ 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 {
@@ -47,10 +45,7 @@ public class PlaceholderWindow extends EmptyWindow {
     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"));
+        add(new PlaceholderPanel());
     }
 
 }

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

@@ -0,0 +1,277 @@
+/*
+ * Copyright (c) 2006-2011 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.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.JPanel;
+import javax.swing.JProgressBar;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * A panel for displaying the progress of DCC transfers.
+ *
+ * @since 0.6.6
+ */
+public class TransferPanel extends JPanel implements ActionListener,
+        SocketCloseListener, DCCTransferHandler {
+
+    /** A version number for this class. */
+    private static final long serialVersionUID = 1L;
+    /** Parent container. */
+    private final TransferContainer transferContainer;
+    /** 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 owner The frame container that owns this window
+     */
+    public TransferPanel(final FrameContainer owner) {
+        super();
+
+        this.transferContainer = (TransferContainer) owner;
+        dcc = transferContainer.getDCC();
+
+        dcc.addHandler(this);
+        transferContainer.addSocketCloseCallback(this);
+
+        setLayout(new MigLayout("hidemode 0"));
+
+        if (dcc.getType() == DCCTransfer.TransferType.SEND) {
+            add(new JLabel("Sending: " + dcc.getShortFileName()), "wrap");
+            add(new JLabel("To: " + transferContainer
+                    .getOtherNickname()), "wrap");
+        } else {
+            add(new JLabel("Recieving: " + dcc.getShortFileName()), "wrap");
+            add(new JLabel("From: " + transferContainer
+                    .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}
+     *
+     * @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...");
+
+            if (!(transferContainer.resend())) {
+                status.setText("Status: Resend failed.");
+                button.setText("Close Window");
+            }
+        } else if (e.getActionCommand().equals("Close Window")) {
+            transferContainer.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) {
+        if ("Resend".equals(button.getText())) {
+            button.setText("Close Window");
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void socketClosed(final DCCTransfer dcc) {
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                if (transferContainer.isComplete()) {
+                    status.setText("Status: Transfer Compelete.");
+
+                    if (transferContainer.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() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                if (dcc.getType() == DCCTransfer.TransferType.SEND) {
+                    status.setText("Status: Sending");
+                } else {
+                    status.setText("Status: Recieving");
+                }
+
+                progress.setValue((int) transferContainer.getPercent());
+
+                final double bytesPerSecond = transferContainer
+                        .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) transferContainer.getRemainingTime())));
+                taken.setText(String.format("Time Taken: %s", transferContainer
+                        .getStartTime() == 0 ? "N/A" : duration(
+                        transferContainer.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(":");
+        }
+        result.append(String.format("%0,2d:%0,2d", minutes, seconds));
+
+        return result.toString();
+    }
+
+}

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

@@ -23,256 +23,27 @@
 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 {
+public class TransferWindow extends EmptyWindow {
 
     /** 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) {
+    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")) {
-            getContainer().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");
-        }
+        add(new TransferPanel(owner));
     }
-
-    /** {@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();
-    }
-
 }

src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java

@@ -34,12 +34,13 @@ import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.interfaces.FrameListener;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.util.ListenerList;
+
 import java.util.Arrays;
 import java.util.Collection;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Handles creation of windows in the Swing UI.
@@ -49,26 +50,38 @@ import java.util.Map;
 public class SwingWindowFactory implements FrameListener {
 
     /** A map of known implementations of window interfaces. */
-    private static final Map<Collection<String>, Class<? extends Window>> IMPLEMENTATIONS
-            = new HashMap<Collection<String>, Class<? extends Window>>();
-
+    private final Map<Collection<String>, Class<? extends Window>>
+            implementations = new HashMap<Collection<String>,
+            Class<? extends Window>>();
     /** A map of frame containers to their Swing windows. */
-    private final Map<FrameContainer, TextFrame> windows = new HashMap<FrameContainer, TextFrame>();
+    private final Map<FrameContainer, TextFrame> windows
+            = new HashMap<FrameContainer, TextFrame>();
+    /** The controller that owns this window factory. */
+    private final SwingController controller;
+    /** Our list of listeners. */
+    private final ListenerList listeners = new ListenerList();
+
+    /**
+     * Creates a new window factory for the specified controller.
+     *
+     * @param controller The controller this factory is for
+     */
+    public SwingWindowFactory(final SwingController controller) {
+        this.controller = controller;
 
-    static {
-        IMPLEMENTATIONS.put(new HashSet<String>(
+        registerImplementation(new HashSet<String>(
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier())),
                 CustomFrame.class);
-        IMPLEMENTATIONS.put(new HashSet<String>(
+        registerImplementation(new HashSet<String>(
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                 WindowComponent.INPUTFIELD.getIdentifier())),
                 CustomInputFrame.class);
-        IMPLEMENTATIONS.put(new HashSet<String>(
+        registerImplementation(new HashSet<String>(
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                 WindowComponent.INPUTFIELD.getIdentifier(),
                 WindowComponent.CERTIFICATE_VIEWER.getIdentifier())),
                 ServerFrame.class);
-        IMPLEMENTATIONS.put(new HashSet<String>(
+        registerImplementation(new HashSet<String>(
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                 WindowComponent.INPUTFIELD.getIdentifier(),
                 WindowComponent.TOPICBAR.getIdentifier(),
@@ -76,19 +89,9 @@ public class SwingWindowFactory implements FrameListener {
                 ChannelFrame.class);
     }
 
-    /** The controller that owns this window factory. */
-    private final SwingController controller;
-
-    /** Our list of listeners. */
-    private final ListenerList listeners = new ListenerList();
-
-    /**
-     * Creates a new window factory for the specified controller.
-     *
-     * @param controller The controller this factory is for
-     */
-    public SwingWindowFactory(final SwingController controller) {
-        this.controller = controller;
+    public final void registerImplementation(final Set<String> components,
+            final Class<? extends Window> clazz) {
+        implementations.put(components, clazz);
     }
 
     /**
@@ -128,14 +131,17 @@ public class SwingWindowFactory implements FrameListener {
             final boolean focus) {
         final Class<? extends Window> clazz;
 
-        if (IMPLEMENTATIONS.containsKey(window.getComponents())) {
-            clazz = IMPLEMENTATIONS.get(window.getComponents());
+        if (implementations.containsKey(window.getComponents())) {
+            clazz = implementations.get(window.getComponents());
         } else {
-            clazz = window.getWindowClass();
+            Logger.userError(ErrorLevel.HIGH,
+                    "Unable to create window: Unknown type");
+            return null;
         }
 
         try {
-            final TextFrame frame = (TextFrame) clazz.getConstructors()[0].newInstance(controller, window);
+            final TextFrame frame = (TextFrame) clazz.getConstructors()[0]
+                    .newInstance(controller, window);
             windows.put(window, frame);
 
             return frame;
@@ -147,7 +153,8 @@ public class SwingWindowFactory implements FrameListener {
 
     /**
      * Retrieves a single Swing UI created window belonging to the specified
-     * container. Returns null if the container is null or no such window exists.
+     * container. Returns null if the container is null or no such window
+     * exists.
      *
      * @param window The container whose windows should be searched
      * @return A relevant window or null
@@ -177,7 +184,8 @@ public class SwingWindowFactory implements FrameListener {
                     return;
                 }
 
-                for (SwingWindowListener listener : listeners.get(SwingWindowListener.class)) {
+                for (SwingWindowListener listener : listeners.get(
+                        SwingWindowListener.class)) {
                     listener.windowAdded(parentWindow, childWindow);
                 }
 
@@ -190,7 +198,8 @@ public class SwingWindowFactory implements FrameListener {
 
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer parent, final FrameContainer window) {
+    public void delWindow(final FrameContainer parent,
+            final FrameContainer window) {
         UIUtilities.invokeLater(new Runnable() {
 
             @Override
@@ -198,7 +207,8 @@ public class SwingWindowFactory implements FrameListener {
                 final TextFrame parentWindow = getSwingWindow(parent);
                 final TextFrame childWindow = getSwingWindow(window);
 
-                for (SwingWindowListener listener : listeners.get(SwingWindowListener.class)) {
+                for (SwingWindowListener listener : listeners.get(
+                        SwingWindowListener.class)) {
                     listener.windowDeleted(parentWindow, childWindow);
                 }
 

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

@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2006-2011 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.ui_swing.components.frames;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.commandparser.PopupType;
+
+import javax.swing.JPopupMenu;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * A very basic frame that adds components from a frame container.
+ */
+public class ComponentFrame extends TextFrame {
+
+    /**
+     * 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 = 2;
+
+    /**
+     * Creates a new instance of CustomFrame.
+     *
+     * @param owner The frame container that owns this frame
+     * @param controller Swing controller
+     */
+    public ComponentFrame(final SwingController controller,
+            final FrameContainer owner) {
+        super(owner, controller);
+
+        initComponents();
+    }
+
+    /**
+     * Initialises components in this frame.
+     */
+    private void initComponents() {
+        setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
+        add(getTextPane(), "grow, push");
+        add(getSearchBar(), "growx, pushx");
+    }
+
+    /** {@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/ui_swing/components/frames/ComponentInputFrame.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2006-2011 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.ui_swing.components.frames;
+
+import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
+import com.dmdirc.commandparser.PopupType;
+
+import javax.swing.JPopupMenu;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * A component frame that includes an input field (for use with writable
+ * containers).
+ */
+public class ComponentInputFrame extends InputTextFrame {
+
+    /**
+     * 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 = 2;
+
+    /**
+     * Creates a new instance of CustomInputFrame.
+     *
+     * @param owner The frame container that owns this frame
+     * @param controller Swing controller
+     */
+    public ComponentInputFrame(final SwingController controller,
+            final WritableFrameContainer owner) {
+        super(controller, owner);
+
+        setInputHandler(new SwingInputHandler(getInputField(),
+                owner.getCommandParser(), getContainer()));
+
+        initComponents();
+    }
+
+    /**
+     * Initialises components in this frame.
+     */
+    private void initComponents() {
+        setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
+        add(getTextPane(), "grow, push");
+        add(getSearchBar(), "growx, pushx");
+        add(inputPanel, "growx, pushx");
+    }
+
+    /** {@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
+    }
+}