Massive window changes.

See corresponding core change for full details.

Change-Id: I6ddf872aa7073dd9306a17f6ae03c462a5898296
Reviewed-on: http://gerrit.dmdirc.com/1143
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/audio/AudioCommand.java

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.io.File;
 
@@ -47,7 +46,7 @@ public final class AudioCommand extends GlobalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final boolean isSilent,
+    public void execute(final FrameContainer<?> origin, final boolean isSilent,
                         final CommandArguments args) {
         final String filename = args.getArgumentsAsString();
         final File file = new File(filename);

src/com/dmdirc/addons/audio/BeepCommand.java

@@ -46,7 +46,7 @@ public final class BeepCommand extends GlobalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final boolean isSilent,
+    public void execute(final FrameContainer<?> origin, final boolean isSilent,
                         final CommandArguments args) {
         Toolkit.getDefaultToolkit().beep();
     }

src/com/dmdirc/addons/calc/CalcCommand.java

@@ -38,7 +38,7 @@ public class CalcCommand extends GlobalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final boolean isSilent,
+    public void execute(final FrameContainer<?> origin, final boolean isSilent,
             final CommandArguments args) {
         try {
             int offset = 0;

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

@@ -24,14 +24,14 @@ package com.dmdirc.addons.dcc;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.dcc.actions.DCCActions;
-import com.dmdirc.Main;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * This class links DCC Chat objects to a window.
  *
  * @author Shane 'Dataforce' McCormack
  */
-public class DCCChatWindow extends DCCFrame implements DCCChatHandler {
+public class DCCChatWindow extends DCCFrame<InputWindow> implements DCCChatHandler {
 
     /** The DCCChat object we are a window for */
     private final DCCChat dcc;
@@ -53,18 +53,16 @@ public class DCCChatWindow extends DCCFrame implements DCCChatHandler {
      */
     public DCCChatWindow(final DCCPlugin plugin, final DCCChat dcc,
             final String title, final String nick, final String targetNick) {
-        super(plugin, title, "dcc-chat-inactive", false,
+        super(plugin, title, "dcc-chat-inactive", InputWindow.class,
                 DCCCommandParser.getDCCCommandParser());
         this.dcc = dcc;
         dcc.setHandler(this);
         nickname = nick;
         otherNickname = targetNick;
 
-        myWindow = Main.getUI().getInputWindow(this);
         plugin.addWindow(this);
 
         setTitle(title);
-        myWindow.open();
     }
 
     /**

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

@@ -66,7 +66,7 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length > 1) {
             final String type = args.getArguments()[0];
@@ -136,7 +136,7 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
      * @param filename The file to send
      * @since 0.6.3m1
      */
-    public void sendFile(final String target, final FrameContainer origin,
+    public void sendFile(final String target, final FrameContainer<?> origin,
             final Server server, final boolean isSilent, final String filename) {
         // New thread to ask the user what file to send
         final File givenFile = new File(filename);

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

@@ -77,7 +77,7 @@ public class DCCCommandParser extends CommandParser {
      * @param args The arguments to the command
      */
     @Override
-    protected void executeCommand(final FrameContainer origin,
+    protected void executeCommand(final FrameContainer<?> origin,
             final boolean isSilent, final Command command, final CommandArguments args) {
         ((GlobalCommand) command).execute(origin, isSilent, args);
     }
@@ -91,13 +91,13 @@ public class DCCCommandParser extends CommandParser {
      * @param line The line input by the user
      */
     @Override
-    protected void handleNonCommand(final FrameContainer origin, final String line) {
-        ((WritableFrameContainer) origin).sendLine(line);
+    protected void handleNonCommand(final FrameContainer<?> origin, final String line) {
+        ((WritableFrameContainer<?>) origin).sendLine(line);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setOwner(final FrameContainer owner) {
+    public void setOwner(final FrameContainer<?> owner) {
         // Don't care
     }
 

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

@@ -22,21 +22,19 @@
 
 package com.dmdirc.addons.dcc;
 
-import com.dmdirc.Main;
 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.addons.ui_swing.UIUtilities;
 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 com.dmdirc.util.ReturnableThread;
 import java.awt.Container;
 
 import javax.swing.JPopupMenu;
@@ -44,14 +42,15 @@ import javax.swing.JPopupMenu;
 /**
  * This class links DCC objects to a window.
  *
+ * @param <T> The type of window which corresponds to this DCC frame
  * @author Shane 'Dataforce' McCormack
  */
-public abstract class DCCFrame extends WritableFrameContainer {
+public abstract class DCCFrame<T extends InputWindow> extends WritableFrameContainer<T> {
 
     /**
      * Empty Frame.
      */
-    class EmptyFrame extends InputTextFrame {
+    static class EmptyFrame extends InputTextFrame {
 
         /** A version number for this class. */
         private static final long serialVersionUID = 200711271;
@@ -61,8 +60,8 @@ public abstract class DCCFrame extends WritableFrameContainer {
          *
          * @param owner The frame container that owns this frame
          */
-        public EmptyFrame(final WritableFrameContainer owner) {
-            super(owner, (SwingController) Main.getUI());
+        public EmptyFrame(final SwingController controller, final WritableFrameContainer<?> owner) {
+            super(controller, owner);
             setTextPane(null);
             pack();
         }
@@ -109,55 +108,25 @@ public abstract class DCCFrame extends WritableFrameContainer {
 
     }
 
-    /** The Window we're using. */
-    protected InputWindow myWindow = null;
-
     /** The dcc plugin that owns this frame */
     protected final DCCPlugin plugin;
 
     /** The Window we're using. */
     private boolean windowClosing = false;
 
-    /**
-     * Creates a new instance of DCCFrame with an empty window.
-     *
-     * @param plugin The DCCPlugin that owns this frame
-     * @param title The title of this window
-     * @param icon The icon to use
-     * @param parser Command parser to use for this window
-     */
-    public DCCFrame(final DCCPlugin plugin, final String title,
-            final String icon, final CommandParser parser) {
-        this(plugin, title, icon, true, parser);
-    }
-
     /**
      * Creates a new instance of DCCFrame.
      *
      * @param plugin The DCCPlugin that owns this frame
      * @param title The title of this window
-     * @param defaultWindow Create default (empty) window. (non-default = chat frame)
      * @param icon The icon to use
+     * @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,
-            final boolean defaultWindow, final CommandParser parser) {
-        super(icon, title, title, IdentityManager.getGlobalConfig(), parser);
+            final Class<T> windowClass, final CommandParser parser) {
+        super(icon, title, title, windowClass, IdentityManager.getGlobalConfig(), parser);
         this.plugin = plugin;
-
-        if (defaultWindow) {
-            myWindow = UIUtilities.invokeAndWait(new ReturnableThread<EmptyFrame>() {
-
-                /** {@inheritDoc} */
-                @Override
-                public void run() {
-                    final EmptyFrame frame = new EmptyFrame(DCCFrame.this);
-                    setTitle(title);
-                    setObject(frame);
-                }
-
-            });
-        }
     }
 
     /**
@@ -180,16 +149,6 @@ public abstract class DCCFrame extends WritableFrameContainer {
         return 512;
     }
 
-    /**
-     * Returns the internal frame associated with this object.
-     *
-     * @return The internal frame associated with this object
-     */
-    @Override
-    public InputWindow getFrame() {
-        return myWindow;
-    }
-
     /**
      * Returns the content pane of the internal frame associated with this object.
      *
@@ -209,6 +168,12 @@ public abstract class DCCFrame extends WritableFrameContainer {
         return null;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public TabCompleter getTabCompleter() {
+        return new TabCompleter();
+    }
+
     /**
      * Is the window closing?
      *
@@ -224,7 +189,7 @@ public abstract class DCCFrame extends WritableFrameContainer {
         windowClosing = true;
 
         // 1: Make the window non-visible
-        myWindow.setVisible(false);
+        getFrame().setVisible(false);
 
         // 2: Remove any callbacks or listeners
         // 3: Trigger any actions neccessary
@@ -241,7 +206,6 @@ public abstract class DCCFrame extends WritableFrameContainer {
     @Override
     public void windowClosed() {
         // 7: Remove any references to the window and parents
-        myWindow = null; // NOPMD
     }
 
 }

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

@@ -28,6 +28,7 @@ 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;
@@ -625,7 +626,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
 /**
  * Creates a placeholder DCC Frame.
  */
-class PlaceholderDCCFrame extends DCCFrame {
+class PlaceholderDCCFrame extends DCCFrame<EmptyFrame> {
 
     /**
      * Creates a placeholder dcc frame.
@@ -633,13 +634,13 @@ class PlaceholderDCCFrame extends DCCFrame {
      * @param plugin Parent plugin
      */
     public PlaceholderDCCFrame(final DCCPlugin plugin) {
-        super(plugin, "DCCs", "dcc", DCCCommandParser.getDCCCommandParser());
+        super(plugin, "DCCs", "dcc", EmptyFrame.class, DCCCommandParser.getDCCCommandParser());
     }
 
     @Override
     public void close() {
         int dccs = 0;
-        for (FrameContainer window : getChildren()) {
+        for (FrameContainer<?> window : getChildren()) {
             if (window instanceof DCCTransferWindow) {
                 if (((DCCTransferWindow) window).getDCC().isActive()) {
                     dccs++;

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

@@ -25,6 +25,7 @@ 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;
@@ -50,7 +51,7 @@ import net.miginfocom.swing.MigLayout;
  *
  * @author Shane 'Dataforce' McCormack
  */
-public class DCCTransferWindow extends DCCFrame implements DCCTransferHandler,
+public class DCCTransferWindow extends DCCFrame<EmptyFrame> implements DCCTransferHandler,
         ActionListener, SocketCloseListener {
 
     /** The DCCSend object we are a window for */
@@ -112,7 +113,7 @@ public class DCCTransferWindow extends DCCFrame implements DCCTransferHandler,
             final String title, final String targetNick, final Server server) {
         super(plugin, title, dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
-                DCCCommandParser.getDCCCommandParser());
+                EmptyFrame.class, DCCCommandParser.getDCCCommandParser());
         this.dcc = dcc;
         this.server = server;
         this.parser = server == null ? null : server.getParser();

src/com/dmdirc/addons/dcop/DcopCommand.java

@@ -27,7 +27,6 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ServerCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.List;
 
@@ -48,7 +47,7 @@ public final class DcopCommand extends ServerCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length != 3) {
             showUsage(origin, isSilent, "dcop", "<app> <object> <function>");

src/com/dmdirc/addons/dns/DNSCommand.java

@@ -44,7 +44,7 @@ public final class DNSCommand extends GlobalCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final boolean isSilent,
+    public void execute(final FrameContainer<?> origin, final boolean isSilent,
             final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "dns", "<IP|hostname>");

src/com/dmdirc/addons/freedesktop_notifications/FDNotifyCommand.java

@@ -50,7 +50,7 @@ public final class FDNotifyCommand extends GlobalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final boolean isSilent,
+    public void execute(final FrameContainer<?> origin, final boolean isSilent,
             final CommandArguments args) {
         myPlugin.showNotification("", args.getArgumentsAsString());
     }

src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

@@ -153,9 +153,9 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
         boolean useAlternate = false;
 
         for (Object obj : arguments) {
-            if (obj instanceof FrameContainer
-                    && ((FrameContainer) obj).getConfigManager() != null) {
-                useAlternate = ((FrameContainer) obj).getConfigManager()
+            if (obj instanceof FrameContainer<?>
+                    && ((FrameContainer<?>) obj).getConfigManager() != null) {
+                useAlternate = ((FrameContainer<?>) obj).getConfigManager()
                         .getOptionBool(getDomain(), "usealternate");
                 break;
             }
@@ -189,12 +189,12 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
 
             if (((Server) arguments[0]).ownsFrame(active)) {
                 panel.setText("Not connected");
-                pings.remove(arguments[0]);
+                pings.remove((Server) arguments[0]);
             }
 
             panel.refreshDialog();
         } else if (type.equals(CoreActionType.CLIENT_FRAME_CHANGED)) {
-            final FrameContainer source = (FrameContainer) arguments[0];
+            final FrameContainer<?> source = (FrameContainer<?>) arguments[0];
             if (source == null || source.getServer() == null) {
                 panel.setText("Unknown");
             } else if (source.getServer().getState() != ServerState.CONNECTED) {

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.logging;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.WindowManager;
@@ -34,10 +33,7 @@ import com.dmdirc.ui.interfaces.Window;
  *
  * @author Chris
  */
-public class HistoryWindow extends FrameContainer {
-
-    /** The window we're using. */
-    private Window window;
+public class HistoryWindow extends FrameContainer<Window> {
 
     /**
      * Creates a new HistoryWindow.
@@ -48,31 +44,23 @@ public class HistoryWindow extends FrameContainer {
      * @param numLines The number of lines to show
      */
     public HistoryWindow(final String title, final ReverseFileReader reader,
-                         final FrameContainer parent, final int numLines) {
-        super("raw", title, title, parent.getConfigManager());
+                         final FrameContainer<?> parent, final int numLines) {
+        super("raw", title, title, Window.class, parent.getConfigManager());
 
         this.parent = parent;
 
-        window = Main.getUI().getWindow(this);
-
         WindowManager.addWindow(parent, this);
-        window.open();
+
         final int frameBufferSize = IdentityManager.getGlobalConfig().getOptionInt(
                 "ui", "frameBufferSize");
         addLine(reader.getLinesAsString(Math.min(frameBufferSize, numLines)), false);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public Window getFrame() {
-        return window;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void windowClosing() {
         // 1: Make the window non-visible
-        window.setVisible(false);
+        getFrame().setVisible(false);
 
         // 2: Remove any callbacks or listeners
         // 3: Trigger any actions neccessary
@@ -87,7 +75,6 @@ public class HistoryWindow extends FrameContainer {
     @Override
     public void windowClosed() {
         // 7: Remove any references to the window and parents
-        window = null; // NOPMD
         parent = null; // NOPMD
     }
 

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

@@ -32,7 +32,6 @@ import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The dcop command retrieves information from a dcop application.
@@ -51,7 +50,7 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
                         final boolean isSilent, final CommandArguments args) {
         final PluginInfo pluginInfo = PluginManager.getPluginManager().getPluginInfoByName("logging");
         if (pluginInfo == null) {
@@ -75,7 +74,7 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
                     sendLine(origin, isSilent, FORMAT_ERROR, "Plugin failed to reload.");
                 }
             } else if (args.getArguments()[0].equalsIgnoreCase("history")) {
-                if (!plugin.showHistory((InputWindow) origin.getFrame())) {
+                if (!plugin.showHistory(origin)) {
                     sendLine(origin, isSilent, FORMAT_ERROR, "Unable to open history for this window.");
                 }
             } else if (args.getArguments()[0].equalsIgnoreCase("help")) {
@@ -90,14 +89,7 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
         }
     }
 
-    /**
-     * Returns a list of suggestions for the specified argument, given the list
-     * of previous arguments.
-     *
-     * @param arg The argument that is being completed
-     * @param previousArgs The contents of the previous arguments, if any
-     * @return A list of suggestions for the argument
-     */
+    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.logging;
 
 import com.dmdirc.Channel;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
@@ -45,8 +46,6 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.Plugin;
-import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.Color;
@@ -298,7 +297,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
         switch (type) {
             case QUERY_OPENED:
                 if (autobackbuffer) {
-                    showBackBuffer(query.getFrame(), filename);
+                    showBackBuffer(query, filename);
                 }
 
                 appendLine(filename, "*** Query opened at: %s", openedAtFormat.format(new Date()));
@@ -353,7 +352,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
         switch (type) {
             case CHANNEL_OPENED:
                 if (autobackbuffer) {
-                    showBackBuffer(chan.getFrame(), filename);
+                    showBackBuffer(chan, filename);
                 }
 
                 appendLine(filename, "*** Channel opened at: %s", openedAtFormat.format(new Date()));
@@ -487,7 +486,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
      * @param frame The frame to add the backbuffer lines to
      * @param filename File to get backbuffer from
      */
-    protected void showBackBuffer(final Window frame, final String filename) {
+    protected void showBackBuffer(final FrameContainer<?> frame, final String filename) {
         if (frame == null) {
             Logger.userError(ErrorLevel.LOW, "Given a null frame");
             return;
@@ -804,16 +803,16 @@ public class LoggingPlugin extends Plugin implements ActionListener,
      * @param target The window whose history we're trying to open
      * @return True if the history is available, false otherwise
      */
-    protected boolean showHistory(final InputWindow target) {
+    protected boolean showHistory(final FrameContainer<?> target) {
         Object component;
 
-        if (target.getContainer() instanceof Channel) {
-            component = ((Channel) target.getContainer()).getChannelInfo();
-        } else if (target.getContainer() instanceof Query) {
-            final Parser parser = ((Query) target.getContainer()).getServer().getParser();
-            component = parser.getClient(((Query) target.getContainer()).getHost());
-        } else if (target.getContainer() instanceof Server) {
-            component = target.getContainer().getServer().getParser();
+        if (target instanceof Channel) {
+            component = ((Channel) target).getChannelInfo();
+        } else if (target instanceof Query) {
+            final Parser parser = ((Query) target).getServer().getParser();
+            component = parser.getClient(((Query) target).getHost());
+        } else if (target instanceof Server) {
+            component = ((Server) target).getParser();
         } else {
             // Unknown component
             return false;
@@ -838,7 +837,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
             return false;
         }
 
-        new HistoryWindow("History", reader, target.getContainer(), historyLines);
+        new HistoryWindow("History", reader, target, historyLines);
 
         return true;
     }

src/com/dmdirc/addons/nickcolours/NickColourPanel.java

@@ -210,7 +210,7 @@ public class NickColourPanel extends JPanel implements ActionListener,
         final DefaultTableModel model = ((DefaultTableModel) table.getModel());
 
         for (Object row : model.getDataVector()) {
-            final Vector vrow = (Vector) row;
+            final Vector<?> vrow = (Vector<?>) row;
 
             res.add(new Object[]{vrow.elementAt(0), vrow.elementAt(1), vrow.
                         elementAt(2), vrow.elementAt(3)});

src/com/dmdirc/addons/nickcolours/NickColourPlugin.java

@@ -100,7 +100,7 @@ public final class NickColourPlugin extends Plugin implements ActionListener,
      */
     private void colourClient(final String network,
             final ChannelClientInfo client) {
-        final Map map = client.getMap();
+        final Map<Object, Object> map = client.getMap();
         final ClientInfo myself =
                 client.getClient().getParser().getLocalClient();
         final String nickOption1 = "color:"
@@ -151,8 +151,7 @@ public final class NickColourPlugin extends Plugin implements ActionListener,
      * @param textColour Text colour to be inserted
      * @param nickColour Nick colour to be inserted
      */
-    @SuppressWarnings("unchecked")
-    private void putColour(final Map map, final Color textColour,
+    private void putColour(final Map<Object, Object> map, final Color textColour,
             final Color nickColour) {
         if (settext && textColour != null) {
             map.put(ChannelClientProperty.TEXT_FOREGROUND, textColour);

src/com/dmdirc/addons/nowplaying/NowPlayingCommand.java

@@ -61,8 +61,8 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
-            final MessageTarget target, final boolean isSilent, final CommandArguments args) {
+    public void execute(final FrameContainer<?> origin, final Server server,
+            final MessageTarget<?> target, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length > 0 && args.getArguments()[0]
                 .equalsIgnoreCase("--sources")) {
             doSourceList(origin, isSilent, args.getArgumentsAsString(1));
@@ -104,7 +104,7 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
      * @param isSilent Whether this command is being silenced
      * @param format Format to be passed to getInformation
      */
-    private void doSourceList(final FrameContainer origin, final boolean isSilent,
+    private void doSourceList(final FrameContainer<?> origin, final boolean isSilent,
             final String format) {
         final List<MediaSource> sources = parent.getSources();
         

src/com/dmdirc/addons/osd/OsdCommand.java

@@ -70,7 +70,7 @@ public final class OsdCommand extends GlobalCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final boolean isSilent,
+    public void execute(final FrameContainer<?> origin, final boolean isSilent,
             final CommandArguments args) {
         if (args.getArguments().length > 0
                 && "--close".equalsIgnoreCase(args.getArguments()[0])) {

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

@@ -1,193 +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.redirect;
-
-import com.dmdirc.MessageTarget;
-import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.ui.input.InputHandler;
-import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.util.StringTranscoder;
-
-import java.nio.charset.Charset;
-
-/**
- * Implements a fake input window, which sends echoed text to the specified
- * chat window instead.
- * 
- * @author Chris
- */
-public class FakeInputWindow implements InputWindow {
-    
-    /** The target for this window. */
-    private final MessageTarget target;
-
-    /**
-     * Creates a new instance of FakeInputWindow.
-     * 
-     * @param target The message target that output gets sent to
-     */
-    public FakeInputWindow(final MessageTarget target) {
-        this.target = target;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandParser getCommandParser() {
-        return target.getFrame().getCommandParser();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public InputHandler getInputHandler() {
-        return target.getFrame().getInputHandler();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setAwayIndicator(final boolean isAway) {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    @Deprecated
-    public void addLine(final String messageType, final Object... args) {
-        getContainer().addLine(messageType, args);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    @Deprecated
-    public void addLine(final StringBuffer messageType, final Object... args) {
-        getContainer().addLine(messageType, args);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    @Deprecated
-    public void addLine(final String line, final boolean timestamp) {
-        getContainer().addLine(line, timestamp);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    @Deprecated
-    public void clear() {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public ConfigManager getConfigManager() {
-        return target.getFrame().getConfigManager();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public WritableFrameContainer getContainer() {
-        return target;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean isVisible() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setVisible(final boolean isVisible) {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getTitle() {
-        return "Fake window";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean isMaximum() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    @Deprecated
-    public void setTitle(final String title) {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void open() {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    @Deprecated
-    public StringTranscoder getTranscoder() {
-        return new StringTranscoder(Charset.defaultCharset());
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void close() {
-        /// Do nothing
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void restore() {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void maximise() {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void toggleMaximise() {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void minimise() {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void activateFrame() {
-        // Do nothing
-    }
-
-}

src/com/dmdirc/addons/redirect/FakeWriteableFrameContainer.java

@@ -0,0 +1,94 @@
+/*
+ * 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.redirect;
+
+import com.dmdirc.MessageTarget;
+import com.dmdirc.Server;
+import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.ui.interfaces.InputWindow;
+
+/**
+ * Implements a fake input window, which sends echoed text to the specified
+ * chat window instead.
+ * 
+ * @author Chris
+ */
+public class FakeWriteableFrameContainer extends WritableFrameContainer<InputWindow> {
+    
+    /** The target for this window. */
+    private final MessageTarget<? extends InputWindow> target;
+
+    /**
+     * Creates a new instance of FakeInputWindow.
+     * 
+     * @param target The message target that output gets sent to
+     */
+    public FakeWriteableFrameContainer(final MessageTarget<?> target) {
+        super(target.getIcon(), target.getName(), target.getTitle(),
+                InputWindow.class, target.getConfigManager(), target.getCommandParser());
+        this.target = target;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void addLine(final String line, final boolean timestamp) {
+        target.sendLine(line);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void sendLine(final String line) {
+        target.sendLine(line);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public TabCompleter getTabCompleter() {
+        return target.getTabCompleter();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getMaxLineLength() {
+        return target.getMaxLineLength();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Server getServer() {
+        return target.getServer();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void windowClosing() {
+        // Do nothing
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void windowClosed() {
+        // Do nothing
+    }
+}

src/com/dmdirc/addons/redirect/RedirectCommand.java

@@ -45,9 +45,9 @@ public class RedirectCommand extends ChatCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
-            final MessageTarget target, final boolean isSilent, final CommandArguments args) {
-        target.getFrame().getCommandParser().parseCommand(target, // TODO: This doesn't redirect
+    public void execute(final FrameContainer<?> origin, final Server server,
+            final MessageTarget<?> target, final boolean isSilent, final CommandArguments args) {
+        target.getCommandParser().parseCommand(new FakeWriteableFrameContainer(target),
                 args.getArgumentsAsString());
     }
     

src/com/dmdirc/addons/scriptplugin/ScriptCommand.java

@@ -58,7 +58,8 @@ public final class ScriptCommand extends GlobalCommand implements IntelligentCom
         
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final boolean isSilent, final CommandArguments commandArgs) {
+    public void execute(final FrameContainer<?> origin, final boolean isSilent,
+            final CommandArguments commandArgs) {
         final String[] args = commandArgs.getArguments();
     
         if (args.length > 0 && (args[0].equalsIgnoreCase("rehash") || args[0].equalsIgnoreCase("reload"))) {

src/com/dmdirc/addons/systray/PopupCommand.java

@@ -64,7 +64,7 @@ public final class PopupCommand extends ServerCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         showPopup("DMDirc", args.getArgumentsAsString());
     }

src/com/dmdirc/addons/time/TimedCommand.java

@@ -42,7 +42,7 @@ public final class TimedCommand extends TimerTask {
     private final String command;
     
     /** The window to use for executing commands. */
-    private final FrameContainer origin;
+    private final FrameContainer<?> origin;
     
     /** The timer we're using for scheduling this command. */
     private final Timer timer;
@@ -55,7 +55,7 @@ public final class TimedCommand extends TimerTask {
      * @param origin The command window to use for the execution
      */
     public TimedCommand(final int repetitions, final int delay,
-            final String command, final FrameContainer origin) {
+            final String command, final FrameContainer<?> origin) {
         super();
         
         this.repetitions = repetitions;
@@ -73,7 +73,7 @@ public final class TimedCommand extends TimerTask {
         if (origin == null) {
             parser = GlobalCommandParser.getGlobalCommandParser();
         } else {
-            parser = ((WritableFrameContainer) origin).getFrame().getCommandParser();
+            parser = ((WritableFrameContainer<?>) origin).getCommandParser();
         }
         
         parser.parseCommand(origin, command);

src/com/dmdirc/addons/time/TimerCommand.java

@@ -46,7 +46,7 @@ public final class TimerCommand extends GlobalCommand implements IntelligentComm
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final boolean isSilent,
+    public void execute(final FrameContainer<?> origin, final boolean isSilent,
             final CommandArguments args) {
         if (args.getArguments().length < 3) {
             doUsage(origin, isSilent);
@@ -73,7 +73,7 @@ public final class TimerCommand extends GlobalCommand implements IntelligentComm
      * @param origin The window that the command was entered in
      * @param isSilent Whether this command is being silenced or not
      */
-    private void doUsage(final FrameContainer origin, final boolean isSilent) {
+    private void doUsage(final FrameContainer<?> origin, final boolean isSilent) {
         showUsage(origin, isSilent, "timer", "<repetitions> <interval> <command>");
     }
     

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.Channel;
-import com.dmdirc.commandparser.parsers.ChannelCommandParser;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.interfaces.ChannelWindow;
 
@@ -73,6 +72,7 @@ public final class DummyChannelWindow extends DummyInputWindow implements Channe
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public Channel getChannel() {
         return parent;
     }

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

@@ -28,7 +28,6 @@ import com.dmdirc.Main;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
@@ -93,13 +92,13 @@ public final class DummyController extends Plugin implements UIController {
     
     /** {@inheritDoc} */
     @Override
-    public Window getWindow(final FrameContainer owner) {
+    public Window getWindow(final FrameContainer<?> owner) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
     
     /** {@inheritDoc} */
     @Override
-    public InputWindow getInputWindow(final WritableFrameContainer owner) {
+    public InputWindow getInputWindow(final WritableFrameContainer<?> owner) {
         return new DummyInputWindow(owner, owner.getCommandParser());
     }
     

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

@@ -49,29 +49,29 @@ public class DummyFrameManager implements FrameManager {
     
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer window, final boolean focus) {
+    public void addWindow(final FrameContainer<?> window, final boolean focus) {
         Main.getUI().getStatusBar()
                 .setMessage("DummyFrameManager: addServer: " + window);
     }
     
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer window) {
+    public void delWindow(final FrameContainer<?> window) {
         Main.getUI().getStatusBar()
                 .setMessage("DummyFrameManager: delServer: " + window);
     }
     
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer parent, 
-            final FrameContainer window, final boolean focus) {
+    public void addWindow(final FrameContainer<?> parent,
+            final FrameContainer<?> window, final boolean focus) {
         Main.getUI().getStatusBar()
                 .setMessage("DummyFrameManager: addCustom: " + window + "@" + parent);
     }
     
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer parent, final FrameContainer window) {
+    public void delWindow(final FrameContainer<?> parent, final FrameContainer<?> window) {
         Main.getUI().getStatusBar()
                 .setMessage("DummyFrameManager: delCustom: " + window + "@" + parent);
     }

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

@@ -28,10 +28,10 @@ import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.ui.interfaces.UIController;
 import com.dmdirc.util.StringTranscoder;
 
 import java.nio.charset.Charset;
-import java.util.Arrays;
 
 /**
  * Dummy input window, used for testing.
@@ -45,7 +45,7 @@ public class DummyInputWindow implements InputWindow {
     /** are we maximised? */
     private boolean maximised;
     /** Our container. */
-    private final WritableFrameContainer container;
+    private final WritableFrameContainer<? extends InputWindow> container;
     /** Our command parser. */
     private final CommandParser commandParser;
     
@@ -55,7 +55,7 @@ public class DummyInputWindow implements InputWindow {
      * @param owner Parent window
      * @param commandParser Parent command parser
      */
-    public DummyInputWindow(final WritableFrameContainer owner, 
+    public DummyInputWindow(final WritableFrameContainer<? extends InputWindow> owner,
             final CommandParser commandParser) {
         this.container = owner;
         this.commandParser = commandParser;
@@ -75,6 +75,7 @@ public class DummyInputWindow implements InputWindow {
     
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public void setAwayIndicator(final boolean isAway) {
         // Do nothing
     }
@@ -109,13 +110,14 @@ public class DummyInputWindow implements InputWindow {
     
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public ConfigManager getConfigManager() {
         return IdentityManager.getGlobalConfig();
     }
     
     /** {@inheritDoc} */
     @Override
-    public WritableFrameContainer getContainer() {
+    public WritableFrameContainer<? extends InputWindow> getContainer() {
         return container;
     }
     
@@ -133,6 +135,7 @@ public class DummyInputWindow implements InputWindow {
     
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public String getTitle() {
         return title;
     }
@@ -207,5 +210,11 @@ public class DummyInputWindow implements InputWindow {
     public void activateFrame() {
         // Do nothing
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public UIController getController() {
+        return new DummyController();
+    }
     
 }

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

@@ -36,8 +36,8 @@ public class DummyQueryWindow extends DummyInputWindow implements QueryWindow {
      * 
      * @param owner The window that owns this one
      */
-    public DummyQueryWindow(final WritableFrameContainer owner) {
-        super(owner, owner.getServer().getFrame().getCommandParser());
+    public DummyQueryWindow(final WritableFrameContainer<? extends QueryWindow> owner) {
+        super(owner, owner.getCommandParser());
     }
 
 }

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

@@ -28,11 +28,11 @@ import com.dmdirc.addons.ui_swing.components.SplitPane;
 import com.dmdirc.addons.ui_swing.components.desktopPane.DMDircDesktopPane;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManager;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.addons.ui_swing.SwingWindowFactory.SwingWindowListener;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
@@ -43,10 +43,9 @@ import com.dmdirc.ui.interfaces.FramemanagerPosition;
 import com.dmdirc.ui.interfaces.MainWindow;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.CoreUIUtils;
-import com.dmdirc.ui.interfaces.FrameListener;
 import com.dmdirc.util.ReturnableThread;
-import java.awt.Dialog.ModalityType;
 
+import java.awt.Dialog.ModalityType;
 import java.awt.Dimension;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowFocusListener;
@@ -67,7 +66,7 @@ import net.miginfocom.swing.MigLayout;
  * The main application frame.
  */
 public final class MainFrame extends JFrame implements WindowListener,
-        MainWindow, ConfigChangeListener, FrameListener {
+        MainWindow, ConfigChangeListener, SwingWindowListener {
 
     /** Logger to use. */
     private static final java.util.logging.Logger LOGGER =
@@ -366,11 +365,10 @@ public final class MainFrame extends JFrame implements WindowListener,
                     mainFrameManager = new TreeFrameManager();
                 }
 
-
                 WindowManager.addFrameListener(mainFrameManager);
                 mainFrameManager.setParent(frameManagerPanel);
 
-                WindowManager.addFrameListener(MainFrame.this);
+                controller.getWindowFactory().addWindowListener(MainFrame.this);
             }
         });
     }
@@ -381,7 +379,7 @@ public final class MainFrame extends JFrame implements WindowListener,
     private void initComponents() {
         statusBar = new SwingStatusBar(controller, this);
         frameManagerPanel = new JPanel();
-        desktopPane = new DMDircDesktopPane(this, controller.getDomain());
+        desktopPane = new DMDircDesktopPane(controller, this, controller.getDomain());
 
         initFrameManagers();
 
@@ -569,7 +567,7 @@ public final class MainFrame extends JFrame implements WindowListener,
 
     /** {@inheritDoc}. */
     @Override
-    public void addWindow(final FrameContainer window, final boolean focus) {
+    public void windowAdded(final Window parent, final Window window) {
         UIUtilities.invokeAndWait(new Runnable() {
 
             /** {@inheritDoc} */
@@ -586,13 +584,13 @@ public final class MainFrame extends JFrame implements WindowListener,
      * @param window The server to be added
      * @param index Index of the window to be added
      */
-    public void addWindow(final FrameContainer window, final int index) {
+    public void addWindow(final Window window, final int index) {
         UIUtilities.invokeAndWait(new Runnable() {
 
             /** {@inheritDoc} */
             @Override
             public void run() {
-                final JInternalFrame frame = (JInternalFrame) window.getFrame();
+                final JInternalFrame frame = (JInternalFrame) window;
 
                 // Add the frame
                 desktopPane.add(frame, index);
@@ -602,30 +600,17 @@ public final class MainFrame extends JFrame implements WindowListener,
 
     /** {@inheritDoc}. */
     @Override
-    public void delWindow(final FrameContainer window) {
+    public void windowDeleted(final Window parent, final Window window) {
         UIUtilities.invokeAndWait(new Runnable() {
 
             /** {@inheritDoc} */
             @Override
             public void run() {
-                final JInternalFrame frame = (JInternalFrame) window.getFrame();
+                final JInternalFrame frame = (JInternalFrame) window;
 
                 desktopPane.remove(frame);
             }
         });
     }
 
-    /** {@inheritDoc}. */
-    @Override
-    public void addWindow(final FrameContainer parent,
-            final FrameContainer window, final boolean focus) {
-        addWindow(window, focus);
-    }
-
-    /** {@inheritDoc}. */
-    @Override
-    public void delWindow(final FrameContainer parent,
-            final FrameContainer window) {
-        delWindow(window);
-    }
-}
+}

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

@@ -65,6 +65,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.ui.interfaces.ChannelWindow;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -123,6 +124,8 @@ public final class SwingController extends Plugin implements Serializable,
     private AtomicBoolean mainFrameCreated = new AtomicBoolean(false);
     /** Error dialog. */
     private ErrorListDialog errorDialog;
+    /** Window factory. */
+    private final SwingWindowFactory windowFactory = new SwingWindowFactory(this);
 
     /** Instantiates a new SwingController. */
     public SwingController() {
@@ -157,6 +160,16 @@ public final class SwingController extends Plugin implements Serializable,
         return getMainFrame();
     }
 
+    /**
+     * Returns the window factory used by this controller.
+     *
+     * @return This controller's window factory
+     * @since 0.6.4
+     */
+    public SwingWindowFactory getWindowFactory() {
+        return windowFactory;
+    }
+
     /**
      * Retrieves the main window used by this UI.
      *
@@ -189,7 +202,7 @@ public final class SwingController extends Plugin implements Serializable,
             /** {@inheritDoc} */
             @Override
             public void run() {
-                setObject(new ChannelFrame(channel, SwingController.this));
+                setObject(new ChannelFrame(SwingController.this, channel));
             }
         });
     }
@@ -202,7 +215,7 @@ public final class SwingController extends Plugin implements Serializable,
             /** {@inheritDoc} */
             @Override
             public void run() {
-                setObject(new ServerFrame(server, SwingController.this));
+                setObject(new ServerFrame(SwingController.this, server));
             }
         });
     }
@@ -215,27 +228,27 @@ public final class SwingController extends Plugin implements Serializable,
             /** {@inheritDoc} */
             @Override
             public void run() {
-                setObject(new QueryFrame(query, SwingController.this));
+                setObject(new QueryFrame(SwingController.this, query));
             }
         });
     }
 
     /** {@inheritDoc} */
     @Override
-    public Window getWindow(final FrameContainer owner) {
+    public Window getWindow(final FrameContainer<?> owner) {
         return UIUtilities.invokeAndWait(new ReturnableThread<CustomFrame>() {
 
             /** {@inheritDoc} */
             @Override
             public void run() {
-                setObject(new CustomFrame(owner, SwingController.this));
+                setObject(new CustomFrame(SwingController.this, owner));
             }
         });
     }
 
     /** {@inheritDoc} */
     @Override
-    public InputWindow getInputWindow(final WritableFrameContainer owner) {
+    public InputWindow getInputWindow(final WritableFrameContainer<?> owner) {
         LOGGER.finest("getInputWindow()");
 
         return UIUtilities.invokeAndWait(new ReturnableThread<CustomInputFrame>() {
@@ -244,7 +257,7 @@ public final class SwingController extends Plugin implements Serializable,
             @Override
             public void run() {
                 LOGGER.finest("getInputWindow(): run");
-                setObject(new CustomInputFrame(owner, SwingController.this));
+                setObject(new CustomInputFrame(SwingController.this, owner));
                 LOGGER.finest("getInputWindow(): object set: " + getObject());
             }
         });
@@ -665,6 +678,7 @@ public final class SwingController extends Plugin implements Serializable,
                     + "consider using the official JRE.").display();
         }
 
+        WindowManager.addFrameListener(windowFactory);
         Main.setUI(this);
     }
 

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

@@ -0,0 +1,185 @@
+
+package com.dmdirc.addons.ui_swing;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.components.frames.ChannelFrame;
+import com.dmdirc.addons.ui_swing.components.frames.CustomFrame;
+import com.dmdirc.addons.ui_swing.components.frames.CustomInputFrame;
+import com.dmdirc.addons.ui_swing.components.frames.QueryFrame;
+import com.dmdirc.addons.ui_swing.components.frames.ServerFrame;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.interfaces.ChannelWindow;
+import com.dmdirc.ui.interfaces.FrameListener;
+import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.ui.interfaces.QueryWindow;
+import com.dmdirc.ui.interfaces.ServerWindow;
+import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.util.ListenerList;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Handles creation of windows in the Swing UI.
+ * 
+ * @since 0.6.4
+ * @author chris
+ */
+public class SwingWindowFactory implements FrameListener {
+
+    /** A map of known implementations of window interfaces. */
+    private static final Map<Class<? extends Window>, Class<? extends Window>> IMPLEMENTATIONS
+            = new HashMap<Class<? extends Window>, Class<? extends Window>>();
+
+    static {
+        IMPLEMENTATIONS.put(Window.class, CustomFrame.class);
+        IMPLEMENTATIONS.put(InputWindow.class, CustomInputFrame.class);
+        IMPLEMENTATIONS.put(ServerWindow.class, ServerFrame.class);
+        IMPLEMENTATIONS.put(QueryWindow.class, QueryFrame.class);
+        IMPLEMENTATIONS.put(ChannelWindow.class, 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;
+    }
+
+    /**
+     * Registers a new listener which will be notified about the addition
+     * and deletion of all Swing UI windows.
+     *
+     * @param listener The listener to be added
+     */
+    public void addWindowListener(final SwingWindowListener listener) {
+        listeners.add(SwingWindowListener.class, listener);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void addWindow(final FrameContainer<?> window, final boolean focus) {
+        addWindow(null, window, focus);
+    }
+
+    /**
+     * Creates a new window for the specified container.
+     *
+     * @param <T> The type of window that should be created
+     * @param window The container that owns the window
+     * @param focus Whether the window should be focused initially
+     * @return The created window or null on error
+     */
+    @SuppressWarnings("unchecked")
+    protected <T extends Window> T doAddWindow(final FrameContainer<T> window,
+            final boolean focus) {
+        final Class<T> clazz;
+
+        if (IMPLEMENTATIONS.containsKey(window.getWindowClass())) {
+            clazz = (Class<T>) IMPLEMENTATIONS.get(window.getWindowClass());
+        } else {
+            clazz = window.getWindowClass();
+        }
+
+        try {
+            final T frame = (T) clazz.getConstructors()[0].newInstance(controller, window);
+            window.addWindow(frame);
+
+            return frame;
+        } catch (Exception ex) {
+            Logger.appError(ErrorLevel.HIGH, "Unable to create window", ex);
+            return null;
+        }
+    }
+
+    /**
+     * Retrieves a single Swing UI created window belonging to the specified
+     * 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
+     */
+    public Window getSwingWindow(final FrameContainer<?> window) {
+        if (window == null) {
+            return null;
+        }
+
+        for (Window child : window.getWindows()) {
+            if (child.getController() == controller) {
+                return child;
+            }
+        }
+
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void delWindow(final FrameContainer<?> window) {
+        delWindow(null, window);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void addWindow(final FrameContainer<?> parent,
+            final FrameContainer<?> window, final boolean focus) {
+        final Window parentWindow = getSwingWindow(parent);
+        final Window childWindow = doAddWindow(window, focus);
+
+        if (childWindow == null) {
+            return;
+        }
+
+        for (SwingWindowListener listener : listeners.get(SwingWindowListener.class)) {
+            listener.windowAdded(parentWindow, childWindow);
+        }
+
+        if (focus) {
+            childWindow.open();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void delWindow(final FrameContainer<?> parent, final FrameContainer<?> window) {
+        final Window parentWindow = getSwingWindow(parent);
+        final Window childWindow = getSwingWindow(window);
+
+        for (SwingWindowListener listener : listeners.get(SwingWindowListener.class)) {
+            listener.windowDeleted(parentWindow, childWindow);
+        }
+    }
+
+    /**
+     * An interface for objects interested in Swing UI window events.
+     */
+    public static interface SwingWindowListener {
+
+        /**
+         * Called when a new window is added.
+         *
+         * @param parent The parent of the added window (may be null)
+         * @param window The window that was added
+         */
+        void windowAdded(final Window parent, final Window window);
+
+        /**
+         * Called when a new window was deleted.
+         *
+         * @param parent The parent of the added window (may be null)
+         * @param window The window that was deleted
+         */
+        void windowDeleted(final Window parent, final Window window);
+        
+    }
+
+}

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

@@ -26,6 +26,8 @@ package com.dmdirc.addons.ui_swing.components;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.SwingWindowFactory.SwingWindowListener;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
@@ -33,7 +35,6 @@ import com.dmdirc.interfaces.SelectionListener;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.Window;
-import com.dmdirc.ui.interfaces.FrameListener;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -49,7 +50,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Provides an MDI style bar for restore/minimise/close.
  */
-public class MDIBar extends JPanel implements FrameListener, SelectionListener,
+public class MDIBar extends JPanel implements SwingWindowListener, SelectionListener,
         PropertyChangeListener, ActionListener, ConfigChangeListener {
 
     private static final long serialVersionUID = -8028057596226636245L;
@@ -66,9 +67,10 @@ public class MDIBar extends JPanel implements FrameListener, SelectionListener,
     /**
      * Instantiates a new MDI bar.
      *
+     * @param controller The controller that owns this MDI bar
      * @param mainFrame Main frame instance
      */
-    public MDIBar(final MainFrame mainFrame) {
+    public MDIBar(final SwingController controller, final MainFrame mainFrame) {
         this.mainFrame = mainFrame;
         this.config = IdentityManager.getGlobalConfig();
         visibility = config.getOption("ui", "mdiBarVisibility");
@@ -86,8 +88,8 @@ public class MDIBar extends JPanel implements FrameListener, SelectionListener,
         add(restoreButton, "w 17!, h 17!, right");
         add(closeButton, "w 17!, h 17!, right");
 
+        controller.getWindowFactory().addWindowListener(this);
 
-        WindowManager.addFrameListener(this);
         WindowManager.addSelectionListener(this);
         closeButton.addActionListener(this);
         minimiseButton.addActionListener(this);
@@ -129,36 +131,20 @@ public class MDIBar extends JPanel implements FrameListener, SelectionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer window, final boolean focus) {
-        if (window.getFrame() instanceof JInternalFrame) {
-            ((JInternalFrame) window.getFrame()).addPropertyChangeListener(
-                    "maximum", this);
-        }
-        check();
-    }
+    public void windowAdded(final Window parent, final Window window) {
+        ((JInternalFrame) window).addPropertyChangeListener(
+                "maximum", this);
 
-    /** {@inheritDoc} */
-    @Override
-    public void delWindow(final FrameContainer window) {
-        if (window.getFrame() instanceof JInternalFrame) {
-            ((JInternalFrame) window.getFrame()).removePropertyChangeListener(
-                    this);
-        }
         check();
     }
 
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer parent,
-            final FrameContainer window, final boolean focus) {
-        addWindow(window, focus);
-    }
+    public void windowDeleted(final Window parent, final Window window) {
+        ((JInternalFrame) window).removePropertyChangeListener(
+                this);
 
-    /** {@inheritDoc} */
-    @Override
-    public void delWindow(final FrameContainer parent,
-                          final FrameContainer window) {
-        delWindow(window);
+        check();
     }
 
     /** {@inheritDoc} */
@@ -200,8 +186,9 @@ public class MDIBar extends JPanel implements FrameListener, SelectionListener,
         check();
     }
 
+    /** {@inheritDoc} */
     @Override
-    public void selectionChanged(FrameContainer window) {
+    public void selectionChanged(final FrameContainer<?> window) {
         activeFrame = window.getFrame();
         check();
     }

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

@@ -98,7 +98,7 @@ public class MenuBar extends JMenuBar implements ActionListener, MenuListener {
         add(new WindowMenuFrameManager(controller));
         initHelpMenu();
         add(Box.createHorizontalGlue(), "growx, pushx");
-        add(new MDIBar(mainFrame));
+        add(new MDIBar(controller, mainFrame));
         add(Box.createHorizontalStrut(PlatformDefaults.getPanelInsets(1).getUnit()));
 
         getActionMap().setParent(null);
@@ -270,7 +270,7 @@ public class MenuBar extends JMenuBar implements ActionListener, MenuListener {
         } else if (e.getActionCommand().equals("feedback")) {
             FeedbackDialog.showFeedbackDialog(mainFrame);
         } else if (e.getActionCommand().equals("ChannelSettings")) {
-            final FrameContainer activeWindow = WindowManager.getActiveWindow();
+            final FrameContainer<?> activeWindow = WindowManager.getActiveWindow();
             if (activeWindow instanceof Channel) {
                 controller.showChannelSettingsDialog(((Channel) activeWindow));
             }
@@ -305,7 +305,7 @@ public class MenuBar extends JMenuBar implements ActionListener, MenuListener {
     /** {@inheritDoc} */
     @Override
     public void menuSelected(final MenuEvent e) {
-        final FrameContainer activeWindow = WindowManager.getActiveWindow();
+        final FrameContainer<?> activeWindow = WindowManager.getActiveWindow();
 
         ssd.setEnabled(activeWindow != null && activeWindow.getServer() != null
                 && activeWindow.getServer().getState() == ServerState.CONNECTED);

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

@@ -160,7 +160,7 @@ public class ToolTipPanel extends JPanel implements MouseListener {
     public void registerTooltipHandler(final JComponent component,
             final String tooltipText) {
         tooltips.put(component, tooltipText);
-        if (component instanceof JXLayer) {
+        if (component instanceof JXLayer<?>) {
             final LayerUI<JComponent> layerUI = new AbstractLayerUI<JComponent>() {
 
                 private static final long serialVersionUID =

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

@@ -104,7 +104,7 @@ public class TopicBar extends JComponent implements ActionListener,
      * @param channelFrame Parent channel frame
      */
     public TopicBar(final ChannelFrame channelFrame) {
-        this.channel = channelFrame.getChannel();
+        this.channel = (Channel) channelFrame.getContainer();
         controller = channelFrame.getController();
         topicText = new TextPaneInputField();
         topicLengthMax = channel.getMaxTopicLength();

src/com/dmdirc/addons/ui_swing/components/desktopPane/DMDircDesktopPane.java

@@ -25,6 +25,8 @@ package com.dmdirc.addons.ui_swing.components.desktopPane;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.BackgroundOption;
 import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.SwingWindowFactory.SwingWindowListener;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
@@ -36,9 +38,7 @@ import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.SelectionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.Window;
-import com.dmdirc.ui.interfaces.FrameListener;
 import com.dmdirc.util.ReturnableThread;
 import com.dmdirc.util.URLBuilder;
 
@@ -70,7 +70,7 @@ import javax.swing.tree.TreeSelectionModel;
 /**
  * DMDirc Extentions to JDesktopPane.
  */
-public class DMDircDesktopPane extends JDesktopPane implements FrameListener,
+public class DMDircDesktopPane extends JDesktopPane implements SwingWindowListener,
         SelectionListener, PropertyChangeListener, ConfigChangeListener {
 
     /** Logger to use. */
@@ -91,7 +91,7 @@ public class DMDircDesktopPane extends JDesktopPane implements FrameListener,
     /** The number of pixels each new internal frame is offset by. */
     private static final int FRAME_OPENING_OFFSET = 30;
     /** Node storage, used for adding and deleting nodes correctly. */
-    private final Map<FrameContainer, TreeViewNode> nodes;
+    private final Map<Window, TreeViewNode> nodes;
     /** Data model. */
     private final TreeViewModel model;
     /** Selected model. */
@@ -115,11 +115,13 @@ public class DMDircDesktopPane extends JDesktopPane implements FrameListener,
 
     /**
      * Initialises the DMDirc desktop pane.
-     * 
+     *
+     * @param controller The controller that owns this desktop pane
      * @param mainFrame Main frame
      * @param domain Config domain
      */
-    public DMDircDesktopPane(final MainFrame mainFrame, final String domain) {
+    public DMDircDesktopPane(final SwingController controller,
+            final MainFrame mainFrame, final String domain) {
         super();
 
         this.mainFrame = mainFrame;
@@ -128,7 +130,7 @@ public class DMDircDesktopPane extends JDesktopPane implements FrameListener,
         setBorder(BorderFactory.createEtchedBorder());
         setUI(new ProxyDesktopPaneUI(getUI(), this));
 
-        nodes = new HashMap<FrameContainer, TreeViewNode>();
+        nodes = new HashMap<Window, TreeViewNode>();
         model = new TreeViewModel(new TreeViewNode(null, null));
         selectionModel = new DefaultTreeSelectionModel();
         treeScroller = new TreeScroller(model, selectionModel, false) {
@@ -137,12 +139,13 @@ public class DMDircDesktopPane extends JDesktopPane implements FrameListener,
             @Override
             protected void setPath(final TreePath path) {
                 super.setPath(path);
-                ((TreeViewNode) path.getLastPathComponent()).getFrameContainer().
+                ((TreeViewNode) path.getLastPathComponent()).getWindow().
                         activateFrame();
             }
         };
 
-        WindowManager.addFrameListener(this);
+        controller.getWindowFactory().addWindowListener(this);
+        
         IdentityManager.getGlobalConfig().addChangeListener(domain,
                 "desktopbackground", this);
         IdentityManager.getGlobalConfig().addChangeListener(domain,
@@ -220,22 +223,15 @@ public class DMDircDesktopPane extends JDesktopPane implements FrameListener,
         });
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void addWindow(final FrameContainer window, final boolean focus) {
-        addWindow(model.getRootNode(), window);
-    }
-
     @Override
-    public void addWindow(final FrameContainer parent,
-            final FrameContainer window, final boolean focus) {
+    public void windowAdded(final Window parent, final Window window) {
         UIUtilities.invokeAndWait(new Runnable() {
 
             /** {@inheritDoc} */
             @Override
             public void run() {
                 synchronized (nodes) {
-                    addWindow(nodes.get(parent), window);
+                    addWindow(parent == null ? model.getRootNode() : nodes.get(parent), window);
                 }
             }
         });
@@ -243,14 +239,7 @@ public class DMDircDesktopPane extends JDesktopPane implements FrameListener,
 
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer parent,
-            final FrameContainer window) {
-        delWindow(window);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void delWindow(final FrameContainer window) {
+    public void windowDeleted(final Window parent, final Window window) {
         UIUtilities.invokeAndWait(new Runnable() {
 
             /** {@inheritDoc} */
@@ -269,8 +258,8 @@ public class DMDircDesktopPane extends JDesktopPane implements FrameListener,
                     model.removeNodeFromParent(nodes.get(window));
                 }
                 nodes.remove(window);
-                window.removeSelectionListener(DMDircDesktopPane.this);
-                ((TextFrame) window.getFrame()).removePropertyChangeListener(
+                window.getContainer().removeSelectionListener(DMDircDesktopPane.this);
+                ((TextFrame) window).removePropertyChangeListener(
                         DMDircDesktopPane.this);
                 if (getAllFrames().length == 0) {
                     mainFrame.setTitle(null);
@@ -285,21 +274,20 @@ public class DMDircDesktopPane extends JDesktopPane implements FrameListener,
      * @param parent Parent node
      * @param window Window to add
      */
-    public void addWindow(final TreeViewNode parent,
-            final FrameContainer window) {
+    public void addWindow(final TreeViewNode parent, final Window window) {
         UIUtilities.invokeAndWait(new Runnable() {
 
             /** {@inheritDoc} */
             @Override
             public void run() {
-                final TreeViewNode node = new TreeViewNode(null, window);
+                final TreeViewNode node = new TreeViewNode(null, window.getContainer());
                 synchronized (nodes) {
                     nodes.put(window, node);
                 }
                 node.setUserObject(window);
                 model.insertNodeInto(node, parent);
-                window.addSelectionListener(DMDircDesktopPane.this);
-                ((TextFrame) window.getFrame()).addPropertyChangeListener(
+                window.getContainer().addSelectionListener(DMDircDesktopPane.this);
+                ((TextFrame) window).addPropertyChangeListener(
                         DMDircDesktopPane.this);
             }
         });
@@ -317,7 +305,7 @@ public class DMDircDesktopPane extends JDesktopPane implements FrameListener,
 
     /** {@inheritDoc} */
     @Override
-    public void selectionChanged(final FrameContainer window) {
+    public void selectionChanged(final FrameContainer<?> window) {
         UIUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */

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

@@ -86,8 +86,8 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
      * @param owner The Channel object that owns this frame
      * @param controller Swing controller
      */
-    public ChannelFrame(final Channel owner, final SwingController controller) {
-        super(owner, controller);
+    public ChannelFrame(final SwingController controller, final Channel owner) {
+        super(controller, owner);
 
         parentChannel = owner;
 
@@ -157,6 +157,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public Channel getChannel() {
         return parentChannel;
     }

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

@@ -49,7 +49,7 @@ public class CustomFrame extends TextFrame {
      * @param owner The frame container that owns this frame
      * @param controller Swing controller
      */
-    public CustomFrame(final FrameContainer owner, final SwingController controller) {
+    public CustomFrame(final SwingController controller, final FrameContainer<?> owner) {
         super(owner, controller);
 
         initComponents();

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

@@ -26,6 +26,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 import javax.swing.JPopupMenu;
 
@@ -52,8 +53,9 @@ public class CustomInputFrame extends InputTextFrame {
      * @param owner The frame container that owns this frame
      * @param controller Swing controller
      */
-    public CustomInputFrame(final WritableFrameContainer owner, final SwingController controller) {
-        super(owner, controller);
+    public CustomInputFrame(final SwingController controller,
+            final WritableFrameContainer<? extends InputWindow> owner) {
+        super(controller, owner);
 
         setInputHandler(new SwingInputHandler(getInputField(), owner.getCommandParser(), this));
 
@@ -63,7 +65,7 @@ public class CustomInputFrame extends InputTextFrame {
     /** {@inheritDoc} */
     @Override
     public final CommandParser getCommandParser() {
-        return ((WritableFrameContainer) frameParent).getCommandParser();
+        return ((WritableFrameContainer<? extends InputWindow>) frameParent).getCommandParser();
     }
 
     /**

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

@@ -98,8 +98,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      * @param owner WritableFrameContainer owning this frame.
      * @param controller Swing controller
      */
-    public InputTextFrame(final WritableFrameContainer owner,
-            final SwingController controller) {
+    public InputTextFrame(final SwingController controller,
+            final WritableFrameContainer<? extends InputWindow> owner) {
         super(owner, controller);
 
         initComponents();
@@ -207,8 +207,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      * @return This frame's container.
      */
     @Override
-    public WritableFrameContainer getContainer() {
-        return (WritableFrameContainer) super.getContainer();
+    public WritableFrameContainer<? extends InputWindow> getContainer() {
+        return (WritableFrameContainer<? extends InputWindow>) super.getContainer();
     }
 
     /**
@@ -229,6 +229,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     public final void setInputHandler(final InputHandler newInputHandler) {
         this.inputHandler = newInputHandler;
         inputHandler.addValidationListener(inputField);
+        inputHandler.setTabCompleter(((WritableFrameContainer<?>) frameParent).getTabCompleter());
     }
 
     /**
@@ -264,6 +265,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      * @param awayState away state
      */
     @Override
+    @Deprecated
     public void setAwayIndicator(final boolean awayState) {
         UIUtilities.invokeLater(new Runnable() {
 

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

@@ -52,8 +52,8 @@ public final class QueryFrame extends InputTextFrame implements QueryWindow {
      * @param owner Parent Frame container
      * @param controller Swing controller
      */
-    public QueryFrame(final Query owner, final SwingController controller) {
-        super(owner, controller);
+    public QueryFrame(final SwingController controller, final Query owner) {
+        super(controller, owner);
 
         initComponents();
 

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

@@ -62,8 +62,8 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
      * @param owner Parent Frame container
      * @param controller Swing controller
      */
-    public ServerFrame(final Server owner, final SwingController controller) {
-        super(owner, controller);
+    public ServerFrame(final SwingController controller, final Server owner) {
+        super(controller, owner);
 
         initComponents();
         

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

@@ -113,7 +113,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
      */
     private static final long serialVersionUID = 5;
     /** The channel object that owns this frame. */
-    protected final FrameContainer frameParent;
+    protected final FrameContainer<?> frameParent;
     /** Frame output pane. */
     private TextPane textPane;
     /** search bar. */
@@ -137,7 +137,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
      * @param owner FrameContainer owning this frame.
      * @param controller Swing controller
      */
-    public TextFrame(final FrameContainer owner,
+    public TextFrame(final FrameContainer<?> owner,
             final SwingController controller) {
         super();
         this.controller = controller;
@@ -202,15 +202,6 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         return panel;
     }
 
-    /**
-     * Returns this text frames swing controller.
-     * 
-     * @return Swing controller
-     */
-    public SwingController getController() {
-        return controller;
-    }
-
     /** {@inheritDoc} */
     @Override
     @Deprecated
@@ -738,11 +729,12 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /** {@inheritDoc} */
     @Override
-    public FrameContainer getContainer() {
+    public FrameContainer<?> getContainer() {
         return frameParent;
     }
 
     /** {@inheritDoc} */
+    @Deprecated
     @Override
     public ConfigManager getConfigManager() {
         return getContainer().getConfigManager();
@@ -1005,7 +997,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /** {@inheritDoc} */
     @Override
-    public void iconChanged(final FrameContainer window, final String icon) {
+    public void iconChanged(final FrameContainer<?> window, final String icon) {
         UIUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */
@@ -1018,13 +1010,13 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
     /** {@inheritDoc} */
     @Override
-    public void nameChanged(final FrameContainer window, final String name) {
+    public void nameChanged(final FrameContainer<?> window, final String name) {
         //Ignore
     }
 
     /** {@inheritDoc} */
     @Override
-    public void titleChanged(final FrameContainer window, final String title) {
+    public void titleChanged(final FrameContainer<?> window, final String title) {
         UIUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */
@@ -1036,4 +1028,10 @@ public abstract class TextFrame extends JInternalFrame implements Window,
             }
         });
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public SwingController getController() {
+        return controller;
+    }
 }

src/com/dmdirc/addons/ui_swing/components/reorderablelist/ArrayListTransferable.java

@@ -40,14 +40,14 @@ public final class ArrayListTransferable implements Transferable {
     /** Serial transfer flavour. */
     private final DataFlavor serialArrayListFlavor;
     /** Transferred ArrayList. */
-    private final ArrayList data; //NOPMD
+    private final ArrayList<?> data; //NOPMD
     
     /** 
      * Initialises the ArrayListTransferable. 
      *
      * @param alist ArrayList to transfer
      */
-    public ArrayListTransferable(final ArrayList alist) { //NOPMD
+    public ArrayListTransferable(final ArrayList<?> alist) { //NOPMD
         super();
         
         data = alist;

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

@@ -71,9 +71,9 @@ public final class ButtonBar implements FrameManager, ActionListener,
      */
     private static final long serialVersionUID = 3;
     /** A map of parent containers to their respective windows. */
-    private final MapList<FrameContainer, FrameContainer> windows;
+    private final MapList<FrameContainer<?>, FrameContainer<?>> windows;
     /** A map of containers to the buttons we're using for them. */
-    private final Map<FrameContainer, JToggleButton> buttons;
+    private final Map<FrameContainer<?>, JToggleButton> buttons;
     /** The position of this frame manager. */
     private final FramemanagerPosition position;
     /** The parent for the manager. */
@@ -81,7 +81,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
     /** The panel used for our buttons. */
     private final JPanel panel;
     /** The currently selected window. */
-    private transient FrameContainer selected;
+    private transient FrameContainer<?> selected;
     /** Selected window. */
     private Window activeWindow;
     /** The number of buttons per row or column. */
@@ -95,8 +95,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** Creates a new instance of DummyFrameManager. */
     public ButtonBar() {
-        windows = new MapList<FrameContainer, FrameContainer>();
-        buttons = new HashMap<FrameContainer, JToggleButton>();
+        windows = new MapList<FrameContainer<?>, FrameContainer<?>>();
+        buttons = new HashMap<FrameContainer<?>, JToggleButton>();
         position = FramemanagerPosition.getPosition(
                 IdentityManager.getGlobalConfig().getOption("ui", "framemanagerPosition"));
 
@@ -123,13 +123,13 @@ public final class ButtonBar implements FrameManager, ActionListener,
     private void relayout() {
         panel.removeAll();
 
-        for (Map.Entry<FrameContainer, List<FrameContainer>> entry : windows.entrySet()) {
+        for (Map.Entry<FrameContainer<?>, List<FrameContainer<?>>> entry : windows.entrySet()) {
             buttons.get(entry.getKey()).setPreferredSize(new Dimension(buttonWidth, buttonHeight));
             panel.add(buttons.get(entry.getKey()));
 
             Collections.sort(entry.getValue(), new FrameContainerComparator());
 
-            for (FrameContainer child : entry.getValue()) {
+            for (FrameContainer<?> child : entry.getValue()) {
                 buttons.get(child).setPreferredSize(new Dimension(buttonWidth, buttonHeight));
                 panel.add(buttons.get(child));
             }
@@ -143,7 +143,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
      *
      * @param source The Container to get title/icon info from
      */
-    private void addButton(final FrameContainer source) {
+    private void addButton(final FrameContainer<?> source) {
         final JToggleButton button = new JToggleButton(source.toString(),
                 IconManager.getIconManager().getIcon(source.getIcon()));
 
@@ -169,7 +169,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer window, final boolean focus) {
+    public void addWindow(final FrameContainer<?> window, final boolean focus) {
         windows.add(window);
         //This window is a root window
         addButton(window);
@@ -182,7 +182,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer window) {
+    public void delWindow(final FrameContainer<?> window) {
         windows.remove(window);
 
         relayout();
@@ -193,8 +193,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer parent,
-            final FrameContainer window, final boolean focus) {
+    public void addWindow(final FrameContainer<?> parent,
+            final FrameContainer<?> window, final boolean focus) {
         windows.add(parent, window);
         //This window has a parent Window
         addButton(window);
@@ -207,7 +207,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer parent, final FrameContainer window) {
+    public void delWindow(final FrameContainer<?> parent, final FrameContainer<?> window) {
         windows.remove(parent, window);
 
         relayout();
@@ -223,7 +223,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        for (Map.Entry<FrameContainer, JToggleButton> entry : buttons.entrySet()) {
+        for (Map.Entry<FrameContainer<?>, JToggleButton> entry : buttons.entrySet()) {
             if (entry.getValue().equals(e.getSource())) {
                 if (entry.getKey().getFrame().equals(activeWindow)) {
                     entry.getValue().setSelected(true);
@@ -283,7 +283,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void notificationSet(final FrameContainer window, final Color colour) {
+    public void notificationSet(final FrameContainer<?> window, final Color colour) {
         if (buttons.containsKey(window)) {
             buttons.get(window).setForeground(colour);
         }
@@ -291,13 +291,13 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void notificationCleared(final FrameContainer window) {
+    public void notificationCleared(final FrameContainer<?> window) {
         notificationSet(window, window.getNotification());
     }
 
     /** {@inheritDoc} */
     @Override
-    public void selectionChanged(final FrameContainer window) {
+    public void selectionChanged(final FrameContainer<?> window) {
         activeWindow = window.getFrame();
         if (selected != null && buttons.containsKey(selected)) {
             buttons.get(selected).setSelected(false);
@@ -312,19 +312,19 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void iconChanged(final FrameContainer window, final String icon) {
+    public void iconChanged(final FrameContainer<?> window, final String icon) {
         buttons.get(window).setIcon(IconManager.getIconManager().getIcon(icon));
     }
 
     /** {@inheritDoc} */
     @Override
-    public void nameChanged(final FrameContainer window, final String name) {
+    public void nameChanged(final FrameContainer<?> window, final String name) {
         buttons.get(window).setText(name);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void titleChanged(final FrameContainer window, final String title) {
+    public void titleChanged(final FrameContainer<?> window, final String title) {
         // Do nothing
     }
 }

src/com/dmdirc/addons/ui_swing/framemanager/tree/NodeLabel.java

@@ -27,7 +27,6 @@ import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.interfaces.SelectionListener;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.interfaces.Window;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -49,7 +48,7 @@ public class NodeLabel extends JLabel implements SelectionListener,
      */
     private static final long serialVersionUID = 1;
     /** Node window. */
-    private final Window window;
+    private final FrameContainer<?> window;
     /** Rollover colours. */
     private boolean rollover;
     /** notification colour */
@@ -62,7 +61,7 @@ public class NodeLabel extends JLabel implements SelectionListener,
      * 
      * @param window Window for this node
      */
-    public NodeLabel(final Window window) {
+    public NodeLabel(final FrameContainer<?> window) {
         super();
 
         this.window = window;
@@ -78,11 +77,11 @@ public class NodeLabel extends JLabel implements SelectionListener,
             return;
         }
 
-        setText(window.getContainer().toString());
+        setText(window.toString());
 
         setOpaque(true);
         setToolTipText(null);
-        setIcon(IconManager.getIconManager().getIcon(window.getContainer().getIcon()));
+        setIcon(IconManager.getIconManager().getIcon(window.getIcon()));
         setBorder(BorderFactory.createEmptyBorder(1, 0, 2, 0));
 
         setPreferredSize(new Dimension(100000, getFont().getSize() +
@@ -94,8 +93,8 @@ public class NodeLabel extends JLabel implements SelectionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void selectionChanged(final FrameContainer window) {
-        if (equals(window.getFrame())) {
+    public void selectionChanged(final FrameContainer<?> window) {
+        if (equals(window)) {
             selected = true;
         } else {
             selected = false;
@@ -104,39 +103,39 @@ public class NodeLabel extends JLabel implements SelectionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void notificationSet(final FrameContainer window, final Color colour) {
-        if (equals(window.getFrame())) {
+    public void notificationSet(final FrameContainer<?> window, final Color colour) {
+        if (equals(window)) {
             notificationColour = colour;
         }
     }
 
     /** {@inheritDoc} */
     @Override
-    public void notificationCleared(final FrameContainer window) {
-        if (equals(window.getFrame())) {
+    public void notificationCleared(final FrameContainer<?> window) {
+        if (equals(window)) {
             notificationColour = null;
         }
     }
 
     /** {@inheritDoc} */
     @Override
-    public void iconChanged(final FrameContainer window, final String icon) {
-        if (equals(window.getFrame())) {
+    public void iconChanged(final FrameContainer<?> window, final String icon) {
+        if (equals(window)) {
             setIcon(IconManager.getIconManager().getIcon(icon));
         }
     }
 
     /** {@inheritDoc} */
     @Override
-    public void nameChanged(final FrameContainer window, final String name) {
-        if (equals(window.getFrame())) {
+    public void nameChanged(final FrameContainer<?> window, final String name) {
+        if (equals(window)) {
             setText(name);
         }
     }
 
     /** {@inheritDoc} */
     @Override
-    public void titleChanged(final FrameContainer window, final String title) {
+    public void titleChanged(final FrameContainer<?> window, final String title) {
         // Do nothing
     }
 

src/com/dmdirc/addons/ui_swing/framemanager/tree/Tree.java

@@ -30,6 +30,7 @@ import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.interfaces.Window;
 
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
@@ -110,13 +111,13 @@ public class Tree extends JTree implements MouseMotionListener,
                             new IllegalArgumentException("Last component == null"));
                     return;
                 }
-                if (((TreeViewNode) path.getLastPathComponent()).getFrameContainer() == null) {
+                if (((TreeViewNode) path.getLastPathComponent()).getWindow() == null) {
                     Logger.appError(ErrorLevel.HIGH, "Unable to change focus",
                             new IllegalArgumentException("Frame is null"));
                     return;
                 }
                 super.setPath(path);
-                ((TreeViewNode) path.getLastPathComponent()).getFrameContainer().
+                ((TreeViewNode) path.getLastPathComponent()).getWindow().
                         activateFrame();
             }
         };
@@ -193,7 +194,7 @@ public class Tree extends JTree implements MouseMotionListener,
             final TreeViewNode node = getNodeForLocation(e.getX(), e.getY());
             if (node != null) {
                 ((TreeViewNode) new TreePath(node.getPath()).
-                        getLastPathComponent()).getFrameContainer().
+                        getLastPathComponent()).getWindow().
                         activateFrame();
             }
         }
@@ -232,7 +233,7 @@ public class Tree extends JTree implements MouseMotionListener,
             final TreePath selectedPath = getPathForLocation(e.getX(), e.getY());
             if (selectedPath != null) {
                 ((TreeViewNode) selectedPath.getLastPathComponent()).
-                        getFrameContainer().activateFrame();
+                        getWindow().activateFrame();
             }
         }
         processMouseEvents(e);
@@ -277,26 +278,38 @@ public class Tree extends JTree implements MouseMotionListener,
         final TreePath localPath = getPathForLocation(e.getX(), e.getY());
         if (localPath != null) {
             if (e.isPopupTrigger()) {
-                final TextFrame frame = (TextFrame) ((TreeViewNode) localPath.
-                        getLastPathComponent()).getFrameContainer().
-                        getFrame();
+                TextFrame frame = null;
+
+                for (Window window : ((TreeViewNode) localPath.
+                        getLastPathComponent()).getWindow().getWindows()) {
+                    if (window instanceof TextFrame) {
+                        frame = (TextFrame) window;
+                        break;
+                    }
+                }
+
+                if (frame == null) {
+                    return;
+                }
+
                 final JPopupMenu popupMenu = frame.getPopupMenu(null, "");
                 frame.addCustomPopupItems(popupMenu);
                 if (popupMenu.getComponentCount() > 0) {
                     popupMenu.addSeparator();
                 }
-                    final TreeViewNodeMenuItem moveUp =
-                            new TreeViewNodeMenuItem("Move Up", "Up",
-                            (TreeViewNode) localPath.getLastPathComponent());
-                    final TreeViewNodeMenuItem moveDown =
-                            new TreeViewNodeMenuItem("Move Down", "Down",
-                            (TreeViewNode) localPath.getLastPathComponent());
-
-                    moveUp.addActionListener(this);
-                    moveDown.addActionListener(this);
-
-                    popupMenu.add(moveUp);
-                    popupMenu.add(moveDown);
+
+                final TreeViewNodeMenuItem moveUp =
+                        new TreeViewNodeMenuItem("Move Up", "Up",
+                        (TreeViewNode) localPath.getLastPathComponent());
+                final TreeViewNodeMenuItem moveDown =
+                        new TreeViewNodeMenuItem("Move Down", "Down",
+                        (TreeViewNode) localPath.getLastPathComponent());
+
+                moveUp.addActionListener(this);
+                moveDown.addActionListener(this);
+
+                popupMenu.add(moveUp);
+                popupMenu.add(moveDown);
                 popupMenu.add(new JMenuItem(new CloseFrameContainerAction(frame.
                         getContainer())));
                 popupMenu.show(this, e.getX(), e.getY());

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -72,11 +72,11 @@ public final class TreeFrameManager implements FrameManager,
     /** data model. */
     private final TreeViewModel model;
     /** node storage, used for adding and deleting nodes correctly. */
-    private final Map<FrameContainer, TreeViewNode> nodes;
+    private final Map<FrameContainer<?>, TreeViewNode> nodes;
 
     /** creates a new instance of the TreeFrameManager. */
     public TreeFrameManager() {
-        nodes = new HashMap<FrameContainer, TreeViewNode>();
+        nodes = new HashMap<FrameContainer<?>, TreeViewNode>();
         model = new TreeViewModel(new TreeViewNode(null, null));
         tree = new Tree(this, model);
 
@@ -126,27 +126,27 @@ public final class TreeFrameManager implements FrameManager,
 
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer window, final boolean focus) {
+    public void addWindow(final FrameContainer<?> window, final boolean focus) {
         addWindow(model.getRootNode(), window);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer parent,
-            final FrameContainer window, final boolean focus) {
+    public void addWindow(final FrameContainer<?> parent,
+            final FrameContainer<?> window, final boolean focus) {
         addWindow(nodes.get(parent), window);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer parent,
-            final FrameContainer window) {
+    public void delWindow(final FrameContainer<?> parent,
+            final FrameContainer<?> window) {
         delWindow(window);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer window) {
+    public void delWindow(final FrameContainer<?> window) {
         UIUtilities.invokeAndWait(new Runnable() {
 
             /** {@inheritDoc} */
@@ -182,14 +182,14 @@ public final class TreeFrameManager implements FrameManager,
      * @param window Window to add
      */
     public void addWindow(final TreeViewNode parent,
-            final FrameContainer window) {
+            final FrameContainer<?> window) {
         UIUtilities.invokeAndWait(new Runnable() {
 
             /** {@inheritDoc} */
             @Override
             public void run() {
                 final TreeViewNode node =
-                        new TreeViewNode(new NodeLabel(window.getFrame()),
+                        new TreeViewNode(new NodeLabel(window),
                         window);
                 synchronized (nodes) {
                     nodes.put(window, node);
@@ -283,11 +283,9 @@ public final class TreeFrameManager implements FrameManager,
                 ((DefaultTreeModel) tree.getModel()).setRoot(new TreeViewNode(
                         null, null));
 
-                final FrameContainer[] rootWindows = WindowManager.getRootWindows();
-
-                for (FrameContainer window : rootWindows) {
+                for (FrameContainer<?> window : WindowManager.getRootWindows()) {
                     addWindow(window, false);
-                    final Collection<FrameContainer> childWindows = window.getChildren();
+                    final Collection<FrameContainer<?>> childWindows = window.getChildren();
                     for (FrameContainer childWindow : childWindows) {
                         addWindow(window, childWindow, false);
                     }

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeViewModel.java

@@ -101,7 +101,7 @@ public class TreeViewModel extends DefaultTreeModel {
      * @return index where new node is to be inserted.
      */
     private int getIndex(final TreeViewNode newChild, final TreeViewNode parent) {
-        if (newChild.getFrameContainer() instanceof GlobalWindow) {
+        if (newChild.getWindow() instanceof GlobalWindow) {
             return 0;
         }
 
@@ -139,8 +139,8 @@ public class TreeViewModel extends DefaultTreeModel {
      */
     private boolean sortBefore(final TreeViewNode newChild,
             final TreeViewNode child) {
-        return comparator.compare(newChild.getFrameContainer(), child.
-                getFrameContainer()) <= -1;
+        return comparator.compare(newChild.getWindow(), child.
+                getWindow()) <= -1;
     }
 
     /**
@@ -154,8 +154,8 @@ public class TreeViewModel extends DefaultTreeModel {
      */
     private boolean sortAfter(final TreeViewNode newChild,
             final TreeViewNode child) {
-        return comparator.compare(newChild.getFrameContainer(), child.
-                getFrameContainer()) >= 1;
+        return comparator.compare(newChild.getWindow(), child.
+                getWindow()) >= 1;
     }
 
     /**

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeViewNode.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.ui.interfaces.Window;
 import javax.swing.tree.DefaultMutableTreeNode;
 
 /**
@@ -39,21 +40,21 @@ public class TreeViewNode extends DefaultMutableTreeNode {
     /** Node's label. */
     private NodeLabel label;
     /** Node's frame container. */
-    private FrameContainer frameContainer;
+    private FrameContainer<?> window;
     
-    public TreeViewNode(final NodeLabel label, final FrameContainer frameContainer) {
+    public TreeViewNode(final NodeLabel label, final FrameContainer<?> window) {
         super();
         
         this.label = label;
-        this.frameContainer = frameContainer;
+        this.window = window;
     }
     
     public NodeLabel getLabel() {
         return label;
     }
     
-    public FrameContainer getFrameContainer() {
-        return frameContainer;
+    public FrameContainer<?> getWindow() {
+        return window;
     }
 
 }

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

@@ -157,13 +157,13 @@ public class WebInterfaceUI implements UIController {
 
     /** {@inheritDoc} */
     @Override
-    public Window getWindow(final FrameContainer owner) {
+    public Window getWindow(final FrameContainer<?> owner) {
         return new WebWindow(owner);
     }
 
     /** {@inheritDoc} */
     @Override
-    public InputWindow getInputWindow(final WritableFrameContainer owner) {
+    public InputWindow getInputWindow(final WritableFrameContainer<?> owner) {
         return new WebInputWindow(owner, owner.getCommandParser());
     }
 

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

@@ -58,22 +58,22 @@ public class WebFrameManager implements FrameManager {
 
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer window, final boolean focus) {
+    public void addWindow(final FrameContainer<?> window, final boolean focus) {
         DynamicRequestHandler.addEvent(new Event("newwindow", window.getFrame()));
         WebInterfaceUI.active = (WebWindow) window.getFrame();
     }
 
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer window) {
+    public void delWindow(final FrameContainer<?> window) {
         //TODO FIXME
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer parent, 
-            final FrameContainer window, final boolean focus) {
+    public void addWindow(final FrameContainer<?> parent,
+            final FrameContainer<?> window, final boolean focus) {
         DynamicRequestHandler.addEvent(new Event("newchildwindow", new Object[]{
             parent.getFrame(), window.getFrame()
         }));
@@ -82,7 +82,7 @@ public class WebFrameManager implements FrameManager {
 
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer parent, final FrameContainer window) {
+    public void delWindow(final FrameContainer<?> parent, final FrameContainer<?> window) {
         //TODO FIXME
         throw new UnsupportedOperationException("Not supported yet.");
     }

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

@@ -36,7 +36,7 @@ import java.util.Map;
  */
 public class WebInputWindow extends WebWindow implements InputWindow {
     
-    private final WritableFrameContainer parent;
+    private final WritableFrameContainer<?> parent;
     
     private final CommandParser commandparser;
     
@@ -45,7 +45,7 @@ public class WebInputWindow extends WebWindow implements InputWindow {
     private final Map<String, WebInputHandler> inputHandlers
             = new HashMap<String, WebInputHandler>();
 
-    public WebInputWindow(WritableFrameContainer parent, CommandParser parser) {
+    public WebInputWindow(WritableFrameContainer<?> parent, CommandParser parser) {
         super(parent);
         this.parent = parent;
         this.commandparser = parser;
@@ -98,13 +98,14 @@ public class WebInputWindow extends WebWindow implements InputWindow {
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public void setAwayIndicator(boolean isAway) {
         // Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
-    public WritableFrameContainer getContainer() {
+    public WritableFrameContainer<?> getContainer() {
         return parent;
     }
 

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

@@ -33,6 +33,7 @@ import com.dmdirc.util.StringTranscoder;
 import com.dmdirc.addons.ui_web.DynamicRequestHandler;
 import com.dmdirc.addons.ui_web.Event;
 import com.dmdirc.addons.ui_web.Message;
+import com.dmdirc.ui.interfaces.UIController;
 
 import java.awt.Color;
 import java.awt.font.TextAttribute;
@@ -60,13 +61,13 @@ public class WebWindow implements Window {
     
     protected int myID = ++counter;
     
-    private final FrameContainer parent;
+    private final FrameContainer<?> parent;
     
     private List<String> messages = new ArrayList<String>();
     
     private String title;
     
-    public WebWindow(final FrameContainer parent) {
+    public WebWindow(final FrameContainer<?> parent) {
         super();
         
         this.parent = parent;
@@ -126,13 +127,14 @@ public class WebWindow implements Window {
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public ConfigManager getConfigManager() {
         return parent.getConfigManager();
     }
 
     /** {@inheritDoc} */
     @Override
-    public FrameContainer getContainer() {
+    public FrameContainer<?> getContainer() {
         return parent;
     }
 
@@ -150,6 +152,7 @@ public class WebWindow implements Window {
 
     /** {@inheritDoc} */
     @Override
+    @Deprecated
     public String getTitle() {
         return title;
     }
@@ -333,4 +336,11 @@ public class WebWindow implements Window {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public UIController getController() {
+        //TODO FIXME
+        return null;
+    }
+
 }

src/com/dmdirc/addons/urlcatcher/UrlCatcherPlugin.java

@@ -85,7 +85,7 @@ public class UrlCatcherPlugin extends Plugin implements ActionListener,
             return;
         }
 
-        final String message = ((FrameContainer) arguments[0]).getStyliser()
+        final String message = ((FrameContainer<?>) arguments[0]).getStyliser()
                 .doLinks((String) arguments[1]);
         
         if (message.indexOf(Styliser.CODE_HYPERLINK) > -1) {

src/com/dmdirc/addons/urlcatcher/UrlListCommand.java

@@ -44,7 +44,7 @@ public class UrlListCommand extends GlobalCommand implements IntelligentCommand
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final boolean isSilent,
+    public void execute(final FrameContainer<?> origin, final boolean isSilent,
             final CommandArguments args) {
         final String[] headers = {"URL", "Count"};
         final Map<String, Integer> map = plugin.getURLS();

src/com/dmdirc/addons/userlevel/AccessLevelComponent.java

@@ -41,13 +41,13 @@ public class AccessLevelComponent implements ActionComponent {
 
     /** {@inheritDoc} */
     @Override    
-    public Class appliesTo() {
+    public Class<?> appliesTo() {
         return ClientInfo.class;
     }
 
     /** {@inheritDoc} */
     @Override    
-    public Class getType() {
+    public Class<?> getType() {
         return Integer.class;
     }
 

src/com/dmdirc/addons/userlevel/ChannelAccessLevelComponent.java

@@ -48,13 +48,13 @@ public class ChannelAccessLevelComponent implements ActionComponent {
 
     /** {@inheritDoc} */
     @Override    
-    public Class appliesTo() {
+    public Class<?> appliesTo() {
         return ChannelClientInfo.class;
     }
 
     /** {@inheritDoc} */
     @Override    
-    public Class getType() {
+    public Class<?> getType() {
         return Integer.class;
     }
 

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -108,7 +108,7 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener,
     @Override
     public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
         if (type.equals(CoreActionType.CLIENT_FRAME_CHANGED)) {
-            updateStatus((FrameContainer) arguments[0]);
+            updateStatus((FrameContainer<?>) arguments[0]);
         }
     }
 
@@ -123,7 +123,7 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener,
      * Update the window status using the current active window.
      */
     public void updateStatus() {
-        final FrameContainer active = WindowManager.getActiveWindow();
+        final FrameContainer<?> active = WindowManager.getActiveWindow();
 
         if (active != null) {
             updateStatus(active);
@@ -135,7 +135,7 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener,
      *
      * @param current Window to use when adding status.
      */
-    public void updateStatus(final FrameContainer current) {
+    public void updateStatus(final FrameContainer<?> current) {
         if (current == null) {
             return;
         }

test/com/dmdirc/addons/redirect/RedirectCommandTest.java

@@ -45,7 +45,7 @@ public class RedirectCommandTest {
     @Test
     public void testExecute() {
         final RedirectCommand command = new RedirectCommand();
-        final MessageTarget target = mock(MessageTarget.class);
+        final MessageTarget<?> target = mock(MessageTarget.class);
         final InputWindow window = mock(InputWindow.class);
         when(target.getFrame()).thenReturn(window);
         final CommandParser parser = new ServerCommandParser();

test/com/dmdirc/addons/ui_swing/components/frames/InputTextFrameTest.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.Main;
-import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
@@ -35,6 +34,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.TextAreaInputField;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.awt.event.KeyEvent;
 
@@ -54,7 +54,7 @@ public class InputTextFrameTest {
     static FrameFixture mainframe;
     static JInternalFrameFixture window;
     static TestConfigManagerMap cmmap;
-    static TestWritableFrameContainer owner;
+    static TestWritableFrameContainer<InputWindow> owner;
     static SwingController controller;
 
     @BeforeClass
@@ -81,14 +81,14 @@ public class InputTextFrameTest {
         cmmap = new TestConfigManagerMap();
         cmmap.settings.put("ui.pasteProtectionLimit", "1");
 
-        owner = new TestWritableFrameContainer(512, cmmap);
+        owner = new TestWritableFrameContainer<InputWindow>(512, cmmap, InputWindow.class);
         setupWindow(cmmap);
     }
 
     @After
     public void tearDown() {
         window.close();
-        owner.window.close();
+        owner.getFrame().close();
         WindowManager.removeWindow(owner);
     }
 
@@ -149,10 +149,10 @@ public class InputTextFrameTest {
     }
 
     protected void setupWindow(final ConfigManager configManager) {
-        final CustomInputFrame titf = new CustomInputFrame(owner, controller);
+        final CustomInputFrame titf = new CustomInputFrame(controller, owner);
 
         owner.setTitle("testing123");
-        owner.window = titf;
+        owner.addWindow(titf);
 
         WindowManager.addWindow(owner);
 

test/com/dmdirc/addons/urlcatcher/UrlCatcherPluginTest.java

@@ -35,7 +35,7 @@ import static org.mockito.Mockito.*;
 
 public class UrlCatcherPluginTest {
     
-    private static FrameContainer container;
+    private static FrameContainer<?> container;
 
     @BeforeClass
     public static void setupClass() {