Rework FrameContainer/UI interaction

- FrameContainers are no longer parameterised
- Introduced notion of window "Components"
- Removed per-window interfaces - fixes CLIENT-218

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

src/com/dmdirc/Channel.java

@@ -35,9 +35,10 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.components.WindowComponent;
 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;
@@ -53,10 +54,8 @@ import java.util.Map;
  * The Channel class represents the client's view of the channel. It handles
  * callbacks for channel events from the parser, maintains the corresponding
  * ChannelWindow, and handles user input for the channel.
- *
- * @author chris
  */
-public class Channel extends MessageTarget<ChannelWindow> implements ConfigChangeListener {
+public class Channel extends MessageTarget implements ConfigChangeListener {
 
     /** The parser's pChannel class. */
     private ChannelInfo channelInfo;
@@ -97,10 +96,14 @@ public class Channel extends MessageTarget<ChannelWindow> implements ConfigChang
             final boolean focus) {
         super("channel-inactive", newChannelInfo.getName(),
                 Styliser.stipControlCodes(newChannelInfo.getName()),
-                ChannelWindow.class,
+                InputWindow.class,
                 new ConfigManager(newServer.getProtocol(), newServer.getIrcd(),
                 newServer.getNetwork(), newServer.getAddress(), newChannelInfo.getName()),
-                new ChannelCommandParser(newServer));
+                new ChannelCommandParser(newServer),
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier(),
+                WindowComponent.TOPICBAR.getIdentifier(),
+                WindowComponent.USERLIST.getIdentifier()));
 
         channelInfo = newChannelInfo;
         server = newServer;

src/com/dmdirc/CustomWindow.java

@@ -24,14 +24,15 @@ package com.dmdirc;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.interfaces.Window;
 
+import java.util.Arrays;
+
 /**
  * A generic custom window implementation.
- *
- * @author chris
  */
-public class CustomWindow extends FrameContainer<Window> {
+public class CustomWindow extends FrameContainer {
 
     /**
      * Creates a new custom window as a child of the specified window.
@@ -41,8 +42,9 @@ public class CustomWindow extends FrameContainer<Window> {
      * @param parent The parent of this custom window
      */
     public CustomWindow(final String name, final String title,
-            final FrameContainer<?> parent) {
-        super("custom", name, title, Window.class, parent.getConfigManager());
+            final FrameContainer parent) {
+        super("custom", name, title, Window.class, parent.getConfigManager(),
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
 
         WindowManager.addWindow(parent, this);
     }
@@ -54,7 +56,9 @@ public class CustomWindow extends FrameContainer<Window> {
      * @param title The parent of this custom window
      */
     public CustomWindow(final String name, final String title) {
-        super("custom", name, title, Window.class, IdentityManager.getGlobalConfig());
+        super("custom", name, title, Window.class,
+                IdentityManager.getGlobalConfig(),
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
 
         WindowManager.addWindow(this);
     }

src/com/dmdirc/FrameContainer.java

@@ -41,41 +41,50 @@ import java.awt.Color;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 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<T extends Window> {
+public abstract class FrameContainer {
 
     /** The colour of our frame's notifications. */
     protected Color notification = Color.BLACK;
 
-    /** A list of listeners for this containers's events. */
+    /** A list of listeners for this container's events. */
     protected final ListenerList listeners = new ListenerList();
 
     /** The document used to store this container's content. */
     protected 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 windows representing of this frame.
+     *
+     * @deprecated The core should not need to know about UI implementations
+     */
+    @Deprecated
+    protected final Collection<Window> windows
+            = new CopyOnWriteArrayList<Window>();
 
-    /** The class of windows we want to represent this container. */
-    protected final Class<T> windowClass;
+    /**
+     * The class of windows we want to represent this container.
+     * 
+     * @deprecated Replaced with {@link #components}
+     */
+    @Deprecated
+    protected final Class<? extends Window> 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;
@@ -91,6 +100,9 @@ public abstract class FrameContainer<T extends Window> {
 
     /** The IconChanger for this container. */
     private final IconChanger changer = new IconChanger();
+    
+    /** The UI components that this frame requires. */
+    private final Set<String> components;
 
     /** The styliser used by this container. */
     private Styliser styliser;
@@ -107,15 +119,17 @@ public abstract class FrameContainer<T extends Window> {
      * @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
+     * @param components The UI components that this frame requires
      * @since 0.6.4
      */
     protected FrameContainer(final String icon, final String name,
-            final String title, final Class<T> windowClass,
-            final ConfigManager config) {
+            final String title, final Class<? extends Window> windowClass,
+            final ConfigManager config, final Collection<String> components) {
         this.config = config;
         this.name = name;
         this.title = title;
         this.windowClass = windowClass;
+        this.components = new HashSet<String>(components);
 
         setIcon(icon);
     }
@@ -126,7 +140,7 @@ public abstract class FrameContainer<T extends Window> {
      * @return This frame's children
      * @since 0.6.4
      */
-    public Collection<FrameContainer<?>> getChildren() {
+    public Collection<FrameContainer> getChildren() {
         return Collections.unmodifiableCollection(children);
     }
 
@@ -137,12 +151,12 @@ public abstract class FrameContainer<T extends Window> {
      * @param target The window to be tested
      * @return True if the specified container is a child of this one
      */
-    public boolean isChild(final FrameContainer<?> target) {
+    public boolean isChild(final FrameContainer target) {
         if (children.contains(target)) {
             return true;
         }
 
-        for (FrameContainer<?> child : children) {
+        for (FrameContainer child : children) {
             if (child.isChild(target)) {
                 return true;
             }
@@ -157,7 +171,7 @@ public abstract class FrameContainer<T extends Window> {
      * @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);
     }
@@ -168,7 +182,7 @@ public abstract class FrameContainer<T extends Window> {
      * @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);
     }
 
@@ -180,7 +194,7 @@ public abstract class FrameContainer<T extends Window> {
      * @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);
         }
@@ -194,7 +208,7 @@ public abstract class FrameContainer<T extends Window> {
      * @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;
     }
 
@@ -213,12 +227,6 @@ public abstract class FrameContainer<T extends Window> {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String toString() {
-        return name;
-    }
-
     /**
      * Retrieves the name of this container.
      *
@@ -268,6 +276,17 @@ public abstract class FrameContainer<T extends Window> {
             listener.titleChanged(this, title);
         }
     }
+    
+    /**
+     * Returns the collection of UI component identifiers that this frame
+     * container requires for its display.
+     *
+     * @since 0.6.6
+     * @return Collection of UI component identifiers
+     */
+    public Set<String> getComponents() {
+        return Collections.unmodifiableSet(components);
+    }
 
     /**
      * Closes this container (and it's associated frame).
@@ -369,7 +388,7 @@ public abstract class FrameContainer<T extends Window> {
      * @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)) {
@@ -396,7 +415,9 @@ public abstract class FrameContainer<T extends Window> {
      *
      * @param target Window to check ownership of
      * @return True iff frame is owned by this container, false otherwise
+     * @deprecated The core should not need to know about UI implementations
      */
+    @Deprecated
     @SuppressWarnings("element-type-mismatch")
     public boolean ownsFrame(final Window target) {
         return windows.contains(target);
@@ -652,9 +673,11 @@ public abstract class FrameContainer<T extends Window> {
      * Adds a new window to this container.
      *
      * @param window The window to be added
+     * @deprecated The core should not need to know about UI methods
      * @since 0.6.4
      */
-    public void addWindow(final T window) {
+    @Deprecated
+    public void addWindow(final Window window) {
         windows.add(window);
     }
 
@@ -662,9 +685,11 @@ public abstract class FrameContainer<T extends Window> {
      * Removes the specified window from this container.
      *
      * @param window The window to be removed
+     * @deprecated The core should not need to know about UI methods
      * @since 0.6.4
      */
-    public void removeWindow(final T window) {
+    @Deprecated
+    public void removeWindow(final Window window) {
         windows.remove(window);
     }
 
@@ -672,10 +697,12 @@ public abstract class FrameContainer<T extends Window> {
      * Retrieves a collection of windows that represent this container.
      *
      * @return The collection of windows currently representing this container
+     * @deprecated The core should not need to know about UI methods
      * @since 0.6.4
      */
-    public Collection<T> getWindows() {
-        return windows;
+    @Deprecated
+    public Collection<Window> getWindows() {
+        return Collections.unmodifiableCollection(windows);
     }
 
     /**
@@ -683,9 +710,12 @@ public abstract class FrameContainer<T extends Window> {
      * container.
      *
      * @return This container's window class
+     * @deprecated UIs should base their implementations on the value of
+     * {@link #getComponents()}
      * @since 0.6.4
      */
-    public Class<T> getWindowClass() {
+    @Deprecated
+    public Class<? extends Window> getWindowClass() {
         return windowClass;
     }
 

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 {
 
     /**
@@ -55,22 +55,22 @@ 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);
-        Logger.assertTrue(item2.toString() != null);
+        Logger.assertTrue(item1.getName() != null);
+        Logger.assertTrue(item2.getName() != null);
 
         if (sortBefore(item1, item2)) {
             return -1;
         } else if (sortAfter(item1, item2)) {
             return 1;
         } else {
-            final int position = item1.toString().compareToIgnoreCase(
-                    item2.toString());
+            final int position = item1.getName()
+                    .compareToIgnoreCase(item2.getName());
             if (position == 0) {
-                return Integer.valueOf(item1.hashCode()).compareTo(
-                        Integer.valueOf(item2.hashCode()));
+                return Integer.valueOf(item1.hashCode())
+                        .compareTo(Integer.valueOf(item2.hashCode()));
             } else {
                 return position;
             }
@@ -84,8 +84,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 static boolean sortBefore(final FrameContainer<?> item1,
-            final FrameContainer<?> item2) {
+    private static boolean sortBefore(final FrameContainer item1,
+            final FrameContainer item2) {
 
         return getPosition(item1) < getPosition(item2);
     }
@@ -97,8 +97,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 static boolean sortAfter(final FrameContainer<?> item1,
-            final FrameContainer<?> item2) {
+    private static boolean sortAfter(final FrameContainer item1,
+            final FrameContainer item2) {
         return getPosition(item1) > getPosition(item2);
     }
 
@@ -109,7 +109,7 @@ public final class FrameContainerComparator implements Comparator<FrameContainer
      * @param item The frame container to be tested
      * @return Position of the frame container
      */
-    private static int getPosition(final FrameContainer<?> item) {
+    private static int getPosition(final FrameContainer item) {
         if (item instanceof GlobalWindow) {
             return 0;
         } else if (item instanceof Server) {

src/com/dmdirc/GlobalWindow.java

@@ -29,16 +29,19 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
 
+import java.util.Arrays;
+
 /**
  * A window which can be used to execute global commands.
  *
  * @author chris
  */
-public class GlobalWindow extends WritableFrameContainer<InputWindow> {
+public class GlobalWindow extends WritableFrameContainer {
 
     /** The global window that's in use, if any. */
     private static GlobalWindow globalWindow;
@@ -50,7 +53,9 @@ public class GlobalWindow extends WritableFrameContainer<InputWindow> {
     public GlobalWindow() {
         super("icon", "Global", "(Global)", InputWindow.class,
                 IdentityManager.getGlobalConfig(),
-                GlobalCommandParser.getGlobalCommandParser());
+                GlobalCommandParser.getGlobalCommandParser(),
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier()));
 
         tabCompleter = new TabCompleter();
         tabCompleter.addEntries(TabCompletionType.COMMAND,

src/com/dmdirc/MessageTarget.java

@@ -26,14 +26,13 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 
+import java.util.Collection;
+
 /**
  * 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<T extends InputWindow> extends WritableFrameContainer<T> {
+public abstract class MessageTarget extends WritableFrameContainer {
 
     /**
      * Creates a new MessageTarget.
@@ -44,12 +43,14 @@ public abstract class MessageTarget<T extends InputWindow> extends WritableFrame
      * @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
+     * @param components The UI components that this frame requires
      * @since 0.6.4
      */
     public MessageTarget(final String icon, final String name,
-            final String title, final Class<T> windowClass,
-            final ConfigManager config, final CommandParser parser) {
-        super(icon, name, title, windowClass, config, parser);
+            final String title, final Class<? extends InputWindow> windowClass,
+            final ConfigManager config, final CommandParser parser,
+            final Collection<String> components) {
+        super(icon, name, title, windowClass, config, parser, components);
     }
 
     /**

src/com/dmdirc/Query.java

@@ -38,11 +38,13 @@ import com.dmdirc.parser.interfaces.callbacks.PrivateActionListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
 import com.dmdirc.parser.interfaces.callbacks.QuitListener;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.interfaces.QueryWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.awt.Toolkit;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -50,9 +52,8 @@ import java.util.List;
  * The Query class represents the client's view of a query with another user.
  * It handles callbacks for query events from the parser, maintains the
  * corresponding QueryWindow, and handles user input for the query.
- * @author chris
  */
-public class Query extends MessageTarget<QueryWindow> implements PrivateActionListener,
+public class Query extends MessageTarget implements PrivateActionListener,
         PrivateMessageListener, NickChangeListener, QuitListener {
 
     /** The Server this Query is on. */
@@ -73,8 +74,10 @@ public class Query extends MessageTarget<QueryWindow> implements PrivateActionLi
     public Query(final Server newServer, final String newHost) {
         super("query", newServer.parseHostmask(newHost)[0],
                 newServer.parseHostmask(newHost)[0],
-                QueryWindow.class, newServer.getConfigManager(),
-                new QueryCommandParser(newServer));
+                InputWindow.class, newServer.getConfigManager(),
+                new QueryCommandParser(newServer),
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier()));
 
         this.server = newServer;
         this.host = newHost;

src/com/dmdirc/Raw.java

@@ -30,17 +30,18 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DataInListener;
 import com.dmdirc.parser.interfaces.callbacks.DataOutListener;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
+import java.util.Arrays;
 
 import java.util.Date;
 
 /**
  * Handles the raw window (which shows the user raw data being sent and
  * received to/from the server).
- * @author chris
  */
-public final class Raw extends WritableFrameContainer<InputWindow>
+public final class Raw extends WritableFrameContainer
         implements DataInListener, DataOutListener {
 
     /** The server object that's being monitored. */
@@ -53,7 +54,9 @@ public final class Raw extends WritableFrameContainer<InputWindow>
      */
     public Raw(final Server newServer) {
         super("raw", "Raw", "(Raw log)", InputWindow.class,
-                newServer.getConfigManager(), new ServerCommandParser());
+                newServer.getConfigManager(), new ServerCommandParser(),
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier()));
 
         this.server = newServer;
 

src/com/dmdirc/Server.java

@@ -53,9 +53,10 @@ import com.dmdirc.tls.CertificateProblemListener;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
+import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.interfaces.ServerWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.messages.Formatter;
 
@@ -64,6 +65,7 @@ import java.net.URISyntaxException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -84,7 +86,7 @@ import javax.net.ssl.TrustManager;
  * a list of all channels, queries, etc, and handles parser callbacks pertaining
  * to the server.
  */
-public class Server extends WritableFrameContainer<ServerWindow>
+public class Server extends WritableFrameContainer
         implements ConfigChangeListener, CertificateProblemListener {
 
     // <editor-fold defaultstate="collapsed" desc="Properties">
@@ -149,8 +151,9 @@ public class Server extends WritableFrameContainer<ServerWindow>
 
     /** 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;
@@ -189,9 +192,12 @@ public class Server extends WritableFrameContainer<ServerWindow>
      */
     public Server(final URI uri, final Identity profile) {
         super("server-disconnected", getHost(uri), getHost(uri),
-                ServerWindow.class,
+                InputWindow.class,
                 new ConfigManager(uri.getScheme(), "", "", uri.getHost()),
-                new ServerCommandParser());
+                new ServerCommandParser(),
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier(),
+                WindowComponent.CERTIFICATE_VIEWER.getIdentifier()));
 
         setConnectionDetails(uri, profile);
 
@@ -667,8 +673,13 @@ public class Server extends WritableFrameContainer<ServerWindow>
         return getChannel(chan.getName());
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated The core should not need to know about UI implementations
+     */
     @Override
+    @Deprecated
     @SuppressWarnings("element-type-mismatch")
     public boolean ownsFrame(final Window target) {
         // Check if it's our server frame
@@ -691,7 +702,7 @@ public class Server extends WritableFrameContainer<ServerWindow>
      *
      * @param source The frame that was activated
      */
-    public void setActiveFrame(final FrameContainer<?> source) {
+    public void setActiveFrame(final FrameContainer source) {
         activeFrame = source;
     }
 

src/com/dmdirc/WritableFrameContainer.java

@@ -33,6 +33,7 @@ import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
@@ -40,11 +41,8 @@ import java.util.List;
  * The writable frame container adds additional methods to the frame container
  * 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<T extends InputWindow> extends FrameContainer<T> {
+public abstract class WritableFrameContainer extends FrameContainer {
 
     /** The name of the server notification target. */
     protected static final String NOTIFICATION_SERVER = "server".intern();
@@ -64,12 +62,14 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
      * @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
+     * @param components The UI components that this frame requires
      * @since 0.6.4
      */
     public WritableFrameContainer(final String icon, final String name,
-            final String title, final Class<T> windowClass,
-            final ConfigManager config, final CommandParser parser) {
-        super(icon, name, title, windowClass, config);
+            final String title, final Class<? extends InputWindow> windowClass,
+            final ConfigManager config, final CommandParser parser,
+            final Collection<String> components) {
+        super(icon, name, title, windowClass, config, components);
 
         this.commandParser = parser;
         parser.setOwner(this);
@@ -305,7 +305,7 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
         } 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());
@@ -321,24 +321,24 @@ public abstract class WritableFrameContainer<T extends InputWindow> extends Fram
 
             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) {
-                if (!(container instanceof WritableFrameContainer<?>)) {
+            for (FrameContainer container : containers) {
+                if (!(container instanceof WritableFrameContainer)) {
                     continue;
                 }
 
-                final long time = ((WritableFrameContainer<?>) container)
+                final long time = ((WritableFrameContainer) container)
                         .getCommandParser().getCommandTime(command);
                 if (time > besttime) {
                     besttime = time;
-                    best = (WritableFrameContainer<?>) container;
+                    best = (WritableFrameContainer) container;
                 }
             }
 

src/com/dmdirc/actions/ActionModel.java

@@ -34,7 +34,6 @@ import com.dmdirc.ui.interfaces.Window;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -132,25 +131,22 @@ public class ActionModel {
             return false;
         }
 
-        final FrameContainer<?> active = WindowManager.getActiveWindow();
+        final FrameContainer active = WindowManager.getActiveWindow();
         Window window = null;
-        WritableFrameContainer<? extends Window> container = null;
+        WritableFrameContainer container = null;
         CommandParser cp = null;
 
         if (arguments.length > 0
-                && arguments[0] instanceof WritableFrameContainer<?>) {
-            container = (WritableFrameContainer<?>) arguments[0];
-        } else if (active instanceof WritableFrameContainer<?>) {
-            container = (WritableFrameContainer<?>) active;
+                && arguments[0] instanceof WritableFrameContainer) {
+            container = (WritableFrameContainer) arguments[0];
+        } else if (active instanceof WritableFrameContainer) {
+            container = (WritableFrameContainer) active;
         } else if (ServerManager.getServerManager().numServers() > 0) {
             container = ServerManager.getServerManager().getServers().get(0);
         }
 
         if (arguments.length > 0 && arguments[0] instanceof Window) {
             window = (Window) arguments[0];
-        } else if (container != null) {
-            final Collection<? extends Window> windows = container.getWindows();
-            window = windows.isEmpty() ? null : windows.iterator().next();
         }
 
         if (container == null) {

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -264,7 +264,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 {
@@ -295,8 +295,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()) {
             final Object res = chain.get(argument);
             return res == null ? ERR_NULL_CHAIN : res.toString();
@@ -317,8 +317,8 @@ 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).getContainer().getConfigManager();
             }

src/com/dmdirc/actions/CoreActionComponent.java

@@ -480,7 +480,7 @@ public enum CoreActionComponent implements ActionComponent {
     QUERY_NICK {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((Query) argument).toString(); }
+        public Object get(final Object argument) { return ((Query) argument).getName(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Query.class; }
@@ -512,7 +512,7 @@ public enum CoreActionComponent implements ActionComponent {
     WINDOW_NAME {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object argument) { return ((FrameContainer) argument).toString(); }
+        public Object get(final Object argument) { return ((FrameContainer) argument).getName(); }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return FrameContainer.class; }

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

@@ -48,7 +48,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);
@@ -63,7 +63,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);
@@ -132,7 +132,7 @@ public abstract class Command {
      * @param context The context the command was executed in
      * @since 0.6.4
      */
-    public abstract void execute(FrameContainer<?> origin,
+    public abstract void execute(FrameContainer origin,
             CommandArguments args, CommandContext context);
 
 }

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/channel/Ban.java

@@ -49,7 +49,7 @@ public final class Ban extends Command implements IntelligentCommand, CommandInf
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
 

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

@@ -48,7 +48,7 @@ public final class ChannelSettings extends Command implements
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         context.getSource().getController().showChannelSettingsDialog(
                 ((ChannelCommandContext) context).getChannel());

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

@@ -47,7 +47,7 @@ public final class Cycle extends Command implements CommandInfo {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
         channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()

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

@@ -51,7 +51,7 @@ public final class Invite extends Command implements ExternalCommand, CommandInf
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length < 1) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,
@@ -66,7 +66,7 @@ public final class Invite extends Command implements ExternalCommand, CommandInf
 
     /** {@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 < 1) {
             sendLine(origin, isSilent, FORMAT_ERROR,

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

@@ -52,7 +52,7 @@ public final class KickReason extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
         if (args.getArguments().length == 0) {

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

@@ -53,7 +53,7 @@ public final class Mode extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
         final ChannelInfo cChannel = channel.getChannelInfo();
@@ -68,7 +68,7 @@ public final class Mode extends Command 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

@@ -54,7 +54,7 @@ public class Names extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
         channel.getServer().getParser().sendRawMessage("NAMES "
@@ -64,7 +64,7 @@ public class Names extends Command 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) {
         server.getParser().sendRawMessage("NAMES " + channel);
     }

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

@@ -46,7 +46,7 @@ public final class Part extends Command implements CommandInfo {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
         channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()

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

@@ -53,7 +53,7 @@ public final class SetNickColour extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
 

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

@@ -50,7 +50,7 @@ public final class ShowTopic extends Command implements ExternalCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
         if (args.getArguments().length == 0) {
@@ -72,7 +72,7 @@ public final class ShowTopic extends Command 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

@@ -36,7 +36,6 @@ import com.dmdirc.util.validators.ValidationResponse;
 
 /**
  * The me command sends a CTCP action to the current channel.
- * @author chris
  */
 public final class Me extends Command implements ValidatingCommand, CommandInfo {
 
@@ -47,9 +46,9 @@ public final class Me extends Command implements ValidatingCommand, CommandInfo
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final MessageTarget<?> target = ((ChatCommandContext) context).getChat();
+        final MessageTarget target = ((ChatCommandContext) context).getChat();
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "me", "<action>");
         } else {
@@ -93,7 +92,7 @@ public final class Me extends Command implements ValidatingCommand, CommandInfo
         final int length = 2 + arguments.getArgumentsAsString().length();
 
         if (origin.getContainer().getServer().getParser().getMaxLength("PRIVMSG",
-                origin.getContainer().toString()) <= length) {
+                origin.getContainer().getName()) <= length) {
             return new ValidationResponse("Too long");
         } else {
             return new ValidationResponse();

src/com/dmdirc/commandparser/commands/context/ChatCommandContext.java

@@ -30,12 +30,11 @@ import com.dmdirc.ui.interfaces.Window;
  * A command context specific to chat windows.
  *
  * @since 0.6.4
- * @author chris
  */
 public class ChatCommandContext extends ServerCommandContext {
 
     /** The chat container associated with this context. */
-    private final MessageTarget<?> chat;
+    private final MessageTarget chat;
 
     /**
      * Creates a new chat command context.
@@ -45,7 +44,7 @@ public class ChatCommandContext extends ServerCommandContext {
      * @param chat The chat container associated with the command
      */
     public ChatCommandContext(final Window source, final CommandInfo commandInfo,
-            final MessageTarget<?> chat) {
+            final MessageTarget chat) {
         super(source, commandInfo, chat.getServer());
         this.chat = chat;
     }
@@ -55,7 +54,7 @@ public class ChatCommandContext extends ServerCommandContext {
      *
      * @return This context's associated container
      */
-    public MessageTarget<?> getChat() {
+    public MessageTarget getChat() {
         return chat;
     }
 }

src/com/dmdirc/commandparser/commands/flags/CommandFlagHandler.java

@@ -71,7 +71,7 @@ public class CommandFlagHandler {
      * @return A corresponding {@link CommandFlagResult} object, or null
      * if some problem was encountered.
      */
-    public CommandFlagResult process(final FrameContainer<?> origin,
+    public CommandFlagResult process(final FrameContainer origin,
             final CommandArguments arguments) {
         final Map<CommandFlag, Integer> results = parse(origin, arguments);
 
@@ -88,7 +88,7 @@ public class CommandFlagHandler {
      * first argument within the <code>arguments</code> object. If an error
      * occurs, null is returned.
      */
-    protected Map<CommandFlag, Integer> parse(final FrameContainer<?> origin,
+    protected Map<CommandFlag, Integer> parse(final FrameContainer origin,
             final CommandArguments arguments) {
         enabledFlags.clear();
         disabledBy.clear();
@@ -171,7 +171,7 @@ public class CommandFlagHandler {
      */
     protected int readArguments(final CommandFlag flag,
             final CommandArguments arguments, final int offset, final int argCount,
-            final FrameContainer<?> origin, final Map<CommandFlag, Integer> results) {
+            final FrameContainer origin, final Map<CommandFlag, Integer> results) {
         final int lastArg = argCount + offset - 1;
 
         if (arguments.getArguments().length <= lastArg) {
@@ -251,7 +251,7 @@ public class CommandFlagHandler {
      * @param messageType The type of the line to be sent
      * @param args The arguments for the specified messageType
      */
-    protected static void sendLine(final FrameContainer<?> origin, final boolean isSilent,
+    protected static void sendLine(final FrameContainer origin, final boolean isSilent,
             final String messageType, final Object ... args) {
         if (origin != null && !isSilent) {
             origin.addLine(messageType, args);

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

@@ -50,14 +50,14 @@ public final class Active extends Command implements IntelligentCommand,
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final String command = args.getArgumentsAsString();
         
-        final FrameContainer<?> window = WindowManager.getActiveWindow();
+        final FrameContainer window = WindowManager.getActiveWindow();
         
-        if (window instanceof WritableFrameContainer<?>) {
-            ((WritableFrameContainer<?>) window).getCommandParser()
+        if (window instanceof WritableFrameContainer) {
+            ((WritableFrameContainer) window).getCommandParser()
                     .parseCommand(window, context.getSource(), command);
         }
     }

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

@@ -54,7 +54,7 @@ public final class AliasCommand extends Command implements
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length < 2) {
             showUsage(origin, args.isSilent(), "alias", "[--remove] <name> [command]");

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

@@ -48,7 +48,7 @@ public final class AllServers extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final String command = args.getArgumentsAsString();
 

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

@@ -48,7 +48,7 @@ public final class Clear extends Command implements IntelligentCommand,
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         origin.getDocument().clear();
     }

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

@@ -72,7 +72,7 @@ public final class Echo extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final CommandFlagResult results = handler.process(origin, args);
 
@@ -92,12 +92,12 @@ public final class Echo extends Command implements IntelligentCommand,
 
         if (results.hasFlag(activeFlag)) {
             if (!args.isSilent()) {
-                final FrameContainer<?> frame = WindowManager.getActiveWindow();
+                final FrameContainer frame = WindowManager.getActiveWindow();
                 frame.addLine(FORMAT_OUTPUT, time, results.getArgumentsAsString());
             }
         } else if (results.hasFlag(targetFlag)) {
-            FrameContainer<?> frame = null;
-            FrameContainer<?> target = origin;
+            FrameContainer frame = null;
+            FrameContainer target = origin;
 
             while (frame == null && target != null) {
                 frame = WindowManager.findCustomWindow(target,
@@ -159,7 +159,7 @@ public final class Echo extends Command implements IntelligentCommand,
                 || (arg == 3 && context.getPreviousArgs().get(2).equals("--target")
                 && context.getPreviousArgs().get(0).equals("--ts"))) {
 
-            final List<FrameContainer<?>> windowList = new ArrayList<FrameContainer<?>>();
+            final List<FrameContainer> windowList = new ArrayList<FrameContainer>();
             final Server currentServer = context.getWindow().getContainer()
                     .getServer();
 
@@ -173,7 +173,7 @@ public final class Echo extends Command implements IntelligentCommand,
 
             //Global Windows
             windowList.addAll(WindowManager.getRootWindows());
-            for (FrameContainer<?> customWindow : windowList) {
+            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 Command implements CommandInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         Main.quit(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "closemessage"));

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

@@ -57,7 +57,7 @@ public final class Help extends Command implements IntelligentCommand, CommandIn
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showAllCommands(origin, args.isSilent());
@@ -72,8 +72,8 @@ public final class Help extends Command implements IntelligentCommand, CommandIn
      * @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)
+    private void showAllCommands(final FrameContainer origin, final boolean isSilent) {
+        final List<String> commands = new ArrayList<String>(((WritableFrameContainer) origin)
                 .getCommandParser().getCommands().keySet());
 
         Collections.sort(commands);
@@ -109,7 +109,7 @@ public final class Help extends Command implements IntelligentCommand, CommandIn
      * @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

@@ -54,7 +54,7 @@ public final class Ifplugin extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length <= 1) {
             showUsage(origin, args.isSilent(), "ifplugin", "<[!]plugin> <command>");
@@ -78,7 +78,7 @@ public final class Ifplugin extends Command implements IntelligentCommand,
                 GlobalCommandParser.getGlobalCommandParser().parseCommand(null,
                         context.getSource(), args.getArgumentsAsString(1));
             } else {
-                ((WritableFrameContainer<?>) origin).getCommandParser()
+                ((WritableFrameContainer) origin).getCommandParser()
                         .parseCommand(origin, context.getSource(), args.getArgumentsAsString(1));
             }
         }

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

@@ -50,7 +50,7 @@ public class Input extends Command implements IntelligentCommand, CommandInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "input",

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

@@ -41,7 +41,7 @@ public final class LoadPlugin extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "loadplugin", "<plugin>");

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

@@ -59,7 +59,7 @@ public final class NewServer extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         URI address = null;
 
@@ -137,7 +137,7 @@ public final class NewServer extends Command implements IntelligentCommand,
      *
      * @return URI is input was valid
      */
-    public static URI parseInput(final FrameContainer<?> origin, final boolean isSilent,
+    public static URI parseInput(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
 
         boolean ssl = false;

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

@@ -52,7 +52,7 @@ public final class Notify extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "notify", "<colour>");

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

@@ -49,10 +49,10 @@ public class OpenWindow extends Command implements IntelligentCommand, CommandIn
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         int start = 0;
-        FrameContainer<?> parent = null;
+        FrameContainer parent = null;
 
         if (args.getArguments().length > 0 && "--server".equals(args.getArguments()[0])) {
             if (origin.getServer() == null) {
@@ -72,7 +72,7 @@ public class OpenWindow extends Command implements IntelligentCommand, CommandIn
             showUsage(origin, args.isSilent(), "openwindow",
                     "[--server|--child] <name> [title]");
         } else {
-            final FrameContainer<?> window;
+            final FrameContainer window;
 
             if (parent == null) {
                 window = WindowManager.findCustomWindow(args.getArguments()[start]);

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

@@ -49,7 +49,7 @@ public final class ReloadActions extends Command implements IntelligentCommand,
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         ActionManager.getActionManager().loadUserActions();
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Actions reloaded.");

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

@@ -49,7 +49,7 @@ public class ReloadIdentities extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override    
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         IdentityManager.loadUser();
         

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

@@ -50,7 +50,7 @@ public final class ReloadPlugin extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "reloadplugin", "<plugin>");

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

@@ -49,7 +49,7 @@ public final class SaveConfig extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         IdentityManager.save();
 

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

@@ -77,7 +77,7 @@ public final class Set extends Command implements IntelligentCommand, CommandInf
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final CommandFlagResult res = handler.process(origin, args);
 
@@ -152,7 +152,7 @@ public final class Set extends Command implements IntelligentCommand, CommandInf
      * @param isSilent Whether or not the command is being silenced or not
      * @param manager The config manager to use to retrieve data
      */
-    private void doDomainList(final FrameContainer<?> origin, final boolean isSilent,
+    private void doDomainList(final FrameContainer origin, final boolean isSilent,
             final ConfigManager manager) {
         final StringBuffer output = new StringBuffer(67);
 
@@ -176,7 +176,7 @@ public final class Set extends Command implements IntelligentCommand, CommandInf
      * @param manager The config manager to use to retrieve data
      * @param domain The domain to be inspected
      */
-    private void doOptionsList(final FrameContainer<?> origin,
+    private void doOptionsList(final FrameContainer origin,
             final boolean isSilent, final ConfigManager manager, final String domain) {
         final StringBuffer output = new StringBuffer(24);
 
@@ -209,7 +209,7 @@ public final class Set extends Command implements IntelligentCommand, CommandInf
      * @param domain The domain of the option
      * @param option The name of the option
      */
-    private void doShowOption(final FrameContainer<?> origin,
+    private void doShowOption(final FrameContainer origin,
             final boolean isSilent, final ConfigManager manager,
             final String domain, final String option) {
         if (manager.hasOptionString(domain, option)) {
@@ -230,7 +230,7 @@ public final class Set extends Command implements IntelligentCommand, CommandInf
      * @param option The name of the option
      * @param newvalue The value the option should be set to
      */
-    private void doSetOption(final FrameContainer<?> origin,
+    private void doSetOption(final FrameContainer origin,
             final boolean isSilent, final Identity identity,
             final String domain, final String option, final String newvalue) {
         identity.setOption(domain, option, newvalue);
@@ -250,7 +250,7 @@ public final class Set extends Command implements IntelligentCommand, CommandInf
      * @param option The name of the option
      * @param data The data to be appended
      */
-    private void doAppendOption(final FrameContainer<?> origin,
+    private void doAppendOption(final FrameContainer origin,
             final boolean isSilent, final Identity identity, final ConfigManager manager,
             final String domain, final String option, final String data) {
         doSetOption(origin, isSilent, identity, domain, option,
@@ -267,7 +267,7 @@ public final class Set extends Command implements IntelligentCommand, CommandInf
      * @param domain The domain of the option
      * @param option The name of the option
      */
-    private void doUnsetOption(final FrameContainer<?> origin,
+    private void doUnsetOption(final FrameContainer origin,
             final boolean isSilent, final Identity identity, final String domain,
             final String option) {
         identity.unsetOption(domain, option);

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

@@ -50,7 +50,7 @@ public final class UnloadPlugin extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "unloadplugin", "<plugin>");

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

@@ -49,7 +49,7 @@ public final class AllChannels extends Command implements IntelligentCommand,
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         final String command = args.getArgumentsAsString();

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

@@ -48,7 +48,7 @@ public final class Away extends Command implements CommandInfo {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         final String line = args.getArgumentsAsString();

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

@@ -50,7 +50,7 @@ public final class Back extends Command implements IntelligentCommand, CommandIn
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         server.getParser().getLocalClient().setBack();

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

@@ -51,7 +51,7 @@ public final class ChangeServer extends Command implements CommandInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         URI address = null;

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

@@ -52,7 +52,7 @@ public final class Ctcp extends Command implements IntelligentCommand,
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         if (args.getArguments().length < 2) {

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

@@ -46,7 +46,7 @@ public final class Disconnect extends Command implements CommandInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         final String line;

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

@@ -55,7 +55,7 @@ public final class Ignore extends Command implements IntelligentCommand,
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
 
@@ -70,7 +70,7 @@ public final class Ignore extends Command implements IntelligentCommand,
         }
     }
 
-    protected void executeView(final FrameContainer<?> origin, final Server server,
+    protected void executeView(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args, final boolean forceRegex) {
         final IgnoreList ignoreList = server.getIgnoreList();
 
@@ -97,7 +97,7 @@ public final class Ignore extends Command implements IntelligentCommand,
         }
     }
 
-    protected void executeAdd(final FrameContainer<?> origin, final Server server,
+    protected void executeAdd(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         final IgnoreList ignoreList = server.getIgnoreList();
         final String target = args.getArgumentsAsString();
@@ -107,7 +107,7 @@ public final class Ignore extends Command implements IntelligentCommand,
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Added " + target + " to the ignore list.");
     }
 
-    protected void executeRegex(final FrameContainer<?> origin, final Server server,
+    protected void executeRegex(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 1) {
             executeView(origin, server, args.isSilent(), args, true);
@@ -130,7 +130,7 @@ public final class Ignore extends Command implements IntelligentCommand,
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Added " + target + " to the ignore list.");
     }
 
-    protected void executeRemove(final FrameContainer<?> origin, final Server server,
+    protected void executeRemove(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 1) {
             showUsage(origin, args.isSilent(), "ignore", "--remove <host>");

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

@@ -53,8 +53,8 @@ public class JoinChannelCommand extends Command implements
         ActionListener, IntelligentCommand, CommandInfo {
 
     /** A map of channel name mentions. */
-    private final MapList<FrameContainer<?>, String> mentions
-            = new MapList<FrameContainer<?>, String>();
+    private final MapList<FrameContainer, String> mentions
+            = new MapList<FrameContainer, String>();
 
     /**
      * Creates a new instance of the join channel command.
@@ -68,7 +68,7 @@ public class JoinChannelCommand extends Command implements
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         if (args.getArguments().length == 0) {
@@ -121,7 +121,7 @@ public class JoinChannelCommand extends Command implements
     @Override
     public void processEvent(final ActionType type, final StringBuffer format,
             final Object... arguments) {
-        final FrameContainer<?> source = (FrameContainer<?>) arguments[0];
+        final FrameContainer source = (FrameContainer) arguments[0];
         final String message = (String) arguments[1];
 
         final String[] parts = source.getStyliser().doLinks(message)
@@ -138,7 +138,7 @@ public class JoinChannelCommand extends Command implements
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
-        final FrameContainer<?> source = context.getWindow().getContainer();
+        final FrameContainer source = context.getWindow().getContainer();
         final Server server = source.getServer();
         final List<String> results = checkSource(source, true, true);
 
@@ -184,7 +184,7 @@ public class JoinChannelCommand extends Command implements
      * @return A list of channel names which have been mentioned in the hierarchy
      * @since 0.6.4
      */
-    protected List<String> checkSource(final FrameContainer<?> source,
+    protected List<String> checkSource(final FrameContainer source,
             final boolean checkParents, final boolean checkChildren) {
         final List<String> results = new ArrayList<String>();
 
@@ -200,7 +200,7 @@ public class JoinChannelCommand extends Command implements
 
         // Check the children window
         if (checkChildren) {
-            for (FrameContainer<?> child : source.getChildren()) {
+            for (FrameContainer child : source.getChildren()) {
                 results.addAll(checkSource(child, false, true));
             }
         }

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

@@ -55,7 +55,7 @@ public final class Message extends Command implements IntelligentCommand,
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         if (args.getArguments().length < 2) {

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

@@ -52,7 +52,7 @@ public final class Nick extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         if (args.getArguments().length == 0) {

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

@@ -52,7 +52,7 @@ public final class Notice extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         if (args.getArguments().length < 2) {

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

@@ -54,7 +54,7 @@ public final class OpenQuery extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         if (args.getArguments().length == 0) {

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

@@ -49,7 +49,7 @@ public final class Raw extends Command implements CommandInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         final String line = args.getArgumentsAsString();

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

@@ -57,7 +57,7 @@ public final class RawServerCommand extends Command implements CommandInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         server.getParser().sendRawMessage(myName.toUpperCase() + " " + args.getArgumentsAsString());

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

@@ -46,7 +46,7 @@ public final class Reconnect extends Command implements CommandInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         final String line;

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

@@ -51,7 +51,7 @@ public class ServerSettings extends Command implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         context.getSource().getController().showServerSettingsDialog(
                 ((ServerCommandContext) context).getServer());

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

@@ -50,7 +50,7 @@ public class Umode extends Command implements CommandInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Server server = ((ServerCommandContext) context).getServer();
         if (server.getState() != ServerState.CONNECTED) {

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

@@ -63,7 +63,7 @@ public class ChannelCommandParser extends ChatCommandParser {
 
     /** {@inheritDoc} */
     @Override
-    public void setOwner(final FrameContainer<?> owner) {
+    public void setOwner(final FrameContainer owner) {
         if (channel == null) {
             channel = (Channel) owner;
         }
@@ -80,7 +80,7 @@ public class ChannelCommandParser extends ChatCommandParser {
 
     /** {@inheritDoc} */
     @Override
-    protected void executeCommand(final FrameContainer<?> origin,
+    protected void executeCommand(final FrameContainer origin,
             final Window window, final CommandInfo commandInfo,
             final Command command, final CommandArguments args) {
         if (commandInfo.getType() == CommandType.TYPE_CHANNEL) {

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

@@ -49,7 +49,7 @@ public class ChatCommandParser extends ServerCommandParser {
     private static final long serialVersionUID = 1;
 
     /** The container that owns this parser. */
-    private MessageTarget<?> owner;
+    private MessageTarget owner;
 
     /**
      * Creates a new chat command parser that belongs to a child of the
@@ -63,15 +63,15 @@ public class ChatCommandParser extends ServerCommandParser {
 
     /** {@inheritDoc} */
     @Override
-    public void setOwner(final FrameContainer<?> owner) {
+    public void setOwner(final FrameContainer owner) {
         if (this.owner == null) {
-            this.owner = (MessageTarget<?>) owner;
+            this.owner = (MessageTarget) owner;
         }
     }
 
     /** {@inheritDoc} */
     @Override
-    protected void executeCommand(final FrameContainer<?> origin,
+    protected void executeCommand(final FrameContainer origin,
             final Window window, final CommandInfo commandInfo,
             final Command command, final CommandArguments args) {
         if (commandInfo.getType() == CommandType.TYPE_CHAT) {
@@ -83,7 +83,7 @@ public class ChatCommandParser extends ServerCommandParser {
 
     /** {@inheritDoc} */
     @Override
-    protected void handleNonCommand(final FrameContainer<?> origin, final String line) {
+    protected void handleNonCommand(final FrameContainer origin, final String line) {
         owner.sendLine(line);
     }
 

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

@@ -85,7 +85,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();
@@ -131,7 +131,7 @@ public abstract class CommandParser implements Serializable {
      * as a channel name
      * @since 0.6.4
      */
-    public final void parseCommand(final FrameContainer<?> origin,
+    public final void parseCommand(final FrameContainer origin,
             final Window window, final String line, final boolean parseChannel) {
         final CommandArguments args = new CommandArguments(line);
 
@@ -166,7 +166,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 Window window, final CommandArguments args, final boolean parseChannel) {
         final boolean silent = args.isSilent();
         final String command = args.getCommandName();
@@ -257,7 +257,7 @@ public abstract class CommandParser implements Serializable {
      * @param line The line to be parsed
      * @since 0.6.4
      */
-    public final void parseCommand(final FrameContainer<?> origin,
+    public final void parseCommand(final FrameContainer origin,
             final Window window, final String line) {
         parseCommand(origin, window, line, true);
     }
@@ -268,7 +268,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);
     }
 
@@ -282,7 +282,7 @@ public abstract class CommandParser implements Serializable {
      * @param args The arguments to the command
      * @since 0.6.4
      */
-    protected abstract void executeCommand(final FrameContainer<?> origin,
+    protected abstract void executeCommand(final FrameContainer origin,
             final Window window, final CommandInfo commandInfo,
             final Command command, final CommandArguments args);
 
@@ -295,7 +295,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.getActionManager().triggerEvent(
@@ -319,7 +319,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

@@ -53,7 +53,7 @@ public class GlobalCommandParser extends CommandParser {
 
     /** {@inheritDoc} */
     @Override
-    public void setOwner(final FrameContainer<?> owner) {
+    public void setOwner(final FrameContainer owner) {
         // Don't care
     }
 
@@ -77,7 +77,7 @@ public class GlobalCommandParser extends CommandParser {
 
     /** {@inheritDoc} */
     @Override
-    protected void executeCommand(final FrameContainer<?> origin,
+    protected void executeCommand(final FrameContainer origin,
             final Window window, final CommandInfo commandInfo,
             final Command command, final CommandArguments args) {
         command.execute(origin, args, new CommandContext(window, commandInfo));
@@ -90,7 +90,7 @@ public 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

@@ -63,7 +63,7 @@ public class QueryCommandParser extends ChatCommandParser {
 
     /** {@inheritDoc} */
     @Override
-    public void setOwner(final FrameContainer<?> owner) {
+    public void setOwner(final FrameContainer owner) {
         if (query == null) {
             query = (Query) owner;
         }
@@ -80,7 +80,7 @@ public class QueryCommandParser extends ChatCommandParser {
 
     /** {@inheritDoc} */
     @Override
-    protected void executeCommand(final FrameContainer<?> origin,
+    protected void executeCommand(final FrameContainer origin,
             final Window window, final CommandInfo commandInfo,
             final Command command, final CommandArguments args) {
         if (commandInfo.getType() == CommandType.TYPE_QUERY) {

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

@@ -54,7 +54,7 @@ public class ServerCommandParser extends GlobalCommandParser {
 
     /** {@inheritDoc} */
     @Override
-    public void setOwner(final FrameContainer<?> owner) {
+    public void setOwner(final FrameContainer owner) {
         if (server == null && owner instanceof Server) {
             server = (Server) owner;
         }
@@ -70,7 +70,7 @@ public class ServerCommandParser extends GlobalCommandParser {
 
     /** {@inheritDoc} */
     @Override
-    protected void executeCommand(final FrameContainer<?> origin,
+    protected void executeCommand(final FrameContainer origin,
             final Window window, final CommandInfo commandInfo,
             final Command command, final CommandArguments args) {
         if (commandInfo.getType() == CommandType.TYPE_SERVER) {
@@ -96,7 +96,7 @@ public class ServerCommandParser extends GlobalCommandParser {
      * @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/interfaces/FrameCloseListener.java

@@ -39,6 +39,6 @@ public interface FrameCloseListener {
      *
      * @param window The window which is being closed
      */
-    void windowClosing(final FrameContainer<?> window);
+    void windowClosing(final FrameContainer window);
 
 }

src/com/dmdirc/interfaces/FrameInfoListener.java

@@ -31,7 +31,6 @@ import java.util.EventListener;
  * receive information about frame icon or title changes.
  *
  * @since 0.6.3m2
- * @author Chris
  */
 public interface FrameInfoListener extends EventListener {
 
@@ -41,7 +40,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 +48,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 +56,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

@@ -29,8 +29,6 @@ import java.util.EventListener;
 /**
  * Defines the methods that should be implemented by classes which wish to
  * receive information about frame selection changes.
- *
- * @author Chris
  */
 public interface SelectionListener extends EventListener {
 
@@ -39,6 +37,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

@@ -47,8 +47,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
 public class WindowManager {
 
     /** A list of root windows. */
-    private static final List<FrameContainer<?>> ROOT_WINDOWS
-            = new CopyOnWriteArrayList<FrameContainer<?>>();
+    private static final List<FrameContainer> ROOT_WINDOWS
+            = new CopyOnWriteArrayList<FrameContainer>();
 
     /** A list of frame listeners. */
     private static final List<FrameListener> FRAME_LISTENERS
@@ -63,7 +63,7 @@ public class WindowManager {
             = new WMSelectionListener();
 
     /** Active window. */
-    private static FrameContainer<?> activeWindow;
+    private static FrameContainer activeWindow;
 
     /**
      * Creates a new instance of WindowManager.
@@ -132,7 +132,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 +147,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(!ROOT_WINDOWS.contains(window));
 
@@ -168,8 +168,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);
     }
 
@@ -186,8 +186,8 @@ public class WindowManager {
         "The specified parent is in the window hierarchy already",
         "The specified child is NOT in the window hierarchy already"
     })
-    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(isInHierarchy(parent));
         Logger.assertTrue(child != null);
@@ -209,7 +209,7 @@ public class WindowManager {
      * @param target The container to be tested
      * @return True if the target is in the hierarchy, false otherise
      */
-    protected static boolean isInHierarchy(final FrameContainer<?> target) {
+    protected static boolean isInHierarchy(final FrameContainer target) {
         return target != null && (ROOT_WINDOWS.contains(target)
                 || isInHierarchy(target.getParent()));
     }
@@ -233,7 +233,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);
     }
 
@@ -252,7 +252,7 @@ public class WindowManager {
         "The specified window is not null",
         "The specified window is in the window hierarchy"
     })
-    public static void removeWindow(final FrameContainer<?> window, final boolean canWait) {
+    public static void removeWindow(final FrameContainer window, final boolean canWait) {
         Logger.assertTrue(isInHierarchy(window));
         Logger.assertTrue(window != null);
 
@@ -268,7 +268,7 @@ public class WindowManager {
                 return;
             }
 
-            for (FrameContainer<?> child : window.getChildren()) {
+            for (FrameContainer child : window.getChildren()) {
                 child.close();
             }
 
@@ -287,7 +287,7 @@ public class WindowManager {
                 fireSelectionChanged(null);
             }
         } else {
-            final FrameContainer<?> parent = window.getParent();
+            final FrameContainer parent = window.getParent();
             fireDeleteWindow(parent, window);
 
             if (parent == null) {
@@ -313,7 +313,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(ROOT_WINDOWS, name);
@@ -332,7 +332,7 @@ 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,
+    public static FrameContainer findCustomWindow(final FrameContainer parent,
             final String name) {
         Logger.assertTrue(parent != null);
         Logger.assertTrue(name != null);
@@ -348,9 +348,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;
@@ -366,7 +366,7 @@ public class WindowManager {
      * @since 0.6.4
      * @return A collection of all known root windows.
      */
-    public static Collection<FrameContainer<?>> getRootWindows() {
+    public static Collection<FrameContainer> getRootWindows() {
         return ROOT_WINDOWS;
     }
 
@@ -376,7 +376,7 @@ public class WindowManager {
      * @return Focused window or null
      * @since 0.6.3
      */
-    public static FrameContainer<?> getActiveWindow() {
+    public static FrameContainer getActiveWindow() {
         return activeWindow;
     }
 
@@ -396,7 +396,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 : FRAME_LISTENERS) {
             listener.addWindow(window, focus);
         }
@@ -410,8 +410,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 : FRAME_LISTENERS) {
             listener.addWindow(parent, child, focus);
         }
@@ -422,7 +422,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 : FRAME_LISTENERS) {
             listener.delWindow(window);
         }
@@ -434,8 +434,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 : FRAME_LISTENERS) {
             listener.delWindow(parent, child);
         }
@@ -447,7 +447,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 : SELECTION_LISTENERS) {
             listener.selectionChanged(window);
         }
@@ -463,7 +463,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/core/components/WindowComponent.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.ui.core.components;
+
+/**
+ * An enumeration of common window components.
+ */
+public enum WindowComponent {
+    
+    /** A small bar to show the current topic/subject and allow editing. */
+    TOPICBAR("com.dmdirc.ui.components.topicbar"),
+    /** A panel to show a list of users or contacts. */
+    USERLIST("com.dmdirc.ui.components.userlist"),
+    /** A large text area for generic output. */
+    TEXTAREA("com.dmdirc.ui.components.textarea"),
+    /** An input field for user input or commands. */
+    INPUTFIELD("com.dmdirc.ui.components.inputfield"),
+    /** A component to show details of or problems with a certificate. */
+    CERTIFICATE_VIEWER("com.dmdirc.ui.components.certificateviewer"),;
+    
+    /** The identifier for this window component. */
+    private final String identifier;
+
+    /**
+     * Creates a new WindowComponent.
+     *
+     * @param identifier The identifier for this window component
+     */
+    private WindowComponent(final String identifier) {
+        this.identifier = identifier;
+    }
+
+    /**
+     * Gets the identifier for this component.
+     *
+     * @return This component's identifier
+     */
+    public String getIdentifier() {
+        return identifier;
+    }
+
+}

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

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.interfaces;
-
-/**
- * Specifies the standard interface for a channel window.
- */
-public interface ChannelWindow extends InputWindow {
-
-}

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

@@ -36,14 +36,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.
@@ -52,7 +52,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.
@@ -60,6 +60,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

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

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

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.interfaces;
-
-/**
- * Defines the standard interface for a query window.
- */
-public interface QueryWindow extends InputWindow {
-
-}

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

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.interfaces;
-
-/**
- * Lists the standard methods that should be implemented by any server window.
- */
-public interface ServerWindow extends InputWindow {
-    
-}

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

@@ -25,7 +25,6 @@ package com.dmdirc.ui.interfaces;
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 
 import java.net.URI;
 
@@ -40,13 +39,6 @@ public interface UIController {
      */
     void showFirstRunWizard();
 
-    /**
-     * Shows the SSL certificate information dialog.
-     *
-     * @param model The dialog model to use
-     */
-    void showSSLCertificateDialog(SSLCertificateDialogModel model);
-
     /**
      * Shows a channel settigns dialog for specified channel.
      *

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

@@ -35,7 +35,7 @@ public interface Window {
      *
      * @return The container that owns this command window.
      */
-    FrameContainer<?> getContainer();
+    FrameContainer getContainer();
 
     /**
      * Opens this window.

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

@@ -150,7 +150,7 @@ public class Styliser implements ConfigChangeListener {
      *
      * @param owner The {@link FrameContainer} that owns this styliser.
      */
-    public Styliser(final FrameContainer<?> owner) {
+    public Styliser(final FrameContainer owner) {
         this(owner.getServer(), owner.getConfigManager());
     }
 

test/com/dmdirc/WritableFrameContainerTest.java

@@ -41,8 +41,8 @@ public class WritableFrameContainerTest {
     
     @Test
     public void testGetNumLines() {
-        final WritableFrameContainer<?> container10
-                = new TestWritableFrameContainer<InputWindow>(10, InputWindow.class);
+        final WritableFrameContainer container10
+                = new TestWritableFrameContainer(10, InputWindow.class);
         
         final int res0a = container10.getNumLines("");
         final int res0b = container10.getNumLines("\r");
@@ -71,8 +71,8 @@ public class WritableFrameContainerTest {
 
     @Test
     public void testSplitLine() {
-        final WritableFrameContainer<?> container10
-                = new TestWritableFrameContainer<InputWindow>(10, InputWindow.class);
+        final WritableFrameContainer container10
+                = new TestWritableFrameContainer(10, InputWindow.class);
         final String[][][] tests = new String[][][]{
             {{""}, {""}},
             {{"0123456789"}, {"0123456789"}},

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

@@ -46,7 +46,7 @@ public class BanTest {
 
     @Test
     public void testUsage() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         final Channel channel = mock(Channel.class);
         command.execute(tiw, new CommandArguments("/ban"),
                 new ChannelCommandContext(null, command, channel));
@@ -57,7 +57,7 @@ public class BanTest {
     /** Tests that the ban command uses the correct hostname if given a user. */
     @Test
     public void testKnownUser() {
-        final FrameContainer<?> container = mock(FrameContainer.class);
+        final FrameContainer container = mock(FrameContainer.class);
         final ChannelInfo channelInfo = mock(ChannelInfo.class);
         final ChannelClientInfo ccInfo = mock(ChannelClientInfo.class);
         final ClientInfo clientInfo = mock(ClientInfo.class);
@@ -78,7 +78,7 @@ public class BanTest {
     /** Tests that the ban command works if given a mask not a username. */
     @Test
     public void testHostmask() {
-        final FrameContainer<?> container = mock(FrameContainer.class);
+        final FrameContainer container = mock(FrameContainer.class);
         final ChannelInfo channelInfo = mock(ChannelInfo.class);
         final Channel channel = mock(Channel.class);
 

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

@@ -46,7 +46,7 @@ public class KickReasonTest {
 
     @Test
     public void testUsage() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         final Channel channel = mock(Channel.class);
         command.execute(tiw, new CommandArguments("/kick"),
                 new ChannelCommandContext(null, command, channel));
@@ -56,7 +56,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);
 
@@ -71,7 +71,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);
@@ -87,7 +87,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

@@ -68,7 +68,7 @@ public class ModeTest {
 
     @Test
     public void testWithoutArgs() {
-        final FrameContainer<?> origin = mock(FrameContainer.class);
+        final FrameContainer origin = mock(FrameContainer.class);
         
         command.execute(origin, new CommandArguments("/mode"),
                 new ChannelCommandContext(null, command, channel));
@@ -78,7 +78,7 @@ public class ModeTest {
 
     @Test
     public void testWithArgs() {
-        final FrameContainer<?> origin = mock(FrameContainer.class);
+        final FrameContainer origin = mock(FrameContainer.class);
 
         command.execute(origin, new CommandArguments("/mode +hello -bye"),
                 new ChannelCommandContext(null, command, channel));
@@ -88,7 +88,7 @@ public class ModeTest {
 
     @Test
     public void testExternalWithArgs() {
-        final FrameContainer<?> origin = mock(FrameContainer.class);
+        final FrameContainer origin = mock(FrameContainer.class);
 
         command.execute(origin, new CommandArguments("/mode +hello -bye"),
                 new ChannelCommandContext(null, command, channel));
@@ -98,7 +98,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

@@ -39,7 +39,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

@@ -50,7 +50,7 @@ public class SetNickColourTest {
 
     @Test
     public void testUsageNoArgs() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo"),
                 new ChannelCommandContext(null, command, channel));
         
@@ -59,7 +59,7 @@ public class SetNickColourTest {
     
     @Test
     public void testUsageNicklist() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo --nicklist"),
                 new ChannelCommandContext(null, command, channel));
         
@@ -68,7 +68,7 @@ public class SetNickColourTest {
     
     @Test
     public void testUsageText() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo --text"),
                 new ChannelCommandContext(null, command, channel));
         

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

@@ -49,7 +49,7 @@ public class MeTest {
 
     @Test
     public void testUsage() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo"),
                 new ChatCommandContext(null, command, mtt));
         

test/com/dmdirc/commandparser/commands/flags/CommandFlagHandlerTest.java

@@ -71,7 +71,7 @@ public class CommandFlagHandlerTest {
     
     @Test
     public void testParse() {
-        final FrameContainer<?> container = mock(FrameContainer.class);
+        final FrameContainer container = mock(FrameContainer.class);
         
         final Map<CommandFlag, Integer> results
                 = handler.parse(container, new CommandArguments(input));

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

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

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

@@ -41,7 +41,7 @@ public class IfpluginTest {
 
     @Test
     public void testUsageNoArgs() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo"),
                 new CommandContext(null, command));
 
@@ -50,7 +50,7 @@ public class IfpluginTest {
 
     @Test
     public void testUsageOneArg() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo bar"),
                 new CommandContext(null, command));
 

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

@@ -41,7 +41,7 @@ public class NewServerTest {
 
     @Test
     public void testUsageNoArgs() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo"),
                 new CommandContext(null, command));
         
@@ -50,7 +50,7 @@ public class NewServerTest {
     
     @Test
     public void testInvalidPort() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo foo:abc"),
                 new CommandContext(null, command));
         
@@ -59,7 +59,7 @@ public class NewServerTest {
     
     @Test
     public void testOutOfRangePort1() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo foo:0"),
                 new CommandContext(null, command));
         
@@ -68,7 +68,7 @@ public class NewServerTest {
     
     @Test
     public void testOutOfRangePort2() {
-        final FrameContainer<?> tiw = mock(FrameContainer.class);
+        final FrameContainer tiw = mock(FrameContainer.class);
         command.execute(tiw, new CommandArguments("/foo foo:65537"),
                 new CommandContext(null, command));
         

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

@@ -38,7 +38,7 @@ import static org.mockito.Mockito.*;
 public class ChangeServerTest {
 
     private final ChangeServer command = new ChangeServer();
-    private FrameContainer<?> tiw;
+    private FrameContainer tiw;
     private Identity profile;
     private Server server;
     

test/com/dmdirc/harness/TestCommandParser.java

@@ -50,7 +50,7 @@ public class TestCommandParser extends CommandParser {
     }
 
     @Override
-    protected void executeCommand(FrameContainer<?> origin, Window window,
+    protected void executeCommand(FrameContainer origin, Window window,
             CommandInfo commandInfo, Command command, CommandArguments args) {
         executedCommand = command;
         wasSilent = args.isSilent();
@@ -58,18 +58,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

@@ -27,22 +27,24 @@ import com.dmdirc.WritableFrameContainer;
 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;
+import java.util.Collections;
 
-public class TestWritableFrameContainer<T extends InputWindow> extends WritableFrameContainer<T> {
+public class TestWritableFrameContainer extends WritableFrameContainer {
 
     private final int lineLength;
 
     public TestWritableFrameContainer(final int lineLength,
-            final ConfigManager cm, final Class<T> clazz) {
-        super("raw", "Raw", "(Raw)", clazz, cm, GlobalCommandParser.getGlobalCommandParser());
+            final ConfigManager cm, final Class<? extends InputWindow> clazz) {
+        super("raw", "Raw", "(Raw)", clazz, cm,
+                GlobalCommandParser.getGlobalCommandParser(),
+                Collections.<String>emptySet());
 
         this.lineLength = lineLength;
     }
 
-    public TestWritableFrameContainer(final int lineLength, final Class<T> clazz) {
+    public TestWritableFrameContainer(final int lineLength, final Class<? extends InputWindow> clazz) {
         this(lineLength, IdentityManager.getGlobalConfig(), clazz);
     }
 

test/com/dmdirc/ui/WindowManagerTest.java

@@ -43,37 +43,37 @@ public class WindowManagerTest {
     @Test
     public void testAddRoot() {
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
         
         WindowManager.addFrameListener(tfm);
 
-        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), eq(true));
-        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), (FrameContainer<?>) anyObject(), eq(true));
+        verify(tfm, never()).addWindow((FrameContainer) anyObject(), eq(true));
+        verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), eq(true));
         
         WindowManager.addWindow(parent.getContainer());
         
         verify(tfm).addWindow(same(parent.getContainer()), eq(true));
-        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), (FrameContainer<?>) anyObject(), eq(true));
+        verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), eq(true));
     }
 
     @Test
     public void testAddChild() {
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
+        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
         WindowManager.addWindow(parent.getContainer());
         WindowManager.addFrameListener(tfm);
         
         WindowManager.addWindow(parent.getContainer(), child.getContainer());
         
-        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), eq(true));
+        verify(tfm, never()).addWindow((FrameContainer) anyObject(), eq(true));
         verify(tfm).addWindow(same(parent.getContainer()), same(child.getContainer()), eq(true));
     }
 
     @Test
     public void testRemoveRoot() {
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
         WindowManager.addWindow(parent.getContainer());
         WindowManager.addFrameListener(tfm);
 
@@ -85,25 +85,25 @@ public class WindowManagerTest {
     @Test
     public void testRemoveChild() {
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
+        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
         WindowManager.addWindow(parent.getContainer());
         WindowManager.addWindow(parent.getContainer(), child.getContainer());
         WindowManager.addFrameListener(tfm);
 
         WindowManager.removeWindow(child.getContainer());
 
-        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), eq(true));
-        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), (FrameContainer<?>) anyObject(), eq(true));
-        verify(tfm, never()).delWindow((FrameContainer<?>) anyObject());
+        verify(tfm, never()).addWindow((FrameContainer) anyObject(), eq(true));
+        verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), eq(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<DummyInputWindow>(512, DummyInputWindow.class), null);
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
+        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
         WindowManager.addWindow(parent.getContainer());
         
         WindowManager.addFrameListener(tfm);
@@ -111,10 +111,10 @@ public class WindowManagerTest {
         WindowManager.removeFrameListener(tfm);
         WindowManager.addWindow(parent.getContainer(), child.getContainer());
         
-        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), eq(true));
-        verify(tfm, never()).addWindow((FrameContainer<?>) anyObject(), (FrameContainer<?>) anyObject(), eq(true));
-        verify(tfm, never()).delWindow((FrameContainer<?>) anyObject());
-        verify(tfm, never()).delWindow((FrameContainer<?>) anyObject(), (FrameContainer<?>) anyObject());
+        verify(tfm, never()).addWindow((FrameContainer) anyObject(), eq(true));
+        verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), eq(true));
+        verify(tfm, never()).delWindow((FrameContainer) anyObject());
+        verify(tfm, never()).delWindow((FrameContainer) anyObject(), (FrameContainer) anyObject());
     }
     
 }