Massive window changes.

Highlights:

  - FrameContainers are now generic, according to their window type
  - Writable frame containers now handle their tab completers
  - Redirect plugin works again
  - Windows are no longer actively requested from the UI; the UI
    creates and adds them in response to events from the WindowManager

fixes issue 3997, fixes issue 4000, fixes issue 4012, fixes issue 4030
fixes issue 4027, fixes issue 4028, fixes issue 4029, fixes issue 4031
fixes issue 4032, fixes issue 4033

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

src/com/dmdirc/Channel.java

@@ -37,7 +37,6 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.ChannelWindow;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.RollingList;
@@ -56,7 +55,7 @@ import java.util.Map;
  *
  * @author chris
  */
-public class Channel extends MessageTarget implements ConfigChangeListener {
+public class Channel extends MessageTarget<ChannelWindow> implements ConfigChangeListener {
 
     /** The parser's pChannel class. */
     private transient ChannelInfo channelInfo;
@@ -64,9 +63,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     /** The server this channel is on. */
     private Server server;
 
-    /** The ChannelWindow used for this channel. */
-    private ChannelWindow window;
-
     /** The tabcompleter used for this channel. */
     private final TabCompleter tabCompleter;
 
@@ -98,6 +94,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     public Channel(final Server newServer, final ChannelInfo newChannelInfo) {
         super("channel-inactive", newChannelInfo.getName(),
                 Styliser.stipControlCodes(newChannelInfo.getName()),
+                ChannelWindow.class,
                 new ConfigManager(newServer.getProtocol(), newServer.getIrcd(),
                 newServer.getNetwork(), newServer.getAddress(), newChannelInfo.getName()),
                 new ChannelCommandParser());
@@ -121,9 +118,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
         tabCompleter.addEntries(TabCompletionType.COMMAND,
                 CommandManager.getCommandNames(CommandType.TYPE_CHAT));
 
-        window = Main.getUI().getChannel(Channel.this);
         WindowManager.addWindow(server, this);
-        window.getInputHandler().setTabCompleter(tabCompleter);
 
         eventHandler = new ChannelEventHandler(this);
 
@@ -148,7 +143,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
      * Shows this channel's window.
      */
     public void show() {
-        window.open();
+        getFrame().open();
     }
 
     /** {@inheritDoc} */
@@ -246,21 +241,8 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
         registerCallbacks();
     }
 
-    /**
-     * Returns the internal window belonging to this object.
-     *
-     * @return This object's internal window
-     */
+    /** {@inheritDoc} */
     @Override
-    public InputWindow getFrame() {
-        return window;
-    }
-
-    /**
-     * Returns the tab completer for this channel.
-     *
-     * @return This channel's tab completer
-     */
     public TabCompleter getTabCompleter() {
         return tabCompleter;
     }
@@ -343,8 +325,8 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
         setIcon("channel-inactive");
 
         synchronized (this) {
-            if (window != null) {
-                window.updateNames(new ArrayList<ChannelClientInfo>());
+            if (getFrame() != null) {
+                getFrame().updateNames(new ArrayList<ChannelClientInfo>());
             }
         }
     }
@@ -353,7 +335,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     @Override
     public void windowClosing() {
         // 1: Make the window non-visible
-        window.setVisible(false);
+        getFrame().setVisible(false);
 
         // 2: Remove any callbacks or listeners
         eventHandler.unregisterCallbacks();
@@ -382,7 +364,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     public void windowClosed() {
         // 7: Remove any references to the window and parents
         synchronized (this) {
-            window = null; // NOPMD
             server = null; // NOPMD
         }
     }
@@ -403,7 +384,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
      * @param client The client to be added
      */
     public void addClient(final ChannelClientInfo client) {
-        window.addName(client);
+        getFrame().addName(client);
         tabCompleter.addEntry(TabCompletionType.CHANNEL_NICK, client.getClient().getNickname());
     }
 
@@ -413,7 +394,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
      * @param client The client to be removed
      */
     public void removeClient(final ChannelClientInfo client) {
-        window.removeName(client);
+        getFrame().removeName(client);
         tabCompleter.removeEntry(TabCompletionType.CHANNEL_NICK, client.getClient().getNickname());
 
         if (client.getClient().equals(server.getParser().getLocalClient())) {
@@ -428,7 +409,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
      * @param clients The list of clients to use
      */
     public void setClients(final Collection<ChannelClientInfo> clients) {
-        window.updateNames(clients);
+        getFrame().updateNames(clients);
 
         tabCompleter.clear(TabCompletionType.CHANNEL_NICK);
 
@@ -454,8 +435,8 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
      * when (visible) user modes or nicknames change.
      */
     public void refreshClients() {
-        if (window != null && onChannel) {
-            window.updateNames();
+        if (getFrame() != null && onChannel) {
+            getFrame().updateNames();
         }
     }
 

src/com/dmdirc/ChannelEventHandler.java

@@ -63,7 +63,7 @@ public final class ChannelEventHandler extends EventHandler implements
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override
-    protected <T extends CallbackInterface> void addCallback(final CallbackManager cbm,
+    protected <T extends CallbackInterface> void addCallback(final CallbackManager<?> cbm,
             final Class<T> type) {
         if (OtherAwayStateListener.class.equals(type)) {
             cbm.addCallback(type, (T) this);

src/com/dmdirc/CustomWindow.java

@@ -31,10 +31,7 @@ import com.dmdirc.ui.interfaces.Window;
  *
  * @author chris
  */
-public class CustomWindow extends FrameContainer {
-
-    /** The window used by this container. */
-    private Window window;
+public class CustomWindow extends FrameContainer<Window> {
 
     /**
      * Creates a new custom window as a child of the specified window.
@@ -44,14 +41,10 @@ public class CustomWindow extends FrameContainer {
      * @param parent The parent of this custom window
      */
     public CustomWindow(final String name, final String title,
-            final FrameContainer parent) {
-        super("custom", name, title, parent.getConfigManager());
-
-        window = Main.getUI().getWindow(this);
+            final FrameContainer<?> parent) {
+        super("custom", name, title, Window.class, parent.getConfigManager());
 
         WindowManager.addWindow(parent, this);
-
-        window.open();
     }
 
     /**
@@ -61,26 +54,16 @@ public class CustomWindow extends FrameContainer {
      * @param title The parent of this custom window
      */
     public CustomWindow(final String name, final String title) {
-        super("custom", name, title, IdentityManager.getGlobalConfig());
-
-        window = Main.getUI().getWindow(this);
+        super("custom", name, title, Window.class, IdentityManager.getGlobalConfig());
 
         WindowManager.addWindow(this);
-
-        window.open();
-    }
-
-    /** {@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
@@ -95,7 +78,6 @@ public class CustomWindow extends FrameContainer {
     @Override
     public void windowClosed() {
         // 7: Remove any references to the window and parents
-        window = null; // NOPMD
         parent = null; // NOPMD
     }
 

src/com/dmdirc/EventHandler.java

@@ -42,12 +42,12 @@ public abstract class EventHandler implements CallbackInterface {
      */
     @SuppressWarnings("unchecked")
     public void registerCallbacks() {
-        final CallbackManager cbm = getServer().getParser().getCallbackManager();
+        final CallbackManager<?> cbm = getServer().getParser().getCallbackManager();
         
         try {
-            for (Class iface : this.getClass().getInterfaces()) {
+            for (Class<?> iface : this.getClass().getInterfaces()) {
                 if (CallbackInterface.class.isAssignableFrom(iface)) {
-                    addCallback(cbm, iface);
+                    addCallback(cbm, iface.asSubclass(CallbackInterface.class));
                 }
             }
         } catch (CallbackNotFoundException exception) {
@@ -75,7 +75,7 @@ public abstract class EventHandler implements CallbackInterface {
      */
     @SuppressWarnings("unchecked")
     protected abstract <T extends CallbackInterface> void addCallback(
-            final CallbackManager cbm, final Class<T> type) throws CallbackNotFoundException;
+            final CallbackManager<?> cbm, final Class<T> type) throws CallbackNotFoundException;
     
     /**
      * Retrieves the server belonging to this EventHandler's owner.

src/com/dmdirc/FrameContainer.java

@@ -50,9 +50,10 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * The frame container implements basic methods that should be present in
  * all objects that handle a frame.
  *
+ * @param <T> The type of window which should be used for this frame container.
  * @author chris
  */
-public abstract class FrameContainer {
+public abstract class FrameContainer<T extends Window> {
 
     /** Logger to use. */
     private static final java.util.logging.Logger LOGGER = java.util.logging
@@ -68,11 +69,18 @@ public abstract class FrameContainer {
     protected final IRCDocument document;
 
     /** The children of this frame. */
-    protected final Collection<FrameContainer> children
-            = new CopyOnWriteArrayList<FrameContainer>();
+    protected final Collection<FrameContainer<?>> children
+            = new CopyOnWriteArrayList<FrameContainer<?>>();
+
+    /** The windows representing of this frame. */
+    protected final Collection<T> windows
+            = new CopyOnWriteArrayList<T>();
+
+    /** The class of windows we want to represent this container. */
+    protected final Class<T> windowClass;
 
     /** The parent of this frame. */
-    protected FrameContainer parent;
+    protected FrameContainer<?> parent;
 
     /** The name of the icon being used for this container's frame. */
     private String icon;
@@ -101,14 +109,16 @@ public abstract class FrameContainer {
      * @param icon The icon to use for this container
      * @param name The name of this container
      * @param title The title of this container
+     * @param windowClass The class of windows required to represent this container
      * @param config The config manager for this container
      * @since 0.6.4
      */
     public FrameContainer(final String icon, final String name,
-            final String title, final ConfigManager config) {
+            final String title, final Class<T> windowClass, final ConfigManager config) {
         this.config = config;
         this.name = name;
         this.title = title;
+        this.windowClass = windowClass;
         this.styliser = new Styliser(this);
         this.document = new IRCDocument(this);
 
@@ -130,8 +140,12 @@ public abstract class FrameContainer {
      * Returns the internal frame associated with this object.
      *
      * @return The internal frame associated with this object
+     * @deprecated Use {@link #getWindows()} instead
      */
-    public abstract Window getFrame();
+    @Deprecated
+    public final T getFrame() {
+        return getWindows().isEmpty() ? null : getWindows().iterator().next();
+    }
 
     /**
      * Returns a collection of direct children of this frame.
@@ -139,7 +153,7 @@ public abstract class FrameContainer {
      * @return This frame's children
      * @since 0.6.4
      */
-    public Collection<FrameContainer> getChildren() {
+    public Collection<FrameContainer<?>> getChildren() {
         return Collections.unmodifiableCollection(children);
     }
 
@@ -149,7 +163,7 @@ public abstract class FrameContainer {
      * @param child The window to be added
      * @since 0.6.4
      */
-    public void addChild(final FrameContainer child) {
+    public void addChild(final FrameContainer<?> child) {
         children.add(child);
         child.setParent(this);
     }
@@ -160,7 +174,7 @@ public abstract class FrameContainer {
      * @param child The window to be removed
      * @since 0.6.4
      */
-    public void removeChild(final FrameContainer child) {
+    public void removeChild(final FrameContainer<?> child) {
         children.remove(child);
     }
 
@@ -172,7 +186,7 @@ public abstract class FrameContainer {
      * @param parent The new parent for this container
      * @since 0.6.4
      */
-    public synchronized void setParent(final FrameContainer parent) {
+    public synchronized void setParent(final FrameContainer<?> parent) {
         if (this.parent != null && !parent.equals(this.parent)) {
             this.parent.removeChild(this);
         }
@@ -186,7 +200,7 @@ public abstract class FrameContainer {
      * @return This container's parent, or null if it is a top level window.
      * @since 0.6.4
      */
-    public FrameContainer getParent() {
+    public FrameContainer<?> getParent() {
         return parent;
     }
 
@@ -369,7 +383,7 @@ public abstract class FrameContainer {
      * @param colour The colour to use for the notification
      */
     public void sendNotification(final Color colour) {
-        final FrameContainer activeWindow = WindowManager.getActiveWindow();
+        final FrameContainer<?> activeWindow = WindowManager.getActiveWindow();
 
         if (activeWindow != null && !activeWindow.equals(this)
                 && !colour.equals(notification)) {
@@ -587,7 +601,48 @@ public abstract class FrameContainer {
     public void removeFrameInfoListener(final FrameInfoListener listener) {
         listeners.remove(FrameInfoListener.class, listener);
     }
-    
+
+    /**
+     * Adds a new window to this container.
+     *
+     * @param window The window to be added
+     * @since 0.6.4
+     */
+    public void addWindow(T window) {
+        windows.add(window);
+    }
+
+    /**
+     * Removes the specified window from this container.
+     *
+     * @param window The window to be removed
+     * @since 0.6.4
+     */
+    public void removeWindow(T window) {
+        windows.remove(window);
+    }
+
+    /**
+     * Retrieves a collection of windows that represent this container.
+     *
+     * @return The collection of windows currently representing this container
+     * @since 0.6.4
+     */
+    public Collection<T> getWindows() {
+        return windows;
+    }
+
+    /**
+     * Retrieves the class of windows which should be used to represent this
+     * container.
+     *
+     * @return This container's window class
+     * @since 0.6.4
+     */
+    public Class<T> getWindowClass() {
+        return windowClass;
+    }
+
     /**
      * Updates the icon of this frame if its config setting is changed.
      */

src/com/dmdirc/FrameContainerComparator.java

@@ -30,7 +30,7 @@ import java.util.Comparator;
 /**
  * Compares FrameContainers by name.
  */
-public final class FrameContainerComparator implements Comparator<FrameContainer>,
+public final class FrameContainerComparator implements Comparator<FrameContainer<?>>,
         Serializable {
 
     /**
@@ -62,7 +62,7 @@ public final class FrameContainerComparator implements Comparator<FrameContainer
         "item1.toString() returns a non-null value",
         "item2.toString() returns a non-null value"
     })
-    public int compare(final FrameContainer item1, final FrameContainer item2) {
+    public int compare(final FrameContainer<?> item1, final FrameContainer<?> item2) {
         Logger.assertTrue(item1 != null);
         Logger.assertTrue(item2 != null);
         Logger.assertTrue(item1.toString() != null);
@@ -91,8 +91,8 @@ public final class FrameContainerComparator implements Comparator<FrameContainer
      * @param item2 The existing container to test against
      * @return True iff the new container should be before the old container
      */
-    private boolean sortBefore(final FrameContainer item1,
-            final FrameContainer item2) {
+    private boolean sortBefore(final FrameContainer<?> item1,
+            final FrameContainer<?> item2) {
 
         return getPosition(item1) < getPosition(item2);
     }
@@ -104,8 +104,8 @@ public final class FrameContainerComparator implements Comparator<FrameContainer
      * @param item2 The existing container to test against
      * @return True iff the new container should be after the old container
      */
-    private boolean sortAfter(final FrameContainer item1,
-            final FrameContainer item2) {
+    private boolean sortAfter(final FrameContainer<?> item1,
+            final FrameContainer<?> item2) {
         return getPosition(item1) > getPosition(item2);
     }
 
@@ -116,7 +116,7 @@ public final class FrameContainerComparator implements Comparator<FrameContainer
      * @param item The frame container to be tested
      * @return Position of the frame container
      */
-    private int getPosition(final FrameContainer item) {
+    private int getPosition(final FrameContainer<?> item) {
         if (item instanceof GlobalWindow) {
             return 0;
         } else if (item instanceof Server) {

src/com/dmdirc/GlobalWindow.java

@@ -38,10 +38,7 @@ import com.dmdirc.ui.interfaces.InputWindow;
  *
  * @author chris
  */
-public class GlobalWindow extends WritableFrameContainer {
-
-    /** The window we're using. */
-    private InputWindow window;
+public class GlobalWindow extends WritableFrameContainer<InputWindow> {
 
     /** The global window that's in use, if any. */
     private static GlobalWindow globalWindow;
@@ -51,7 +48,8 @@ public class GlobalWindow extends WritableFrameContainer {
 
     /** Creates a new instance of GlobalWindow. */
     public GlobalWindow() {
-        super("icon", "Global", "(Global)", IdentityManager.getGlobalConfig(),
+        super("icon", "Global", "(Global)", InputWindow.class,
+                IdentityManager.getGlobalConfig(),
                 GlobalCommandParser.getGlobalCommandParser());
 
         tabCompleter = new TabCompleter();
@@ -60,26 +58,14 @@ public class GlobalWindow extends WritableFrameContainer {
         tabCompleter.addEntries(TabCompletionType.COMMAND,
                 AliasWrapper.getAliasWrapper().getAliases());
 
-        window = Main.getUI().getInputWindow(this);
-
-        window.getInputHandler().setTabCompleter(tabCompleter);
-
         WindowManager.addWindow(this);
-
-        window.open();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public InputWindow 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
@@ -94,7 +80,6 @@ public class GlobalWindow extends WritableFrameContainer {
     @Override
     public void windowClosed() {
         // 7: Remove any references to the window and parents
-        window = null;
         globalWindow = null;
     }
 

src/com/dmdirc/MessageTarget.java

@@ -24,14 +24,16 @@ package com.dmdirc;
 
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigManager;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Defines common methods for objects that you can send messages to (such as
  * channels and queries).
  *
+ * @param <T> The type of window which should be used for this frame container.
  * @author Chris
  */
-public abstract class MessageTarget extends WritableFrameContainer {
+public abstract class MessageTarget<T extends InputWindow> extends WritableFrameContainer<T> {
 
     /**
      * Creates a new MessageTarget.
@@ -39,14 +41,15 @@ public abstract class MessageTarget extends WritableFrameContainer {
      * @param icon The icon to use for this target
      * @param name The name of this target
      * @param title The title of this target
+     * @param windowClass The class of window to use to represent this container
      * @param config The config manager to use for this target
      * @param parser The command parser for this container
      * @since 0.6.4
      */
     public MessageTarget(final String icon, final String name,
-            final String title, final ConfigManager config,
-            final CommandParser parser) {
-        super(icon, name, title, config, parser);
+            final String title, final Class<T> windowClass,
+            final ConfigManager config, final CommandParser parser) {
+        super(icon, name, title, windowClass, config, parser);
     }
 
     /**

src/com/dmdirc/Query.java

@@ -40,7 +40,6 @@ import com.dmdirc.parser.interfaces.callbacks.QuitListener;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.QueryWindow;
 
 import java.awt.Toolkit;
@@ -52,15 +51,12 @@ import java.util.List;
  * corresponding QueryWindow, and handles user input for the query.
  * @author chris
  */
-public class Query extends MessageTarget implements PrivateActionListener,
+public class Query extends MessageTarget<QueryWindow> implements PrivateActionListener,
         PrivateMessageListener, NickChangeListener, QuitListener {
 
     /** The Server this Query is on. */
     private Server server;
 
-    /** The QueryWindow used for this Query. */
-    private QueryWindow window;
-
     /** The full host and nickname of the client associated with this Query. */
     private String host, nickname;
 
@@ -76,27 +72,23 @@ public class Query extends MessageTarget implements PrivateActionListener,
     public Query(final Server newServer, final String newHost) {
         super("query", newServer.getParser().parseHostmask(newHost)[0],
                 newServer.getParser().parseHostmask(newHost)[0],
-                newServer.getConfigManager(), new QueryCommandParser());
+                QueryWindow.class, newServer.getConfigManager(),
+                new QueryCommandParser());
 
         this.server = newServer;
         this.host = newHost;
         this.nickname = server.getParser().parseHostmask(host)[0];
 
-        window = Main.getUI().getQuery(this);
-        WindowManager.addWindow(server, this);
+        WindowManager.addWindow(server, this,
+                !getConfigManager().getOptionBool("general", "hidequeries"));
 
         ActionManager.processEvent(CoreActionType.QUERY_OPENED, null, this);
 
-        if (!server.getConfigManager().getOptionBool("general", "hidequeries")) {
-            window.open();
-        }
-
         tabCompleter = new TabCompleter(server.getTabCompleter());
         tabCompleter.addEntries(TabCompletionType.COMMAND,
                 CommandManager.getCommandNames(CommandType.TYPE_QUERY));
         tabCompleter.addEntries(TabCompletionType.COMMAND,
                 CommandManager.getCommandNames(CommandType.TYPE_CHAT));
-        window.getInputHandler().setTabCompleter(tabCompleter);
 
         if (!server.getState().isDisconnected()) {
             reregister();
@@ -105,24 +97,8 @@ public class Query extends MessageTarget implements PrivateActionListener,
         updateTitle();
     }
 
-    /**
-     * Shows this query's window.
-     */
-    public void show() {
-        window.open();
-    }
-
     /** {@inheritDoc} */
     @Override
-    public InputWindow getFrame() {
-        return window;
-    }
-
-    /**
-     * Returns the tab completer for this query.
-     *
-     * @return This query's tab completer
-     */
     public TabCompleter getTabCompleter() {
         return tabCompleter;
     }
@@ -319,7 +295,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
     @Override
     public void windowClosing() {
         // 1: Make the window non-visible
-        window.setVisible(false);
+        getFrame().setVisible(false);
 
         // 2: Remove any callbacks or listeners
         if (server != null && server.getParser() != null) {
@@ -344,7 +320,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
     @Override
     public void windowClosed() {
         // 7: Remove any references to the window and parents
-        window = null;
         server = null;
     }
 
@@ -369,12 +344,12 @@ public class Query extends MessageTarget implements PrivateActionListener,
     /** {@inheritDoc} */
     @Override
     public void activateFrame() {
-        if (window == null) {
+        if (getFrame() == null) {
             return;
         }
 
-        if (!window.isVisible()) {
-            show();
+        if (!getFrame().isVisible()) {
+            getFrame().setVisible(true);
         }
 
         super.activateFrame();

src/com/dmdirc/Raw.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc;
 
-import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.RawCommandParser;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -31,6 +30,7 @@ import com.dmdirc.parser.common.CallbackNotFoundException;
 import com.dmdirc.parser.interfaces.callbacks.DataInListener;
 import com.dmdirc.parser.interfaces.callbacks.DataOutListener;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
@@ -38,30 +38,24 @@ import com.dmdirc.ui.interfaces.InputWindow;
  * received to/from the server).
  * @author chris
  */
-public final class Raw extends WritableFrameContainer implements DataInListener,
-        DataOutListener {
+public final class Raw extends WritableFrameContainer<InputWindow>
+        implements DataInListener, DataOutListener {
 
     /** The server object that's being monitored. */
     private Server server;
 
-    /** An InputWindow used for displaying the raw data.*/
-    private InputWindow window;
-
     /**
      * Creates a new instance of Raw.
      *
      * @param newServer the server to monitor
      */
     public Raw(final Server newServer) {
-        super("raw", "Raw", "(Raw log)", newServer.getConfigManager(), new RawCommandParser());
+        super("raw", "Raw", "(Raw log)", InputWindow.class,
+                newServer.getConfigManager(), new RawCommandParser());
 
         this.server = newServer;
 
-        window = Main.getUI().getInputWindow(this);
         WindowManager.addWindow(server, this);
-        window.getInputHandler().setTabCompleter(server.getTabCompleter());
-
-        window.open();
     }
 
     /**
@@ -80,7 +74,7 @@ public final class Raw extends WritableFrameContainer implements DataInListener,
     @Override
     public void windowClosing() {
         // 1: Make the window non-visible
-        window.setVisible(false);
+        getFrame().setVisible(false);
 
         // 2: Remove any callbacks or listeners
         if (server.getParser() != null) {
@@ -101,16 +95,9 @@ public final class Raw extends WritableFrameContainer implements DataInListener,
     @Override
     public void windowClosed() {
         // 7: Remove any references to the window and parents
-        window = null;
         server = null;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public InputWindow getFrame() {
-        return window;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void onDataIn(final Parser tParser, final String sData) {
@@ -144,4 +131,10 @@ public final class Raw extends WritableFrameContainer implements DataInListener,
         return server.getMaxLineLength();
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public TabCompleter getTabCompleter() {
+        return server.getTabCompleter();
+    }
+
 }

src/com/dmdirc/Server.java

@@ -27,7 +27,6 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.wrappers.AliasWrapper;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.parsers.RawCommandParser;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
@@ -50,7 +49,6 @@ import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.ServerWindow;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.messages.Formatter;
@@ -77,7 +75,7 @@ import javax.net.ssl.TrustManager;
  *
  * @author chris
  */
-public class Server extends WritableFrameContainer implements ConfigChangeListener {
+public class Server extends WritableFrameContainer<ServerWindow> implements ConfigChangeListener {
 
     // <editor-fold defaultstate="collapsed" desc="Properties">
 
@@ -122,9 +120,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     /** The raw frame used for this server instance. */
     private Raw raw;
 
-    /** The ServerWindow corresponding to this server. */
-    private ServerWindow window;
-
     /** The address of the server we're connecting to. */
     private URI address;
 
@@ -143,7 +138,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     /** The tabcompleter used for this server. */
     private final TabCompleter tabCompleter = new TabCompleter();
     /** The last activated internal frame for this server. */
-    private FrameContainer activeFrame = this;
+    private FrameContainer<?> activeFrame = this;
 
     /** Our reason for being away, if any. */
     private String awayMessage;
@@ -176,14 +171,13 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
      */
     public Server(final URI uri, final Identity profile) {
         super("server-disconnected", uri.getHost(), uri.getHost(),
+                ServerWindow.class,
                 new ConfigManager(uri.getScheme(), "", "", uri.getHost()),
                 new ServerCommandParser());
 
         this.address = uri;
         this.profile = profile;
 
-        window = Main.getUI().getServer(this);
-
         ServerManager.getServerManager().registerServer(this);
         WindowManager.addWindow(this);
 
@@ -194,12 +188,8 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         tabCompleter.addEntries(TabCompletionType.COMMAND,
                 CommandManager.getCommandNames(CommandType.TYPE_GLOBAL));
 
-        window.getInputHandler().setTabCompleter(tabCompleter);
-
         updateIcon();
 
-        window.open();
-
         new Timer("Server Who Timer").schedule(new TimerTask() {
             @Override
             public void run() {
@@ -672,7 +662,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     @Override
     public boolean ownsFrame(final Window target) {
         // Check if it's our server frame
-        if (window != null && window.equals(target)) { return true; }
+        if (getFrame() != null && getFrame().equals(target)) { return true; }
         // Check if it's the raw frame
         if (raw != null && raw.ownsFrame(target)) { return true; }
         // Check if it's a channel frame
@@ -691,7 +681,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
      *
      * @param source The frame that was activated
      */
-    public void setActiveFrame(final FrameContainer source) {
+    public void setActiveFrame(final FrameContainer<?> source) {
         activeFrame = source;
     }
 
@@ -1094,19 +1084,10 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         return awayMessage;
     }
 
-    /**
-     * Returns the tab completer for this connection.
-     *
-     * @return The tab completer for this server
-     */
-    public TabCompleter getTabCompleter() {
-        return tabCompleter;
-    }
-
     /** {@inheritDoc} */
     @Override
-    public InputWindow getFrame() {
-        return window;
+    public TabCompleter getTabCompleter() {
+        return tabCompleter;
     }
 
     /**
@@ -1135,7 +1116,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     public void windowClosing() {
         synchronized (myStateLock) {
             // 1: Make the window non-visible
-            window.setVisible(false);
+            getFrame().setVisible(false);
 
             // 2: Remove any callbacks or listeners
             eventHandler.unregisterCallbacks();
@@ -1166,7 +1147,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     @Override
     public void windowClosed() {
         // 7: Remove any references to the window and parents
-        window = null; //NOPMD
         oldParser = null; //NOPMD
         parser = null; //NOPMD
     }

src/com/dmdirc/ServerEventHandler.java

@@ -72,7 +72,7 @@ public final class ServerEventHandler extends EventHandler implements
     @Override
     @SuppressWarnings("unchecked")
     protected <T extends CallbackInterface> void addCallback(
-            final CallbackManager cbm, final Class<T> type) throws CallbackNotFoundException {
+            final CallbackManager<?> cbm, final Class<T> type) throws CallbackNotFoundException {
         cbm.addCallback(type, (T) this);
     }
 

src/com/dmdirc/WritableFrameContainer.java

@@ -29,8 +29,8 @@ import com.dmdirc.config.ConfigManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.interfaces.Window;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,9 +40,10 @@ import java.util.List;
  * class that allow the sending of lines back to whatever the container's
  * data source is (e.g. an IRC channel or server).
  *
+ * @param <T> The type of window which should be used for this frame container.
  * @author chris
  */
-public abstract class WritableFrameContainer extends FrameContainer {
+public abstract class WritableFrameContainer<T extends InputWindow> extends FrameContainer<T> {
     
     /** The name of the server notification target. */
     protected static final String NOTIFICATION_SERVER = "server".intern();
@@ -59,13 +60,15 @@ public abstract class WritableFrameContainer extends FrameContainer {
      * @param icon The icon to use for this container
      * @param name The name of this container
      * @param title The title of this container
+     * @param windowClass The class of window to use to represent this container
      * @param config The config manager for this container
      * @param parser The command parser for this container
      * @since 0.6.4
      */
     public WritableFrameContainer(final String icon, final String name,
-            final String title, final ConfigManager config, final CommandParser parser) {
-        super(icon, name, title, config);
+            final String title, final Class<T> windowClass,
+            final ConfigManager config, final CommandParser parser) {
+        super(icon, name, title, windowClass, config);
 
         this.commandParser = parser;
         parser.setOwner(this);
@@ -86,14 +89,13 @@ public abstract class WritableFrameContainer extends FrameContainer {
     public CommandParser getCommandParser() {
         return commandParser;
     }
-    
+
     /**
-     * Returns the internal frame associated with this object.
+     * Retrieves the tab completer which should be used for this cotnainer.
      *
-     * @return The internal frame associated with this object
+     * @return This container's tab completer
      */
-    @Override
-    public abstract InputWindow getFrame();
+    public abstract TabCompleter getTabCompleter();
     
     /**
      * Returns the maximum length that a line passed to sendLine() should be,
@@ -273,7 +275,7 @@ public abstract class WritableFrameContainer extends FrameContainer {
         } else if (target.startsWith("window:")) {
             final String windowName = target.substring(7);
 
-            FrameContainer targetWindow = WindowManager.findCustomWindow(getServer(), windowName);
+            FrameContainer<?> targetWindow = WindowManager.findCustomWindow(getServer(), windowName);
 
             if (targetWindow == null) {
                 targetWindow = new CustomWindow(windowName, windowName, getServer());
@@ -289,25 +291,24 @@ public abstract class WritableFrameContainer extends FrameContainer {
 
             final String command = String.format(target.substring(12), escapedargs);
 
-            WritableFrameContainer best = this;
+            WritableFrameContainer<?> best = this;
             long besttime = 0;
 
-            final List<FrameContainer> containers = new ArrayList<FrameContainer>();
+            final List<FrameContainer<?>> containers = new ArrayList<FrameContainer<?>>();
             
             containers.add(getServer());
             containers.addAll(getServer().getChildren());
 
-            for (FrameContainer container : containers) {
-                final Window window = container.getFrame();
-
-                if (window == null || !(window instanceof InputWindow)) {
+            for (FrameContainer<?> container : containers) {
+                if (container == null || !(container instanceof WritableFrameContainer<?>)) {
                     continue;
                 }
 
-                final long time = ((InputWindow) window).getCommandParser().getCommandTime(command);
+                final long time = ((WritableFrameContainer<?>) container)
+                        .getCommandParser().getCommandTime(command);
                 if (time > besttime) {
                     besttime = time;
-                    best = (WritableFrameContainer) container;
+                    best = (WritableFrameContainer<?>) container;
                 }
             }
 

src/com/dmdirc/actions/ActionComponentChain.java

@@ -49,8 +49,8 @@ public class ActionComponentChain implements ActionComponent {
      * @param source The class that this chain needs to start with
      * @param chain The textual representation of the chain
      */
-    public ActionComponentChain(final Class source, final String chain) {
-        Class current = source;
+    public ActionComponentChain(final Class<?> source, final String chain) {
+        Class<?> current = source;
         
         for (String componentName : chain.split("\\.")) {
             final ActionComponent component = ActionManager.getActionComponent(componentName);
@@ -88,7 +88,7 @@ public class ActionComponentChain implements ActionComponent {
     /** {@inheritDoc} */
     @Precondition("This component chain has one or more components")
     @Override
-    public Class appliesTo() {
+    public Class<?> appliesTo() {
         Logger.assertTrue(!components.isEmpty());
         
         return components.get(0).appliesTo();
@@ -97,7 +97,7 @@ public class ActionComponentChain implements ActionComponent {
     /** {@inheritDoc} */
     @Precondition("This component chain has one or more components")
     @Override
-    public Class getType() {
+    public Class<?> getType() {
         Logger.assertTrue(!components.isEmpty());
         
         return components.get(components.size() - 1).getType();

src/com/dmdirc/actions/ActionManager.java

@@ -564,7 +564,7 @@ public final class ActionManager {
         }
 
         for (ActionType target : actionTypes) {
-            if (((Enum) target).name().equals(type)) {
+            if (((Enum<?>) target).name().equals(type)) {
                 return target;
             }
         }
@@ -601,7 +601,7 @@ public final class ActionManager {
      * @return A list of compatible action components
      */
     @Precondition("The specified target is not null")
-    public static List<ActionComponent> getCompatibleComponents(final Class target) {
+    public static List<ActionComponent> getCompatibleComponents(final Class<?> target) {
         Logger.assertTrue(target != null);
 
         final List<ActionComponent> res = new ArrayList<ActionComponent>();
@@ -622,7 +622,7 @@ public final class ActionManager {
      * @return A list of compatible action comparisons
      */
     @Precondition("The specified target is not null")
-    public static List<ActionComparison> getCompatibleComparisons(final Class target) {
+    public static List<ActionComparison> getCompatibleComparisons(final Class<?> target) {
         Logger.assertTrue(target != null);
 
         final List<ActionComparison> res = new ArrayList<ActionComparison>();
@@ -666,7 +666,7 @@ public final class ActionManager {
         Logger.assertTrue(!type.isEmpty());
 
         for (ActionComponent target : actionComponents) {
-            if (((Enum) target).name().equals(type)) {
+            if (((Enum<?>) target).name().equals(type)) {
                 return target;
             }
         }
@@ -687,7 +687,7 @@ public final class ActionManager {
         Logger.assertTrue(!type.isEmpty());
 
         for (ActionComparison target : actionComparisons) {
-            if (((Enum) target).name().equals(type)) {
+            if (((Enum<?>) target).name().equals(type)) {
                 return target;
             }
         }

src/com/dmdirc/actions/ActionModel.java

@@ -131,14 +131,14 @@ public class ActionModel {
             return true;
         }
 
-        final FrameContainer active = WindowManager.getActiveWindow();
-        WritableFrameContainer cw = null;
+        final FrameContainer<?> active = WindowManager.getActiveWindow();
+        WritableFrameContainer<?> cw = null;
         CommandParser cp = null;
 
-        if (arguments.length > 0 && arguments[0] instanceof WritableFrameContainer) {
-            cw = (WritableFrameContainer) arguments[0];
-        } else if (active instanceof WritableFrameContainer) {
-            cw = (WritableFrameContainer) active;
+        if (arguments.length > 0 && arguments[0] instanceof WritableFrameContainer<?>) {
+            cw = (WritableFrameContainer<?>) arguments[0];
+        } else if (active instanceof WritableFrameContainer<?>) {
+            cw = (WritableFrameContainer<?>) active;
         } else if (ServerManager.getServerManager().numServers() > 0) {
             cw = ServerManager.getServerManager().getServers().get(0);
         }
@@ -146,7 +146,7 @@ public class ActionModel {
         if (cw == null) {
             cp = GlobalCommandParser.getGlobalCommandParser();
         } else {
-            cp = cw.getFrame().getCommandParser();
+            cp = cw.getCommandParser();
         }
 
         for (String command : response) {

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -103,7 +103,7 @@ public class ActionSubstitutor {
         final Map<String, String> res = new HashMap<String, String>();
         
         int i = 0;
-        for (Class myClass : type.getType().getArgTypes()) {
+        for (Class<?> myClass : type.getType().getArgTypes()) {
             for (ActionComponent comp : ActionManager.getCompatibleComponents(myClass)) {
                 final String key = "{" + i + "." + comp.toString() + "}";
                 final String desc = type.getType().getArgNames()[i] + "'s " + comp.getName();
@@ -146,7 +146,7 @@ public class ActionSubstitutor {
      * @return True if this action type's first arg extends or is a FrameContainer
      */
     private boolean hasFrameContainer() {
-        Class target = null;
+        Class<?> target = null;
         
         if (type.getType().getArgTypes().length > 0) {
             target = type.getType().getArgTypes()[0];
@@ -260,7 +260,7 @@ public class ActionSubstitutor {
         }
 
         if (hasFrameContainer() && serverMatcher.matches()) {
-            final Server server = ((FrameContainer) args[0]).getServer();
+            final Server server = ((FrameContainer<?>) args[0]).getServer();
 
             if (server != null) {
                 try {
@@ -291,8 +291,8 @@ public class ActionSubstitutor {
      */
     protected String checkConnection(final ActionComponentChain chain,
             final Object[] args, final Object argument) {
-        if ((chain.requiresConnection() && args[0] instanceof FrameContainer
-                    && ((FrameContainer) args[0]).getServer().getState()
+        if ((chain.requiresConnection() && args[0] instanceof FrameContainer<?>
+                    && ((FrameContainer<?>) args[0]).getServer().getState()
                     == ServerState.CONNECTED) || !chain.requiresConnection()) {
             return chain.get(argument).toString();
         }
@@ -312,10 +312,10 @@ public class ActionSubstitutor {
      */
     protected ConfigManager getConfigManager(final Object ... args) {
         for (Object arg : args) {
-            if (arg instanceof FrameContainer) {
-                return ((FrameContainer) arg).getConfigManager();
+            if (arg instanceof FrameContainer<?>) {
+                return ((FrameContainer<?>) arg).getConfigManager();
             } else if (arg instanceof Window) {
-                return ((Window) arg).getConfigManager();
+                return ((Window) arg).getContainer().getConfigManager();
             }
         }
 

src/com/dmdirc/actions/interfaces/ActionComparison.java

@@ -43,7 +43,7 @@ public interface ActionComparison {
      * Returns the class that this comparison deals with.
      * @return The Class that this comparison can compare
      */
-    Class appliesTo();
+    Class<?> appliesTo();
     
     /**
      * Returns a friendly name for this comparison.

src/com/dmdirc/actions/interfaces/ActionComponent.java

@@ -64,13 +64,13 @@ public interface ActionComponent {
      * Retrieves the type of class that this component applies to.
      * @return The Class that this component can be applied to
      */
-    Class appliesTo();
+    Class<?> appliesTo();
     
     /**
      * Retrieves the type of this component.
      * @return The Class of this component.
      */
-    Class getType();
+    Class<?> getType();
     
     /**
      * Retrives a friendly name for this component.

src/com/dmdirc/commandparser/commands/ChannelCommand.java

@@ -46,7 +46,7 @@ public abstract class ChannelCommand extends Command implements CommandInfo {
      * @param args Arguments passed to this command
      * @since 0.6.3m1
      */
-    public abstract void execute(FrameContainer origin, Server server, Channel channel,
+    public abstract void execute(FrameContainer<?> origin, Server server, Channel channel,
             boolean isSilent, CommandArguments args);
 
     /** {@inheritDoc} */

src/com/dmdirc/commandparser/commands/ChatCommand.java

@@ -47,7 +47,7 @@ public abstract class ChatCommand extends Command implements CommandInfo {
      * @param args Arguments passed to this command
      * @since 0.6.3m1
      */
-    public abstract void execute(FrameContainer origin, Server server, MessageTarget target,
+    public abstract void execute(FrameContainer<?> origin, Server server, MessageTarget<?> target,
             boolean isSilent, CommandArguments args);
 
     /** {@inheritDoc} */

src/com/dmdirc/commandparser/commands/Command.java

@@ -46,7 +46,7 @@ public abstract class Command {
      * @param type The type of message to send
      * @param args The arguments of the message
      */
-    protected final void sendLine(final FrameContainer target,
+    protected final void sendLine(final FrameContainer<?> target,
             final boolean isSilent, final String type, final Object ... args) {
         if (!isSilent && target != null) {
             target.addLine(type, args);
@@ -61,7 +61,7 @@ public abstract class Command {
      * @param name The name of the command that's raising the error
      * @param args The arguments that the command accepts or expects
      */
-    protected final void showUsage(final FrameContainer target,
+    protected final void showUsage(final FrameContainer<?> target,
             final boolean isSilent, final String name, final String args) {
         sendLine(target, isSilent, "commandUsage", CommandManager.getCommandChar(),
                 name, args);

src/com/dmdirc/commandparser/commands/ExternalCommand.java

@@ -43,7 +43,7 @@ public interface ExternalCommand {
      * @param args Arguments passed to this command
      * @since 0.6.3m1
      */
-    void execute(FrameContainer origin, Server server, String channel,
+    void execute(FrameContainer<?> origin, Server server, String channel,
             boolean isSilent, CommandArguments args);
 
 }

src/com/dmdirc/commandparser/commands/GlobalCommand.java

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Represents a generic global command. Global commands are associated with
@@ -45,7 +44,7 @@ public abstract class GlobalCommand extends Command implements CommandInfo {
      * @param args Arguments passed to this command
      * @since 0.6.3m1
      */
-    public abstract void execute(FrameContainer origin, boolean isSilent, CommandArguments args);
+    public abstract void execute(FrameContainer<?> origin, boolean isSilent, CommandArguments args);
 
     /** {@inheritDoc} */
     @Override

src/com/dmdirc/commandparser/commands/QueryCommand.java

@@ -46,7 +46,7 @@ public abstract class QueryCommand extends Command implements CommandInfo {
      * @param args Arguments passed to this command
      * @since 0.6.3m1
      */
-    public abstract void execute(FrameContainer origin, Server server, Query query,
+    public abstract void execute(FrameContainer<?> origin, Server server, Query query,
             boolean isSilent, CommandArguments args);
 
     /** {@inheritDoc} */

src/com/dmdirc/commandparser/commands/ServerCommand.java

@@ -45,7 +45,7 @@ public abstract class ServerCommand extends Command implements CommandInfo {
      * @param args Arguments passed to this command
      * @since 0.6.3m1
      */
-    public abstract void execute(FrameContainer origin, Server server,
+    public abstract void execute(FrameContainer<?> origin, Server server,
             boolean isSilent, CommandArguments args);
 
     /** {@inheritDoc} */

src/com/dmdirc/commandparser/commands/channel/Ban.java

@@ -49,7 +49,7 @@ public final class Ban extends ChannelCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "ban", "<user|host>");

src/com/dmdirc/commandparser/commands/channel/ChannelSettings.java

@@ -49,7 +49,7 @@ public final class ChannelSettings extends ChannelCommand implements Intelligent
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         Main.getUI().showChannelSettingsDialog(channel);
     }

src/com/dmdirc/commandparser/commands/channel/Cycle.java

@@ -47,7 +47,7 @@ public final class Cycle extends ChannelCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "cyclemessage"));

src/com/dmdirc/commandparser/commands/channel/KickReason.java

@@ -51,7 +51,7 @@ public final class KickReason extends ChannelCommand implements IntelligentComma
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "kick", "<user> [reason]");

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -52,7 +52,7 @@ public final class Mode extends ChannelCommand implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         final ChannelInfo cChannel = channel.getChannelInfo();
 
@@ -65,7 +65,7 @@ public final class Mode extends ChannelCommand implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final String channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             server.getParser().sendRawMessage("MODE " + channel);

src/com/dmdirc/commandparser/commands/channel/Names.java

@@ -52,7 +52,7 @@ public class Names extends ChannelCommand implements IntelligentCommand, Externa
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         server.getParser().sendRawMessage("NAMES " + channel.getChannelInfo().getName());
     }
@@ -60,7 +60,7 @@ public class Names extends ChannelCommand implements IntelligentCommand, Externa
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final String channel, final boolean isSilent, final CommandArguments args) {
         server.getParser().sendRawMessage("NAMES " + channel);
     }    

src/com/dmdirc/commandparser/commands/channel/Part.java

@@ -46,7 +46,7 @@ public final class Part extends ChannelCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "partmessage"));

src/com/dmdirc/commandparser/commands/channel/SetNickColour.java

@@ -53,7 +53,7 @@ public final class SetNickColour extends ChannelCommand implements IntelligentCo
     
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked") @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         
         int offset = 0;

src/com/dmdirc/commandparser/commands/channel/ShowTopic.java

@@ -48,7 +48,7 @@ public final class ShowTopic extends ChannelCommand implements ExternalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final Channel channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             final ChannelInfo cChannel = channel.getChannelInfo();
@@ -69,7 +69,7 @@ public final class ShowTopic extends ChannelCommand implements ExternalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer<?> origin, final Server server,
             final String channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             server.getParser().sendRawMessage("TOPIC " + channel);

src/com/dmdirc/commandparser/commands/chat/Me.java

@@ -47,8 +47,8 @@ public final class Me extends ChatCommand implements ValidatingCommand {
     
     /** {@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) {
             showUsage(origin, isSilent, "me", "<action>");
         } else {

src/com/dmdirc/commandparser/commands/global/Active.java

@@ -49,15 +49,15 @@ public final class Active 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 command = args.getArgumentsAsString();
         
-        final FrameContainer window = WindowManager.getActiveWindow();
+        final FrameContainer<?> window = WindowManager.getActiveWindow();
         
-        if (window != null && window instanceof WritableFrameContainer) {
-            ((WritableFrameContainer) window).getFrame()
-                    .getCommandParser().parseCommand(window, command);
+        if (window != null && window instanceof WritableFrameContainer<?>) {
+            ((WritableFrameContainer<?>) window).getCommandParser()
+                    .parseCommand(window, command);
         }
     }
     

src/com/dmdirc/commandparser/commands/global/AliasCommand.java

@@ -53,7 +53,7 @@ public final class AliasCommand extends GlobalCommand implements
 
     /** {@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 < 2) {
             showUsage(origin, isSilent, "alias", "[--remove] <name> [command]");

src/com/dmdirc/commandparser/commands/global/Debug.java

@@ -64,7 +64,7 @@ public class Debug 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) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "debug", "<debug command> [options]");
@@ -142,7 +142,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doShowRaw(final FrameContainer origin, final boolean isSilent) {
+    private void doShowRaw(final FrameContainer<?> origin, final boolean isSilent) {
         if (origin == null || origin.getServer() == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Cannot show raw window here.");
         } else {
@@ -157,7 +157,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param args Arguments array for the command
      */
-    private void doConfigStats(final FrameContainer origin, final boolean isSilent,
+    private void doConfigStats(final FrameContainer<?> origin, final boolean isSilent,
             final String[] args) {
         int arg = -1;
         if (args.length == 2) {
@@ -191,7 +191,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param regex Regex to match options against
      */
-    private void doConfigStatsOption(final FrameContainer origin,
+    private void doConfigStatsOption(final FrameContainer<?> origin,
             final boolean isSilent, final String regex) {
         final SortedSet<Entry<String, Integer>> sortedStats = getSortedStats();
         boolean found = false;
@@ -215,7 +215,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param top Top number of entries to show
      */
-    private void doConfigStatsTop(final FrameContainer origin,
+    private void doConfigStatsTop(final FrameContainer<?> origin,
             final boolean isSilent, final int top) {
         final SortedSet<Entry<String, Integer>> sortedStats = getSortedStats();
         int i = 0;
@@ -237,7 +237,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param cutoff Cut off value for stats
      */
-    private void doConfigStatsCutOff(final FrameContainer origin,
+    private void doConfigStatsCutOff(final FrameContainer<?> origin,
             final boolean isSilent, final int cutoff) {
         final SortedSet<Entry<String, Integer>> sortedStats = getSortedStats();
         for (Map.Entry<String, Integer> entry : sortedStats) {
@@ -268,7 +268,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doMemInfo(final FrameContainer origin, final boolean isSilent) {
+    private void doMemInfo(final FrameContainer<?> origin, final boolean isSilent) {
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Total Memory: "
                 + Runtime.getRuntime().totalMemory());
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Free Memory: "
@@ -283,7 +283,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doColourSpam(final FrameContainer origin, final boolean isSilent) {
+    private void doColourSpam(final FrameContainer<?> origin, final boolean isSilent) {
         for (int i = 0; i < 100; i++) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, ((char) 3) + "5Colour! "
                     + ((char) 3) + "6Colour! " + ((char) 3) + "7Colour! "
@@ -299,7 +299,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doGarbage(final FrameContainer origin, final boolean isSilent) {
+    private void doGarbage(final FrameContainer<?> origin, final boolean isSilent) {
         System.gc();
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Invoked garbage collector.");
     }
@@ -310,7 +310,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doConfigInfo(final FrameContainer origin, final boolean isSilent) {
+    private void doConfigInfo(final FrameContainer<?> origin, final boolean isSilent) {
         for (Identity source : origin.getConfigManager().getSources()) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, source.getTarget() + " - "
                     + source + "(" + source.getTarget().getOrder() + ")");
@@ -323,7 +323,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doGlobalConfigInfo(final FrameContainer origin, final boolean isSilent) {
+    private void doGlobalConfigInfo(final FrameContainer<?> origin, final boolean isSilent) {
         for (Identity source : IdentityManager.getGlobalConfig().getSources()) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, source.getTarget() + " - "
                     + source + "(" + source.getTarget().getOrder() + ")");
@@ -336,7 +336,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doForceUpdate(final FrameContainer origin, final boolean isSilent) {
+    private void doForceUpdate(final FrameContainer<?> origin, final boolean isSilent) {
         if (IdentityManager.getGlobalConfig().getOptionBool("updater", "enable")) {
             new Thread(new UpdateChecker(), "Forced update checker").start();
         } else {
@@ -353,7 +353,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doThreads(final FrameContainer origin, final boolean isSilent) {
+    private void doThreads(final FrameContainer<?> origin, final boolean isSilent) {
         for (Entry<Thread, StackTraceElement[]> thread: Thread.getAllStackTraces().entrySet()) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, Styliser.CODE_BOLD
                     + thread.getKey().getName());
@@ -371,7 +371,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doServerState(final FrameContainer origin, final boolean isSilent) {
+    private void doServerState(final FrameContainer<?> origin, final boolean isSilent) {
         if (origin.getServer() == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "This window isn't connected to a server");
         } else {
@@ -386,7 +386,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param origin The window this command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void doServerInfo(final FrameContainer origin, final boolean isSilent) {
+    private void doServerInfo(final FrameContainer<?> origin, final boolean isSilent) {
         if (origin.getServer() == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "This window isn't connected to a server");
         } else {
@@ -411,7 +411,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * 
      * @param origin The window this command was executed in
      */
-    private void doBenchmark(final FrameContainer origin) {
+    private void doBenchmark(final FrameContainer<?> origin) {
         long[] results = new long[10];
         
         for (int i = 0; i < results.length; i++) {
@@ -439,7 +439,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param args The arguments that were passed to the command
      */
-    private void doServices(final FrameContainer origin, final boolean isSilent,
+    private void doServices(final FrameContainer<?> origin, final boolean isSilent,
             final String[] args) {
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Available Services:");
         for (Service service : PluginManager.getPluginManager().getAllServices()) {

src/com/dmdirc/commandparser/commands/global/Echo.java

@@ -115,7 +115,7 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
             targets.add("--target");
         } else if (arg == 1 && context.getPreviousArgs().get(0).equals("--target")) {
 
-            final List<FrameContainer> windowList = new ArrayList<FrameContainer>();
+            final List<FrameContainer<?>> windowList = new ArrayList<FrameContainer<?>>();
             final Server currentServer = context.getWindow().getContainer()
                     .getServer();
 
@@ -128,8 +128,8 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
             }
 
             //Global Windows
-            windowList.addAll(Arrays.asList(WindowManager.getRootWindows()));
-            for (FrameContainer customWindow : windowList) {
+            windowList.addAll(WindowManager.getRootWindows());
+            for (FrameContainer<?> customWindow : windowList) {
                 if (customWindow instanceof CustomWindow) {
                     targets.add(customWindow.getName());
                 }

src/com/dmdirc/commandparser/commands/global/Exit.java

@@ -47,7 +47,7 @@ public final class Exit 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) {
         Main.quit(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "closemessage"));

src/com/dmdirc/commandparser/commands/global/Help.java

@@ -58,7 +58,7 @@ public final class Help 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) {
         if (args.getArguments().length == 0) {
             showAllCommands(origin, isSilent);
@@ -73,9 +73,9 @@ public final class Help extends GlobalCommand implements IntelligentCommand {
      * @param origin The window the command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
-    private void showAllCommands(final FrameContainer origin, final boolean isSilent) {
-        final List<String> commands = new ArrayList<String>(((WritableFrameContainer) origin)
-                .getFrame().getCommandParser().getCommands().keySet());
+    private void showAllCommands(final FrameContainer<?> origin, final boolean isSilent) {
+        final List<String> commands = new ArrayList<String>(((WritableFrameContainer<?>) origin)
+                .getCommandParser().getCommands().keySet());
 
         Collections.sort(commands);
         
@@ -110,7 +110,7 @@ public final class Help extends GlobalCommand implements IntelligentCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param name The name of the command to display info for
      */
-    private void showCommand(final FrameContainer origin, final boolean isSilent,
+    private void showCommand(final FrameContainer<?> origin, final boolean isSilent,
             final String name) {
         Map.Entry<CommandInfo, Command> command = null;
 

src/com/dmdirc/commandparser/commands/global/Ifplugin.java

@@ -53,7 +53,7 @@ public final class Ifplugin 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) {
         if (args.getArguments().length <= 1) {
             showUsage(origin, isSilent, "ifplugin", "<[!]plugin> <command>");
@@ -77,7 +77,7 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
                 GlobalCommandParser.getGlobalCommandParser().parseCommand(null,
                         args.getArgumentsAsString(1));
             } else {
-                ((WritableFrameContainer) origin).getFrame().getCommandParser()
+                ((WritableFrameContainer<?>) origin).getCommandParser()
                         .parseCommand(origin, args.getArgumentsAsString(1));
             }
         }

src/com/dmdirc/commandparser/commands/global/Input.java

@@ -50,7 +50,7 @@ public class Input 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) {
 
         if (args.getArguments().length == 0) {
@@ -59,10 +59,10 @@ public class Input extends GlobalCommand implements IntelligentCommand {
             return;
         } else if (args.getArguments().length == 1
                 && "--clear".equals(args.getArgumentsAsString(0))) {
-            ((WritableFrameContainer) origin).getFrame()
+            ((WritableFrameContainer<?>) origin).getFrame()
                     .getInputHandler().clearInputField();
         } else {
-            ((WritableFrameContainer) origin).getFrame()
+            ((WritableFrameContainer<?>) origin).getFrame()
                     .getInputHandler().addToInputField(args.getArgumentsAsString());
         }
     }

src/com/dmdirc/commandparser/commands/global/Notify.java

@@ -51,7 +51,7 @@ public final class Notify 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) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "notify", "<colour>");

src/com/dmdirc/commandparser/commands/global/ReloadActions.java

@@ -48,7 +48,7 @@ public final class ReloadActions extends GlobalCommand implements IntelligentCom
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final boolean isSilent,
+    public void execute(final FrameContainer<?> origin, final boolean isSilent,
             final CommandArguments args) {
         ActionManager.loadActions();
         sendLine(origin, isSilent, FORMAT_OUTPUT, "Actions reloaded.");

src/com/dmdirc/commandparser/commands/global/ReloadIdentities.java

@@ -46,7 +46,7 @@ public class ReloadIdentities 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) {
         IdentityManager.loadUser();
         

src/com/dmdirc/commandparser/commands/global/SaveConfig.java

@@ -48,7 +48,7 @@ public final class SaveConfig 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) {
         IdentityManager.save();
         

src/com/dmdirc/commandparser/commands/global/UnloadPlugin.java

@@ -49,7 +49,7 @@ public final class UnloadPlugin 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 == 0) {
             showUsage(origin, isSilent, "unloadplugin", "<plugin>");

src/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -52,7 +52,7 @@ public final class OpenQuery extends ServerCommand implements
     
     /** {@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 == 0) {
             showUsage(origin, isSilent, "query", "<target> <message>");
@@ -72,7 +72,7 @@ public final class OpenQuery extends ServerCommand implements
         if (server.hasQuery(args.getArguments()[0])) {
             server.getQuery(args.getArguments()[0]).activateFrame();
         } else {
-            server.getQuery(args.getArguments()[0]).show();
+            server.getQuery(args.getArguments()[0]).activateFrame();
         }
 
         if (args.getArguments().length > 1) {

src/com/dmdirc/commandparser/parsers/ChannelCommandParser.java

@@ -61,8 +61,10 @@ public final class ChannelCommandParser extends CommandParser {
 
     /** {@inheritDoc} */
     @Override
-    public void setOwner(final FrameContainer owner) {
-        channel = (Channel) owner;
+    public void setOwner(final FrameContainer<?> owner) {
+        if (channel == null) {
+            channel = (Channel) owner;
+        }
     }
     
     /** {@inheritDoc} */
@@ -74,7 +76,7 @@ public final class ChannelCommandParser extends CommandParser {
     
     /** {@inheritDoc} */
     @Override
-    protected void executeCommand(final FrameContainer origin,
+    protected void executeCommand(final FrameContainer<?> origin,
             final boolean isSilent, final Command command, final CommandArguments args) {
         if (command instanceof ChannelCommand) {
             ((ChannelCommand) command).execute(origin, channel.getServer(), channel, isSilent, args);
@@ -95,7 +97,7 @@ public final class ChannelCommandParser extends CommandParser {
      * @param line The line input by the user
      */
     @Override
-    protected void handleNonCommand(final FrameContainer origin, final String line) {
+    protected void handleNonCommand(final FrameContainer<?> origin, final String line) {
         channel.sendLine(line);
     }
     

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -83,7 +83,7 @@ public abstract class CommandParser implements Serializable {
      * @param owner The container which owns this parser
      * @since 0.6.4
      */
-    public abstract void setOwner(final FrameContainer owner);
+    public abstract void setOwner(final FrameContainer<?> owner);
 
     /** Loads the relevant commands into the parser. */
     protected abstract void loadCommands();
@@ -127,7 +127,7 @@ public abstract class CommandParser implements Serializable {
      * @param parseChannel Whether or not to try and parse the first argument
      * as a channel name
      */
-    public final void parseCommand(final FrameContainer origin,
+    public final void parseCommand(final FrameContainer<?> origin,
             final String line, final boolean parseChannel) {
         final CommandArguments args = new CommandArguments(line);
 
@@ -161,7 +161,7 @@ public abstract class CommandParser implements Serializable {
      * @param parseChannel Whether or not to try parsing channel names
      * @return True iff the command was handled, false otherwise
      */
-    protected boolean handleChannelCommand(final FrameContainer origin,
+    protected boolean handleChannelCommand(final FrameContainer<?> origin,
             final CommandArguments args, final boolean parseChannel) {
         final boolean silent = args.isSilent();
         final String command = args.getCommandName();
@@ -188,7 +188,7 @@ public abstract class CommandParser implements Serializable {
                 }
 
                 if (server.hasChannel(channel)) {
-                    server.getChannel(channel).getFrame().getCommandParser()
+                    server.getChannel(channel).getCommandParser()
                             .parseCommand(origin, CommandManager.getCommandChar()
                             + args.getCommandName() + " " + args.getWordsAsString(2), false);
                 } else {
@@ -250,7 +250,7 @@ public abstract class CommandParser implements Serializable {
      * @param origin The window in which the command was typed
      * @param line The line to be parsed
      */
-    public final void parseCommand(final FrameContainer origin,
+    public final void parseCommand(final FrameContainer<?> origin,
             final String line) {
         parseCommand(origin, line, true);
     }
@@ -261,7 +261,7 @@ public abstract class CommandParser implements Serializable {
      * @param origin The window in which the command was typed
      * @param line The line to be parsed
      */
-    public final void parseCommandCtrl(final FrameContainer origin, final String line) {
+    public final void parseCommandCtrl(final FrameContainer<?> origin, final String line) {
         handleNonCommand(origin, line);
     }
 
@@ -274,7 +274,7 @@ public abstract class CommandParser implements Serializable {
      * @param args The arguments to the command
      * @since 0.6.3m1
      */
-    protected abstract void executeCommand(final FrameContainer origin,
+    protected abstract void executeCommand(final FrameContainer<?> origin,
             final boolean isSilent, final Command command, final CommandArguments args);
 
     /**
@@ -286,7 +286,7 @@ public abstract class CommandParser implements Serializable {
      * @param args The arguments passed to the command
      * @since 0.6.3m1
      */
-    protected void handleInvalidCommand(final FrameContainer origin,
+    protected void handleInvalidCommand(final FrameContainer<?> origin,
             final CommandArguments args) {
         if (origin == null) {
             ActionManager.processEvent(CoreActionType.UNKNOWN_COMMAND, null,
@@ -308,7 +308,7 @@ public abstract class CommandParser implements Serializable {
      * @param origin The window in which the command was typed
      * @param line The line input by the user
      */
-    protected abstract void handleNonCommand(final FrameContainer origin,
+    protected abstract void handleNonCommand(final FrameContainer<?> origin,
             final String line);
 
     /**

src/com/dmdirc/commandparser/parsers/GlobalCommandParser.java

@@ -58,7 +58,7 @@ public final class GlobalCommandParser extends CommandParser {
 
     /** {@inheritDoc} */
     @Override
-    public void setOwner(final FrameContainer owner) {
+    public void setOwner(final FrameContainer<?> owner) {
         // Don't care
     }
     
@@ -82,7 +82,7 @@ public final class GlobalCommandParser extends CommandParser {
     
     /** {@inheritDoc} */
     @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);
     }
@@ -94,7 +94,7 @@ public final class GlobalCommandParser extends CommandParser {
      * @param line The line input by the user
      */
     @Override
-    protected void handleNonCommand(final FrameContainer origin, final String line) {
+    protected void handleNonCommand(final FrameContainer<?> origin, final String line) {
         if (origin == null) {
             Logger.userError(ErrorLevel.MEDIUM, "Invalid global command: " + line);
         } else {

src/com/dmdirc/commandparser/parsers/QueryCommandParser.java

@@ -61,8 +61,10 @@ public final class QueryCommandParser extends CommandParser {
 
     /** {@inheritDoc} */
     @Override
-    public void setOwner(final FrameContainer owner) {
-        query = (Query) owner;
+    public void setOwner(final FrameContainer<?> owner) {
+        if (query == null) {
+            query = (Query) owner;
+        }
     }
     
     /** Loads the relevant commands into the parser. */
@@ -74,7 +76,7 @@ public final class QueryCommandParser extends CommandParser {
     
     /** {@inheritDoc} */
     @Override
-    protected void executeCommand(final FrameContainer origin,
+    protected void executeCommand(final FrameContainer<?> origin,
             final boolean isSilent, final Command command, final CommandArguments args) {
         if (command instanceof QueryCommand) {
             ((QueryCommand) command).execute(origin, query.getServer(), query, isSilent, args);
@@ -94,7 +96,7 @@ public final class QueryCommandParser extends CommandParser {
      * @param line The line input by the user
      */
     @Override
-    protected void handleNonCommand(final FrameContainer origin, final String line) {
+    protected void handleNonCommand(final FrameContainer<?> origin, final String line) {
         query.sendLine(line);
     }
     

src/com/dmdirc/commandparser/parsers/RawCommandParser.java

@@ -38,8 +38,8 @@ public class RawCommandParser extends ServerCommandParser {
      */
     private static final long serialVersionUID = 1;
 
-    /** The server this parser is for. */
-    private Server server;
+    /** The container that owns this parser. */
+    private FrameContainer<?> owner;
 
     /**
      * Creates a new raw command parser for the specified server.
@@ -50,14 +50,14 @@ public class RawCommandParser extends ServerCommandParser {
 
     /** {@inheritDoc} */
     @Override
-    public void setOwner(final FrameContainer owner) {
-        server = owner.getServer();
+    public void setOwner(final FrameContainer<?> owner) {
+        this.owner = owner;
     }
 
     /** {@inheritDoc} */
     @Override
-    protected void handleNonCommand(final FrameContainer origin, final String line) {
-        server.getParser().sendRawMessage(line);
+    protected void handleNonCommand(final FrameContainer<?> origin, final String line) {
+        owner.getServer().getParser().sendRawMessage(line);
     }
 
 }

src/com/dmdirc/commandparser/parsers/ServerCommandParser.java

@@ -59,8 +59,10 @@ public class ServerCommandParser extends CommandParser {
 
     /** {@inheritDoc} */
     @Override
-    public void setOwner(final FrameContainer owner) {
-        server = (Server) owner;
+    public void setOwner(final FrameContainer<?> owner) {
+        if (server == null) {
+            server = (Server) owner;
+        }
     }
     
     /** Loads the relevant commands into the parser. */
@@ -71,7 +73,7 @@ public class ServerCommandParser extends CommandParser {
     
     /** {@inheritDoc} */
     @Override
-    protected void executeCommand(final FrameContainer origin,
+    protected void executeCommand(final FrameContainer<?> origin,
             final boolean isSilent, final Command command, final CommandArguments args) {
         if (command instanceof ServerCommand) {
             if (hasCommandOptions(command) && !getCommandOptions(command).allowOffline()
@@ -96,7 +98,7 @@ public class ServerCommandParser extends CommandParser {
      * @param line The line input by the user
      */
     @Override
-    protected void handleNonCommand(final FrameContainer origin, final String line) {
+    protected void handleNonCommand(final FrameContainer<?> origin, final String line) {
         server.sendLine(line);
     }
     

src/com/dmdirc/config/ConfigTarget.java

@@ -31,7 +31,7 @@ import java.io.Serializable;
  *
  * @author chris
  */
-public class ConfigTarget implements Comparable, Serializable {
+public class ConfigTarget implements Comparable<ConfigTarget>, Serializable {
 
     /** The possible target types. */
     public static enum TYPE {
@@ -218,11 +218,11 @@ public class ConfigTarget implements Comparable, Serializable {
      * equal, or a positive integer if this is more specific
      */
     @Override
-    public int compareTo(final Object target) {
-        if (type.equals(((ConfigTarget) target).getType())) {
-            return ((ConfigTarget) target).getOrder() - order;
+    public int compareTo(final ConfigTarget target) {
+        if (type.equals(target.getType())) {
+            return target.getOrder() - order;
         } else {
-            return type.compareTo(((ConfigTarget) target).getType());
+            return type.compareTo(target.getType());
         }
     }
 

src/com/dmdirc/config/prefs/validator/OptionalValidator.java

@@ -42,7 +42,7 @@ public class OptionalValidator implements Validator<String> {
      *
      * @return Secondary validator
      */
-    public Validator getValidator() {
+    public Validator<String> getValidator() {
         return validator;
     }
     

src/com/dmdirc/interfaces/FrameInfoListener.java

@@ -41,7 +41,7 @@ public interface FrameInfoListener extends EventListener {
      * @param window The window whose icon changed
      * @param icon The new icon for the window
      */
-    void iconChanged(final FrameContainer window, final String icon);
+    void iconChanged(final FrameContainer<?> window, final String icon);
 
     /**
      * Called when a window's name is changed.
@@ -49,7 +49,7 @@ public interface FrameInfoListener extends EventListener {
      * @param window The window whose name changed
      * @param name The new name for the window
      */
-    void nameChanged(final FrameContainer window, final String name);
+    void nameChanged(final FrameContainer<?> window, final String name);
 
     /**
      * Called when a window's title is changed.
@@ -57,6 +57,6 @@ public interface FrameInfoListener extends EventListener {
      * @param window The window whose title changed
      * @param title The new title for the window
      */
-    void titleChanged(final FrameContainer window, final String title);
+    void titleChanged(final FrameContainer<?> window, final String title);
 
 }

src/com/dmdirc/interfaces/NotificationListener.java

@@ -41,12 +41,12 @@ public interface NotificationListener extends EventListener {
      * @param window The window whose notification has changed
      * @param colour The new colour of the notification
      */
-    void notificationSet(final FrameContainer window, final Color colour);
+    void notificationSet(final FrameContainer<?> window, final Color colour);
 
     /**
      * Called when a notification has been cleared.
      *
      * @param window The window whose notification has been cleared
      */
-    void notificationCleared(final FrameContainer window);
+    void notificationCleared(final FrameContainer<?> window);
 }

src/com/dmdirc/interfaces/SelectionListener.java

@@ -39,6 +39,6 @@ public interface SelectionListener extends EventListener {
      *
      * @param window The window that's now selected
      */
-    void selectionChanged(final FrameContainer window);
+    void selectionChanged(final FrameContainer<?> window);
 
 }

src/com/dmdirc/ui/WindowManager.java

@@ -37,6 +37,7 @@ import com.dmdirc.ui.interfaces.Window;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * The WindowManager maintains a list of all open windows, and their
@@ -47,8 +48,8 @@ import java.util.List;
 public class WindowManager {
 
     /** A list of root windows. */
-    private final static List<FrameContainer> rootWindows
-            = new ArrayList<FrameContainer>();
+    private final static List<FrameContainer<?>> rootWindows
+            = new CopyOnWriteArrayList<FrameContainer<?>>();
     
     /** A list of frame listeners. */
     private final static List<FrameListener> frameListeners
@@ -63,7 +64,7 @@ public class WindowManager {
             = new WMSelectionListener();
 
     /** Active window. */
-    private static FrameContainer activeWindow;
+    private static FrameContainer<?> activeWindow;
 
     /**
      * Creates a new instance of WindowManager.
@@ -132,7 +133,7 @@ public class WindowManager {
         "The specified Window is not null",
         "The specified Window has not already been added"
     })
-    public static void addWindow(final FrameContainer window) {
+    public static void addWindow(final FrameContainer<?> window) {
         addWindow(window, true);
     }
 
@@ -147,7 +148,7 @@ public class WindowManager {
         "The specified Window is not null",
         "The specified Window has not already been added"
     })
-    public static void addWindow(final FrameContainer window, final boolean focus) {
+    public static void addWindow(final FrameContainer<?> window, final boolean focus) {
         Logger.assertTrue(window != null);
         Logger.assertTrue(!rootWindows.contains(window));
 
@@ -196,8 +197,8 @@ public class WindowManager {
     @Precondition({
         "The specified Windows are not null"
     })
-    public static void addWindow(final FrameContainer parent,
-            final FrameContainer child) {
+    public static void addWindow(final FrameContainer<?> parent,
+            final FrameContainer<?> child) {
         addWindow(parent, child, true);
     }
 
@@ -212,8 +213,8 @@ public class WindowManager {
     @Precondition({
         "The specified Windows are not null"
     })
-    public static void addWindow(final FrameContainer parent,
-            final FrameContainer child, final boolean focus) {
+    public static void addWindow(final FrameContainer<?> parent,
+            final FrameContainer<?> child, final boolean focus) {
         Logger.assertTrue(parent != null);
         Logger.assertTrue(child != null);
 
@@ -267,7 +268,7 @@ public class WindowManager {
      * @since 0.6.4
      */
     @Precondition("The specified Window is not null")
-    public static void removeWindow(final FrameContainer window) {
+    public static void removeWindow(final FrameContainer<?> window) {
         removeWindow(window, false);
     }
 
@@ -283,7 +284,7 @@ public class WindowManager {
      * @since 0.6.3
      */
     @Precondition("The specified Window is not null")
-    public static void removeWindow(final FrameContainer window, final boolean canWait) {
+    public static void removeWindow(final FrameContainer<?> window, final boolean canWait) {
         Logger.assertTrue(window != null);
 
         if (!window.getChildren().isEmpty()) {
@@ -298,7 +299,7 @@ public class WindowManager {
                 return;
             }
 
-            for (FrameContainer child : window.getChildren()) {
+            for (FrameContainer<?> child : window.getChildren()) {
                 child.close();
             }
 
@@ -317,7 +318,7 @@ public class WindowManager {
                 fireSelectionChanged(null);
             }
         } else {
-            final FrameContainer parent = window.getParent();
+            final FrameContainer<?> parent = window.getParent();
             fireDeleteWindow(parent, window);
 
             if (parent == null) {
@@ -343,7 +344,7 @@ public class WindowManager {
      * @return The specified custom window, or null
      */
     @Precondition("The specified window name is not null")
-    public static FrameContainer findCustomWindow(final String name) {
+    public static FrameContainer<?> findCustomWindow(final String name) {
         Logger.assertTrue(name != null);
 
         return findCustomWindow(rootWindows, name);
@@ -362,7 +363,8 @@ public class WindowManager {
         "The specified parent window is not null",
         "The specified parent window has been added to the Window Manager"
     })
-    public static FrameContainer findCustomWindow(final FrameContainer parent, final String name) {
+    public static FrameContainer<?> findCustomWindow(final FrameContainer<?> parent,
+            final String name) {
         Logger.assertTrue(parent != null);
         Logger.assertTrue(name != null);
 
@@ -377,9 +379,9 @@ public class WindowManager {
      * @param name The name of the custom window to search for
      * @return The custom window if found, or null otherwise
      */
-    private static FrameContainer findCustomWindow(final Collection<FrameContainer> windows,
+    private static FrameContainer<?> findCustomWindow(final Collection<FrameContainer<?>> windows,
             final String name) {
-        for (FrameContainer window : windows) {
+        for (FrameContainer<?> window : windows) {
             if (window instanceof CustomWindow
                     && ((CustomWindow) window).getName().equals(name)) {
                 return window;
@@ -399,18 +401,18 @@ public class WindowManager {
      * @deprecated Call {@link FrameContainer#getParent()} directly
      */
     @Deprecated
-    public static FrameContainer getParent(final FrameContainer window) {
+    public static FrameContainer<?> getParent(final FrameContainer<?> window) {
         return window.getParent();
     }
     
     /**
      * Retrieves all known root (parent-less) windows.
      * 
-     * @since 0.6
-     * @return An array of all known root windows.
+     * @since 0.6.4
+     * @return A collection of all known root windows.
      */
-    public static FrameContainer[] getRootWindows() {
-        return rootWindows.toArray(new FrameContainer[rootWindows.size()]);
+    public static Collection<FrameContainer<?>> getRootWindows() {
+        return rootWindows;
     }
 
     /**
@@ -419,7 +421,7 @@ public class WindowManager {
      * @return Focused window or null
      * @since 0.6.3
      */
-    public static FrameContainer getActiveWindow() {
+    public static FrameContainer<?> getActiveWindow() {
         return activeWindow;
     }
 
@@ -436,14 +438,14 @@ public class WindowManager {
     /**
      * Retrieves all children of the specified window.
      * 
-     * @since 0.6
+     * @since 0.6.4
      * @param window The window whose children are being requested
-     * @return An array of all known child windows.
+     * @return A collection of all known child windows.
      * @deprecated Call {@link FrameContainer#getChildren()} directly
      */
     @Deprecated
-    public static FrameContainer[] getChildren(final FrameContainer window) {
-        return window.getChildren().toArray(new FrameContainer[window.getChildren().size()]);
+    public static Collection<FrameContainer<?>> getChildren(final FrameContainer<?> window) {
+        return window.getChildren();
     }
     
     /**
@@ -452,7 +454,7 @@ public class WindowManager {
      * @param window The window that was added
      * @param focus Should this window become focused
      */
-    private static void fireAddWindow(final FrameContainer window, final boolean focus) {
+    private static void fireAddWindow(final FrameContainer<?> window, final boolean focus) {
         for (FrameListener listener : frameListeners) {
             listener.addWindow(window, focus);
         }
@@ -466,8 +468,8 @@ public class WindowManager {
      * @param focus Should this window become focused
      *
      */
-    private static void fireAddWindow(final FrameContainer parent, 
-            final FrameContainer child, final boolean focus) {
+    private static void fireAddWindow(final FrameContainer<?> parent,
+            final FrameContainer<?> child, final boolean focus) {
         for (FrameListener listener : frameListeners) {
             listener.addWindow(parent, child, focus);
         }
@@ -478,7 +480,7 @@ public class WindowManager {
      * 
      * @param window The window that was removed
      */
-    private static void fireDeleteWindow(final FrameContainer window) {
+    private static void fireDeleteWindow(final FrameContainer<?> window) {
         for (FrameListener listener : frameListeners) {
             listener.delWindow(window);
         }
@@ -490,7 +492,8 @@ public class WindowManager {
      * @param parent The parent window
      * @param child The child window that was removed
      */
-    private static void fireDeleteWindow(final FrameContainer parent, final FrameContainer child) {
+    private static void fireDeleteWindow(final FrameContainer<?> parent,
+            final FrameContainer<?> child) {
         for (FrameListener listener : frameListeners) {
             listener.delWindow(parent, child);
         }
@@ -502,7 +505,7 @@ public class WindowManager {
      *
      * @param window The window that is now focused (or null)
      */
-    private static void fireSelectionChanged(final FrameContainer window) {
+    private static void fireSelectionChanged(final FrameContainer<?> window) {
         for (SelectionListener listener : selListeners) {
             listener.selectionChanged(window);
         }
@@ -517,7 +520,7 @@ public class WindowManager {
 
         /** {@inheritDoc} */
         @Override
-        public void selectionChanged(final FrameContainer window) {
+        public void selectionChanged(final FrameContainer<?> window) {
             activeWindow = window;
 
             fireSelectionChanged(window);

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

@@ -38,14 +38,14 @@ public interface FrameListener {
      * @param window The server to be added
      * @param focus Should this window become focused
      */
-    void addWindow(FrameContainer window, final boolean focus);
+    void addWindow(FrameContainer<?> window, final boolean focus);
 
     /**
      * Removes a window from this frame manager.
      *
      * @param window The server to be removed
      */
-    void delWindow(FrameContainer window);
+    void delWindow(FrameContainer<?> window);
 
     /**
      * Adds a new window to this frame manager.
@@ -54,7 +54,7 @@ public interface FrameListener {
      * @param window The custom window to be added
      * @param focus Should this window become focused
      */
-    void addWindow(FrameContainer parent, FrameContainer window, final boolean focus);
+    void addWindow(FrameContainer<?> parent, FrameContainer<?> window, final boolean focus);
 
     /**
      * Removes a window from this frame manager.
@@ -62,6 +62,6 @@ public interface FrameListener {
      * @param parent The parent to which the window belongs, or null
      * @param window The custom window to be removed
      */
-    void delWindow(FrameContainer parent, FrameContainer window);
+    void delWindow(FrameContainer<?> parent, FrameContainer<?> window);
 
 }

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

@@ -65,6 +65,6 @@ public interface InputWindow extends Window {
      * @return The container that owns this command window.
      */
     @Override
-    WritableFrameContainer getContainer();    
+    WritableFrameContainer<? extends InputWindow> getContainer();
     
 }

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

@@ -27,7 +27,6 @@ import com.dmdirc.FrameContainer;
 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.ui.WindowManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
@@ -88,16 +87,15 @@ public interface UIController {
      * @param owner The owner of the input window
      * @return A new custom window
      */
-    Window getWindow(FrameContainer owner);
+    Window getWindow(FrameContainer<?> owner);
     
     /**
      * Creates a new custom input window instance.
      *
      * @param owner The owner of the input window
-     * @param commandParser The command parser to be used
      * @return A new custom input window
      */
-    InputWindow getInputWindow(WritableFrameContainer owner);
+    InputWindow getInputWindow(WritableFrameContainer<?> owner);
     
     /**
      * Returns an updater dialog for the specified updates.

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

@@ -87,7 +87,7 @@ public interface Window {
      *
      * @return The container that owns this command window.
      */
-    FrameContainer getContainer();
+    FrameContainer<?> getContainer();
 
     /**
      * Determines if the current window is visible.
@@ -174,6 +174,14 @@ public interface Window {
     /**
      * Requests that this object's frame be activated.
      */
-    public void activateFrame();
+    void activateFrame();
+
+    /**
+     * Retrieves the UI controller this window is associated with.
+     *
+     * @return This window's UI controller
+     * @since 0.6.4
+     */
+    UIController getController();
 
 }

src/com/dmdirc/ui/messages/IRCDocument.java

@@ -56,7 +56,7 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
     /** Cached attributed strings. */
     private transient RollingList<AttributedString> cachedStrings;
     /** Container that owns this document. */
-    private final FrameContainer container;
+    private final FrameContainer<?> container;
     /** Font size. */
     private int fontSize;
     /** Font name. */
@@ -70,7 +70,7 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
      * @param container The container that owns this document
      * @since 0.6.3
      */
-    public IRCDocument(final FrameContainer container) {
+    public IRCDocument(final FrameContainer<?> container) {
         this.container = container;
 
         lines = new ArrayList<Line>();

src/com/dmdirc/ui/messages/Styliser.java

@@ -139,7 +139,7 @@ public class Styliser implements ConfigChangeListener {
     private Color uriColour, channelColour;
 
     /** The container that owns this styliser. */
-    private final FrameContainer owner;
+    private final FrameContainer<?> owner;
     
     /**
      * Creates a new instance of Styliser.
@@ -147,7 +147,7 @@ public class Styliser implements ConfigChangeListener {
      * @param owner The {@link FrameContainer} that owns this styliser.
      * @since 0.6.3
      */
-    public Styliser(final FrameContainer owner) {
+    public Styliser(final FrameContainer<?> owner) {
         this.owner = owner;
 
         owner.getConfigManager().addChangeListener("ui", "linkcolour", this);

test/com/dmdirc/ServerManagerTest.java

@@ -101,26 +101,7 @@ public class ServerManagerTest {
         
         assertEquals(instance.getServers().size(), instance.numServers());
     }
-    
-    @Test
-    public void testGetServerFromFrame() throws URISyntaxException {
-        final Server serverA = new Server(new URI("irc-test://255.255.255.255"),
-                IdentityManager.getProfiles().get(0));
-        final Server serverB = new Server(new URI("irc-test://255.255.255.254"),
-                IdentityManager.getProfiles().get(0));
-        serverA.connect();
-        serverB.connect();
-        
-        final ServerManager sm = ServerManager.getServerManager();
         
-        assertEquals(serverA, sm.getServerFromFrame(serverA.getFrame()));
-        assertEquals(serverB, sm.getServerFromFrame(serverB.getFrame()));
-        assertNull(sm.getServerFromFrame(new DummyQueryWindow(serverB)));
-        
-        serverA.close();
-        serverB.close();
-    }
-    
     @Test
     public void testGetServerByAddress() {
         final Server serverA = mock(Server.class);

test/com/dmdirc/WritableFrameContainerTest.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.harness.TestWritableFrameContainer;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.Arrays;
 import org.junit.BeforeClass;
@@ -40,7 +41,8 @@ public class WritableFrameContainerTest {
     
     @Test
     public void testGetNumLines() {
-        final WritableFrameContainer container10 = new TestWritableFrameContainer(10);
+        final WritableFrameContainer<?> container10
+                = new TestWritableFrameContainer<InputWindow>(10, InputWindow.class);
         
         final int res0a = container10.getNumLines("");
         final int res0b = container10.getNumLines("\r");
@@ -69,7 +71,8 @@ public class WritableFrameContainerTest {
 
     @Test
     public void testSplitLine() {
-        final WritableFrameContainer container10 = new TestWritableFrameContainer(10);
+        final WritableFrameContainer<?> container10
+                = new TestWritableFrameContainer<InputWindow>(10, InputWindow.class);
         final String[][][] tests = new String[][][]{
             {{""}, {""}},
             {{"0123456789"}, {"0123456789"}},

test/com/dmdirc/commandparser/commands/channel/BanTest.java

@@ -41,7 +41,7 @@ public class BanTest {
 
     @Test
     public void testUsage() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, null, null, false, new CommandArguments("/ban"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());

test/com/dmdirc/commandparser/commands/channel/KickReasonTest.java

@@ -45,7 +45,7 @@ public class KickReasonTest {
 
     @Test
     public void testUsage() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, null, null, false, new CommandArguments("/kick"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -53,7 +53,7 @@ public class KickReasonTest {
 
     @Test
     public void testUnknown() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         final IRCChannelInfo channelInfo = mock(IRCChannelInfo.class);
         final Channel channel = mock(Channel.class);
 
@@ -67,7 +67,7 @@ public class KickReasonTest {
 
     @Test
     public void testWithReason() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         final IRCChannelInfo channelInfo = mock(IRCChannelInfo.class);
         final Channel channel = mock(Channel.class);
         final IRCChannelClientInfo cci = mock(IRCChannelClientInfo.class);
@@ -82,7 +82,7 @@ public class KickReasonTest {
 
     @Test
     public void testWithoutReason() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         final ConfigManager manager = mock(ConfigManager.class);
         final IRCChannelInfo channelInfo = mock(IRCChannelInfo.class);
         final Channel channel = mock(Channel.class);

test/com/dmdirc/commandparser/commands/channel/ModeTest.java

@@ -66,7 +66,7 @@ public class ModeTest {
 
     @Test
     public void testWithoutArgs() {
-        final FrameContainer origin = mock(FrameContainer.class);
+        final FrameContainer<?> origin = mock(FrameContainer.class);
         
         command.execute(origin, server, channel, false, new CommandArguments("/mode"));
 
@@ -75,7 +75,7 @@ public class ModeTest {
 
     @Test
     public void testWithArgs() {
-        final FrameContainer origin = mock(FrameContainer.class);
+        final FrameContainer<?> origin = mock(FrameContainer.class);
 
         command.execute(origin, server, channel, false, new CommandArguments("/mode +hello -bye"));
 
@@ -84,7 +84,7 @@ public class ModeTest {
 
     @Test
     public void testExternalWithArgs() {
-        final FrameContainer origin = mock(FrameContainer.class);
+        final FrameContainer<?> origin = mock(FrameContainer.class);
 
         command.execute(origin, server, "#chan", false,
                 new CommandArguments("/mode +hello -bye"));
@@ -94,7 +94,7 @@ public class ModeTest {
 
     @Test
     public void testExternalWithoutArgs() {
-        final FrameContainer origin = mock(FrameContainer.class);
+        final FrameContainer<?> origin = mock(FrameContainer.class);
 
         command.execute(origin, server, "#chan", false,
                 new CommandArguments("/mode"));

test/com/dmdirc/commandparser/commands/channel/PartTest.java

@@ -38,7 +38,7 @@ public class PartTest {
 
     private final Part command = new Part();
     private Channel channel;
-    private FrameContainer origin;
+    private FrameContainer<?> origin;
     private ConfigManager manager;
 
     @BeforeClass

test/com/dmdirc/commandparser/commands/channel/SetNickColourTest.java

@@ -40,7 +40,7 @@ public class SetNickColourTest {
 
     @Test
     public void testUsageNoArgs() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, null, null, false, new CommandArguments("/foo"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -48,7 +48,7 @@ public class SetNickColourTest {
     
     @Test
     public void testUsageNicklist() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, null, null, false, new CommandArguments("/foo --nicklist"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -56,7 +56,7 @@ public class SetNickColourTest {
     
     @Test
     public void testUsageText() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, null, null, false, new CommandArguments("/foo --text"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());

test/com/dmdirc/commandparser/commands/chat/MeTest.java

@@ -41,7 +41,7 @@ public class MeTest {
 
     @Test
     public void testUsage() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, null, null, false, new CommandArguments("/foo"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -49,7 +49,7 @@ public class MeTest {
     
     @Test
     public void testSend() {
-        final MessageTarget mtt = mock(MessageTarget.class);
+        final MessageTarget<?> mtt = mock(MessageTarget.class);
         command.execute(null, null, mtt, false, new CommandArguments("/foo hello meep moop"));
 
         verify(mtt).sendAction("hello meep moop");

test/com/dmdirc/commandparser/commands/global/AliasCommandTest.java

@@ -40,7 +40,7 @@ public class AliasCommandTest {
 
     @Test
     public void testUsageNoArgs() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
 
         command.execute(tiw, false, new CommandArguments("/foo"));
         
@@ -49,7 +49,7 @@ public class AliasCommandTest {
     
     @Test
     public void testUsageOneArg() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         
         command.execute(tiw, false, new CommandArguments("/foo --remove"));
         

test/com/dmdirc/commandparser/commands/global/DebugTest.java

@@ -39,7 +39,7 @@ public class DebugTest {
 
     @Test
     public void testUsage() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
 
         command.execute(tiw, false, new CommandArguments("/foo"));
         
@@ -48,7 +48,7 @@ public class DebugTest {
     
     @Test
     public void testInvalidArg() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
 
         command.execute(tiw, false, new CommandArguments("/foo flubadee"));
         

test/com/dmdirc/commandparser/commands/global/IfpluginTest.java

@@ -40,7 +40,7 @@ public class IfpluginTest {
 
     @Test
     public void testUsageNoArgs() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, false, new CommandArguments("/foo"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -48,7 +48,7 @@ public class IfpluginTest {
     
     @Test
     public void testUsageOneArg() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, false, new CommandArguments("/foo bar"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());

test/com/dmdirc/commandparser/commands/global/NewServerTest.java

@@ -40,7 +40,7 @@ public class NewServerTest {
 
     @Test
     public void testUsageNoArgs() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, false, new CommandArguments("/foo"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -48,7 +48,7 @@ public class NewServerTest {
     
     @Test
     public void testInvalidPort() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, false, new CommandArguments("/foo foo:abc"));
         
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -56,7 +56,7 @@ public class NewServerTest {
     
     @Test
     public void testOutOfRangePort1() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, false, new CommandArguments("/foo foo:0"));
         
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -64,7 +64,7 @@ public class NewServerTest {
     
     @Test
     public void testOutOfRangePort2() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, false, new CommandArguments("/foo foo:65537"));
         
         verify(tiw).addLine(eq("commandError"), anyString());

test/com/dmdirc/commandparser/commands/server/ChangeServerTest.java

@@ -44,7 +44,7 @@ public class ChangeServerTest {
 
     @Test
     public void testUsageNoArgs() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, null, false, new CommandArguments("/server"));
         
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -52,7 +52,7 @@ public class ChangeServerTest {
     
     @Test
     public void testInvalidPort() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, null, false, new CommandArguments("/server foo:abc"));
         
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -60,7 +60,7 @@ public class ChangeServerTest {
     
     @Test
     public void testOutOfRangePort1() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, null, false, new CommandArguments("/server foo:0"));
         
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -68,7 +68,7 @@ public class ChangeServerTest {
     
     @Test
     public void testOutOfRangePort2() {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         command.execute(tiw, null, false, new CommandArguments("/server foo:65537"));
         
         verify(tiw).addLine(eq("commandError"), anyString());
@@ -76,7 +76,7 @@ public class ChangeServerTest {
 
     @Test
     public void testExecuteBasic() throws URISyntaxException {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
         when(server.getProfile()).thenReturn(profile);
@@ -88,7 +88,7 @@ public class ChangeServerTest {
 
     @Test
     public void testExecuteNoPort() throws URISyntaxException {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
         when(server.getProfile()).thenReturn(profile);
@@ -100,7 +100,7 @@ public class ChangeServerTest {
 
     @Test
     public void testDeprecatedSSL() throws URISyntaxException {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
         when(server.getProfile()).thenReturn(profile);
@@ -112,7 +112,7 @@ public class ChangeServerTest {
 
     @Test
     public void testExecuteComplex() throws URISyntaxException {
-        final FrameContainer tiw = mock(FrameContainer.class);
+        final FrameContainer<?> tiw = mock(FrameContainer.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
         when(server.getProfile()).thenReturn(profile);

test/com/dmdirc/harness/TestCommandParser.java

@@ -49,7 +49,7 @@ public class TestCommandParser extends CommandParser {
     }
 
     @Override
-    protected void executeCommand(FrameContainer origin, boolean isSilent,
+    protected void executeCommand(FrameContainer<?> origin, boolean isSilent,
                                   Command command, CommandArguments args) {
         executedCommand = command;
         wasSilent = isSilent;
@@ -57,18 +57,18 @@ public class TestCommandParser extends CommandParser {
     }
 
     @Override
-    protected void handleNonCommand(FrameContainer origin, String line) {
+    protected void handleNonCommand(FrameContainer<?> origin, String line) {
         nonCommandLine = line;
     }
 
     @Override
-    protected void handleInvalidCommand(FrameContainer origin,
+    protected void handleInvalidCommand(FrameContainer<?> origin,
                                         CommandArguments args) {
         invalidCommand = args.getCommandName();
     }
 
     @Override
-    public void setOwner(FrameContainer owner) {
+    public void setOwner(FrameContainer<?> owner) {
         // Don't care
     }
 }

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -28,22 +28,22 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-public class TestWritableFrameContainer extends WritableFrameContainer {
+public class TestWritableFrameContainer<T extends InputWindow> extends WritableFrameContainer<T> {
 
-    public InputWindow window = null;
     private final int lineLength;
 
     public TestWritableFrameContainer(final int lineLength,
-            final ConfigManager cm) {
-        super("raw", "Raw", "(Raw)", cm, GlobalCommandParser.getGlobalCommandParser());
+            final ConfigManager cm, final Class<T> clazz) {
+        super("raw", "Raw", "(Raw)", clazz, cm, GlobalCommandParser.getGlobalCommandParser());
 
         this.lineLength = lineLength;
     }
 
-    public TestWritableFrameContainer(final int lineLength) {
-        this(lineLength, IdentityManager.getGlobalConfig());
+    public TestWritableFrameContainer(final int lineLength, final Class<T> clazz) {
+        this(lineLength, IdentityManager.getGlobalConfig(), clazz);
     }
 
     @Override
@@ -51,11 +51,6 @@ public class TestWritableFrameContainer extends WritableFrameContainer {
         // Do nothing
     }
 
-    @Override
-    public InputWindow getFrame() {
-        return window;
-    }
-
     @Override
     public int getMaxLineLength() {
         return lineLength;
@@ -76,4 +71,9 @@ public class TestWritableFrameContainer extends WritableFrameContainer {
     public Server getServer() {
         return null;
     }
+
+    @Override
+    public TabCompleter getTabCompleter() {
+        return new TabCompleter();
+    }
 }

test/com/dmdirc/ui/WindowManagerTest.java

@@ -31,7 +31,6 @@ import com.dmdirc.ui.interfaces.Window;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 public class WindowManagerTest {
@@ -44,39 +43,38 @@ public class WindowManagerTest {
     @Test
     public void testAddRoot() {
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
         
         WindowManager.addFrameListener(tfm);
 
-        verify(tfm, never()).addWindow((FrameContainer) anyObject(), true);
-        verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), true);
+        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), true);
+        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), (FrameContainer<?>) anyObject(), true);
         
         WindowManager.addWindow(parent);
         
         verify(tfm).addWindow(same(parent.getContainer()), true);
-        verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), true);
+        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), (FrameContainer<?>) anyObject(), true);
     }
 
     @Test
     public void testAddChild() {
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
+        final Window child = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
         WindowManager.addWindow(parent);
         WindowManager.addFrameListener(tfm);
         
         WindowManager.addWindow(parent, child);
         
-        verify(tfm, never()).addWindow((FrameContainer) anyObject(), true);
+        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), true);
         verify(tfm).addWindow(same(parent.getContainer()), same(child.getContainer()), true);
     }
 
     @Test
     public void testRemoveRoot() {
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
-        WindowManager.addWindow(parent);
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
+        final Window child = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);        WindowManager.addWindow(parent);
         WindowManager.addFrameListener(tfm);
 
         WindowManager.removeWindow(parent);
@@ -87,25 +85,25 @@ public class WindowManagerTest {
     @Test
     public void testRemoveChild() {
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
+        final Window child = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
         WindowManager.addWindow(parent);
         WindowManager.addWindow(parent, child);
         WindowManager.addFrameListener(tfm);
 
         WindowManager.removeWindow(child);
 
-        verify(tfm, never()).addWindow((FrameContainer) anyObject(), true);
-        verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), true);
-        verify(tfm, never()).delWindow((FrameContainer) anyObject());
+        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), true);
+        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), (FrameContainer<?>) anyObject(), true);
+        verify(tfm, never()).delWindow((FrameContainer<?>) anyObject());
         verify(tfm).delWindow(same(parent.getContainer()), same(child.getContainer()));
     }
 
     @Test
     public void testRemoveFrameManager() {
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
+        final Window child = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
         WindowManager.addWindow(parent);
         
         WindowManager.addFrameListener(tfm);
@@ -113,28 +111,10 @@ public class WindowManagerTest {
         WindowManager.removeFrameListener(tfm);
         WindowManager.addWindow(parent, child);
         
-        verify(tfm, never()).addWindow((FrameContainer) anyObject(), true);
-        verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), true);
-        verify(tfm, never()).delWindow((FrameContainer) anyObject());
-        verify(tfm, never()).delWindow((FrameContainer) anyObject(), (FrameContainer) anyObject());
-    }
-    
-    @Test
-    public void testGetParent() {
-        final Window parent1 = new DummyInputWindow(new TestWritableFrameContainer(512), null);
-        final Window parent2 = new DummyInputWindow(new TestWritableFrameContainer(512), null);
-        final Window child1 = new DummyInputWindow(new TestWritableFrameContainer(512), null);
-        final Window child2 = new DummyInputWindow(new TestWritableFrameContainer(512), null);
-        
-        WindowManager.addWindow(parent1);
-        WindowManager.addWindow(parent2);
-        WindowManager.addWindow(parent1, child1);
-        WindowManager.addWindow(parent2, child2);
-        
-        assertSame(parent1.getContainer(), WindowManager.getParent(child1.getContainer()));
-        assertSame(parent2.getContainer(), WindowManager.getParent(child2.getContainer()));
-        assertNull(WindowManager.getParent(parent1.getContainer()));
-        assertNull(WindowManager.getParent(parent2.getContainer()));
+        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), true);
+        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), (FrameContainer<?>) anyObject(), true);
+        verify(tfm, never()).delWindow((FrameContainer<?>) anyObject());
+        verify(tfm, never()).delWindow((FrameContainer<?>) anyObject(), (FrameContainer<?>) anyObject());
     }
     
 }

test/com/dmdirc/ui/messages/IntelligentLinkingTest.java

@@ -45,7 +45,7 @@ public class IntelligentLinkingTest {
         this.input = input;
         this.expected = expected;
 
-        final FrameContainer container = mock(FrameContainer.class);
+        final FrameContainer<?> container = mock(FrameContainer.class);
         final ConfigManager manager = mock(ConfigManager.class);
         final Server server = mock(Server.class);
         when(server.getChannelPrefixes()).thenReturn("#&+");

test/com/dmdirc/ui/messages/StyliserStylesTest.java

@@ -65,7 +65,7 @@ public class StyliserStylesTest {
         final DefaultStyledDocument doc = new DefaultStyledDocument();
         final StringBuilder builder = new StringBuilder();
 
-        final FrameContainer container = mock(FrameContainer.class);
+        final FrameContainer<?> container = mock(FrameContainer.class);
         final ConfigManager manager = mock(ConfigManager.class);
         when(container.getConfigManager()).thenReturn(manager);
 

test/com/dmdirc/ui/messages/StyliserTest.java

@@ -86,7 +86,7 @@ public class StyliserTest {
         final String input1 = ((char) 18) + "abc" + ((char) 2) + "def" + ((char) 31) + "ghi";
         final String input2 = "abcdefghi";
 
-        final FrameContainer container = mock(FrameContainer.class);
+        final FrameContainer<?> container = mock(FrameContainer.class);
         final ConfigManager manager = mock(ConfigManager.class);
         when(container.getConfigManager()).thenReturn(manager);