Plugins support for core frame container changes

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

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

@@ -47,7 +47,7 @@ public final class AudioCommand 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 String filename = args.getArgumentsAsString();
         final File file = new File(filename);

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

@@ -47,7 +47,7 @@ public final class BeepCommand extends Command implements CommandInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         Toolkit.getDefaultToolkit().beep();
     }

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

@@ -34,14 +34,12 @@ import java.text.ParseException;
 /**
  * A command which allows users to evaluate various mathematical expressions,
  * and perform basic calculations.
- *
- * @author chris
  */
 public class CalcCommand extends Command implements CommandInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         try {
             int offset = 0;

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

@@ -26,12 +26,14 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.interfaces.InputWindow;
+import java.util.Arrays;
 
 /**
  * This class links DCC Chat objects to a window.
  */
-public class ChatContainer extends DCCFrameContainer<InputWindow> implements DCCChatHandler {
+public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
 
     /** The DCCChat object we are a window for. */
     private final DCCChat dccChat;
@@ -52,7 +54,9 @@ public class ChatContainer extends DCCFrameContainer<InputWindow> implements DCC
     public ChatContainer(final DCCPlugin plugin, final DCCChat dcc,
             final String title, final String nick, final String targetNick) {
         super(title, "dcc-chat-inactive", InputWindow.class,
-                DCCCommandParser.getDCCCommandParser());
+                DCCCommandParser.getDCCCommandParser(),
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier()));
         this.dccChat = dcc;
         dcc.setHandler(this);
         nickname = nick;

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

@@ -70,7 +70,7 @@ public final class DCCCommand 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) {
             final String target = args.getArguments()[1];
@@ -127,7 +127,7 @@ public final class DCCCommand extends Command implements IntelligentCommand,
      * @param isSilent Is this a silent command
      */
     private void startChat(final Parser parser, final Server server,
-            final FrameContainer<?> origin, final String myNickname,
+            final FrameContainer origin, final String myNickname,
             final String target, final boolean isSilent) {
         final DCCChat chat = new DCCChat();
         if (myPlugin.listen(chat)) {
@@ -158,7 +158,7 @@ public final class DCCCommand extends Command implements IntelligentCommand,
      * @param filename The file to send
      * @since 0.6.3m1
      */
-    public void sendFile(final String target, final FrameContainer<?> origin,
+    public void sendFile(final String target, final FrameContainer origin,
             final Server server, final boolean isSilent, final String filename) {
         // New thread to ask the user what file to send
         final File givenFile = new File(filename);

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

@@ -74,14 +74,14 @@ public final class DCCCommandParser extends GlobalCommandParser {
      * @param line The line input by the user
      */
     @Override
-    protected void handleNonCommand(final FrameContainer<?> origin,
+    protected void handleNonCommand(final FrameContainer origin,
             final String line) {
-        ((WritableFrameContainer<?>) origin).sendLine(line);
+        ((WritableFrameContainer) origin).sendLine(line);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setOwner(final FrameContainer<?> owner) {
+    public void setOwner(final FrameContainer owner) {
         // Don't care
     }
 

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

@@ -29,12 +29,12 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
 
+import java.util.Collection;
+
 /**
  * This class links DCC objects to a window.
- *
- * @param <T> The type of window which corresponds to this DCC frame
  */
-public abstract class DCCFrameContainer<T extends InputWindow> extends WritableFrameContainer<T> {
+public abstract class DCCFrameContainer extends WritableFrameContainer {
 
     /** The Window we're using. */
     private boolean windowClosing = false;
@@ -46,11 +46,13 @@ public abstract class DCCFrameContainer<T extends InputWindow> extends WritableF
      * @param icon The icon to use
      * @param windowClass The class of window to use for this container
      * @param parser Command parser to use for this window
+     * @param components The UI components that this frame requires
      */
     public DCCFrameContainer(final String title, final String icon,
-            final Class<T> windowClass, final CommandParser parser) {
+            final Class<? extends InputWindow> windowClass, final CommandParser parser,
+            final Collection<String> components) {
         super(icon, title, title, windowClass,
-                IdentityManager.getGlobalConfig(), parser);
+                IdentityManager.getGlobalConfig(), parser, components);
     }
 
     /** {@inheritDoc} */

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

@@ -351,7 +351,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
             }
             final String myNickname = ((Server) arguments[0]).getParser()
                     .getLocalClient().getNickname();
-            final DCCFrameContainer<?> f = new ChatContainer(this, chat,
+            final DCCFrameContainer f = new ChatContainer(this, chat,
                     "Chat: " + nickname, myNickname, nickname);
             f.addLine("DCCChatStarting", nickname, chat.getHost(),
                     chat.getPort());
@@ -361,7 +361,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
                     DCCActions.DCC_CHAT_REQUEST, null, ((Server) arguments[0]),
                     nickname);
             askQuestion("User " + nickname + " on "
-                    + ((Server) arguments[0]).toString()
+                    + ((Server) arguments[0]).getName()
                     + " would like to start a DCC Chat with you.\n\n"
                     + "Do you want to continue?",
                     "DCC Chat Request", JOptionPane.YES_OPTION,
@@ -456,7 +456,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
                         DCCActions.DCC_SEND_REQUEST, null,
                         ((Server) arguments[0]), nickname, filename);
                 askQuestion("User " + nickname + " on "
-                        + ((Server) arguments[0]).toString()
+                        + ((Server) arguments[0]).getName()
                         + " would like to send you a file over DCC.\n\nFile: "
                         + filename + "\n\nDo you want to continue?",
                         "DCC Send Request", JOptionPane.YES_OPTION, type,

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

@@ -31,11 +31,12 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.plugins.PluginManager;
 
 import java.awt.Dialog.ModalityType;
+import java.util.Collections;
 
 /**
  * Creates a placeholder DCC Frame.
  */
-public class PlaceholderContainer extends FrameContainer<PlaceholderWindow> {
+public class PlaceholderContainer extends FrameContainer {
 
     /** The plugin which owns this placeholder. */
     private final DCCPlugin plugin;
@@ -47,7 +48,7 @@ public class PlaceholderContainer extends FrameContainer<PlaceholderWindow> {
      */
     public PlaceholderContainer(final DCCPlugin plugin) {
         super("dcc", "DCCs", "DCCs", PlaceholderWindow.class,
-                IdentityManager.getGlobalConfig());
+                IdentityManager.getGlobalConfig(), Collections.<String>emptyList());
 
         this.plugin = plugin;
     }
@@ -56,7 +57,7 @@ public class PlaceholderContainer extends FrameContainer<PlaceholderWindow> {
     @Override
     public void close() {
         int dccs = 0;
-        for (FrameContainer<?> window : getChildren()) {
+        for (FrameContainer window : getChildren()) {
             if ((window instanceof TransferContainer
                     && ((TransferContainer) window).getDCC().isActive())
                     || (window instanceof ChatContainer
@@ -122,7 +123,7 @@ public class PlaceholderContainer extends FrameContainer<PlaceholderWindow> {
 
     /** {@inheritDoc} */
     @Override
-    public void removeChild(final FrameContainer<?> child) {
+    public void removeChild(final FrameContainer child) {
         super.removeChild(child);
 
         if (getChildren().isEmpty()) {

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

@@ -37,16 +37,15 @@ import com.dmdirc.ui.WindowManager;
 
 import java.awt.Desktop;
 import java.io.File;
+import java.util.Collections;
 import java.util.Date;
 
 import javax.swing.JOptionPane;
 
 /**
  * This class links DCC Send objects to a window.
- *
- * @author Shane 'Dataforce' McCormack
  */
-public class TransferContainer extends FrameContainer<TransferWindow> implements
+public class TransferContainer extends FrameContainer implements
         DCCTransferHandler, SocketCloseListener {
 
     /** The dcc plugin that owns this frame */
@@ -95,7 +94,8 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
         super(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
                 title, title, TransferWindow.class,
-                IdentityManager.getGlobalConfig());
+                IdentityManager.getGlobalConfig(),
+                Collections.<String>emptyList());
         this.plugin = plugin;
         this.dcc = dcc;
         this.server = server;

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

@@ -43,7 +43,7 @@ public class EmptyWindow extends TextFrame {
      * @param controller The UIController that owns this window
      * @param owner The frame container that owns this window
      */
-    public EmptyWindow(final SwingController controller, final FrameContainer<?> owner) {
+    public EmptyWindow(final SwingController controller, final FrameContainer owner) {
         super(owner, controller);
         setTextPane(null);
     }

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

@@ -45,7 +45,7 @@ public class PlaceholderWindow extends EmptyWindow {
      * @param owner The frame container that owns this window
      */
     public PlaceholderWindow(final SwingController controller,
-            final FrameContainer<?> owner) {
+            final FrameContainer owner) {
         super(controller, owner);
 
         add(new TextLabel(

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

@@ -88,7 +88,7 @@ public class TransferWindow extends EmptyWindow implements ActionListener,
      * @param controller The UIController that owns this window
      * @param owner The frame container that owns this window
      */
-    public TransferWindow(final SwingController controller, final FrameContainer<?> owner) {
+    public TransferWindow(final SwingController controller, final FrameContainer owner) {
         super(controller, owner);
         
         final TransferContainer container = (TransferContainer) owner;

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

@@ -46,7 +46,7 @@ public final class DcopCommand extends Command implements 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 != 3) {
             showUsage(origin, args.isSilent(), "dcop", "<app> <object> <function>");

src/com/dmdirc/addons/debug/Debug.java

@@ -55,7 +55,7 @@ public class Debug 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(), "debug",
@@ -84,7 +84,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
      * @param type The type of message to send
      * @param args The arguments of the message
      */
-    public void proxySendLine(final FrameContainer<?> target,
+    public void proxySendLine(final FrameContainer target,
             final boolean isSilent, final String type, final Object ... args) {
         sendLine(target, isSilent, type, args);
     }
@@ -97,7 +97,7 @@ public class Debug extends Command implements IntelligentCommand, CommandInfo {
      * @param name The name of the command that's raising the error
      * @param args The arguments that the command accepts or expects
      */
-    public void proxyShowUsage(final FrameContainer<?> target,
+    public void proxyShowUsage(final FrameContainer target,
             final boolean isSilent, final String name, final String args) {
         showUsage(target, isSilent, getName(), name + " " + args);
     }

src/com/dmdirc/addons/debug/DebugCommand.java

@@ -72,7 +72,7 @@ public abstract class DebugCommand {
      * @param args Arguments passed to this command
      * @param context The context the command was executed in
      */
-    public abstract void execute(final FrameContainer<?> origin,
+    public abstract void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context);
 
     /**
@@ -93,7 +93,7 @@ public abstract class DebugCommand {
      * @param type The type of message to send
      * @param args The arguments of the message
      */
-    public void sendLine(final FrameContainer<?> target,
+    public void sendLine(final FrameContainer target,
             final boolean isSilent, final String type, final Object ... args) {
         if (command != null) {
             command.proxySendLine(target, isSilent, type, args);
@@ -108,7 +108,7 @@ public abstract class DebugCommand {
      * @param name The name of the command that's raising the error
      * @param args The arguments that the command accepts or expects
      */
-    public void showUsage(final FrameContainer<?> target,
+    public void showUsage(final FrameContainer target,
             final boolean isSilent, final String name, final String args) {
         if (command != null) {
             command.proxyShowUsage(target, isSilent, name, args);

src/com/dmdirc/addons/debug/commands/Benchmark.java

@@ -57,7 +57,7 @@ public class Benchmark extends DebugCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         long[] results = new long[10];
 

src/com/dmdirc/addons/debug/commands/ColourSpam.java

@@ -56,7 +56,7 @@ public class ColourSpam extends DebugCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         for (int i = 0; i < 100; i++) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT,

src/com/dmdirc/addons/debug/commands/ConfigInfo.java

@@ -57,7 +57,7 @@ public class ConfigInfo extends DebugCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         for (Identity source : origin.getConfigManager().getSources()) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, source.getTarget()

src/com/dmdirc/addons/debug/commands/ConfigStats.java

@@ -66,7 +66,7 @@ public class ConfigStats extends DebugCommand {
 
     /** {@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) {
             if (args.getArguments()[1].startsWith("+")) {
@@ -104,7 +104,7 @@ public class ConfigStats extends DebugCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param regex Regex to match options against
      */
-    private void doConfigStatsOption(final FrameContainer<?> origin,
+    private void doConfigStatsOption(final FrameContainer origin,
             final boolean isSilent, final String regex) {
         final SortedSet<Entry<String, Integer>> sortedStats = getSortedStats();
         boolean found = false;
@@ -129,7 +129,7 @@ public class ConfigStats extends DebugCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param top Top number of entries to show
      */
-    private void doConfigStatsTop(final FrameContainer<?> origin,
+    private void doConfigStatsTop(final FrameContainer origin,
             final boolean isSilent, final int top) {
         final SortedSet<Entry<String, Integer>> sortedStats = getSortedStats();
         int i = 0;
@@ -151,7 +151,7 @@ public class ConfigStats extends DebugCommand {
      * @param isSilent Whether this command has been silenced or not
      * @param cutoff Cut off value for stats
      */
-    private void doConfigStatsCutOff(final FrameContainer<?> origin,
+    private void doConfigStatsCutOff(final FrameContainer origin,
             final boolean isSilent, final int cutoff) {
         final SortedSet<Entry<String, Integer>> sortedStats = getSortedStats();
         for (Map.Entry<String, Integer> entry : sortedStats) {

src/com/dmdirc/addons/debug/commands/Error.java

@@ -64,7 +64,7 @@ public class Error extends DebugCommand 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
                 || args.getArguments().length == 2)

src/com/dmdirc/addons/debug/commands/FirstRun.java

@@ -56,7 +56,7 @@ public class FirstRun extends DebugCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         context.getSource().getController().showFirstRunWizard();
     }

src/com/dmdirc/addons/debug/commands/ForceUpdate.java

@@ -59,7 +59,7 @@ public class ForceUpdate extends DebugCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (IdentityManager.getGlobalConfig().getOptionBool("updater",
                 "enable")) {

src/com/dmdirc/addons/debug/commands/GlobalConfigInfo.java

@@ -58,7 +58,7 @@ public class GlobalConfigInfo extends DebugCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         for (Identity source : IdentityManager.getGlobalConfig().getSources()) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, source.getTarget()

src/com/dmdirc/addons/debug/commands/Identities.java

@@ -59,7 +59,7 @@ public class Identities extends DebugCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final String type;
 

src/com/dmdirc/addons/debug/commands/MemInfo.java

@@ -56,7 +56,7 @@ public class MemInfo extends DebugCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Total Memory: "
                 + Runtime.getRuntime().totalMemory());

src/com/dmdirc/addons/debug/commands/Notify.java

@@ -56,7 +56,7 @@ public class Notify extends DebugCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
                 "Current notification colour is: " + origin.getNotification());

src/com/dmdirc/addons/debug/commands/RunGC.java

@@ -56,7 +56,7 @@ public class RunGC extends DebugCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         System.gc();
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT,

src/com/dmdirc/addons/debug/commands/ServerInfo.java

@@ -57,7 +57,7 @@ public class ServerInfo extends DebugCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (origin.getServer() == null) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,

src/com/dmdirc/addons/debug/commands/ServerState.java

@@ -57,7 +57,7 @@ public class ServerState extends DebugCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (origin.getServer() == null) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,

src/com/dmdirc/addons/debug/commands/Services.java

@@ -62,7 +62,7 @@ public class Services extends DebugCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Available Services:");
         for (Service service : PluginManager.getPluginManager()

src/com/dmdirc/addons/debug/commands/ShowRaw.java

@@ -55,7 +55,7 @@ public class ShowRaw extends DebugCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         if (origin == null || origin.getServer() == null) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,

src/com/dmdirc/addons/debug/commands/Threads.java

@@ -58,7 +58,7 @@ public class Threads extends DebugCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         for (Entry<Thread, StackTraceElement[]> thread
                 : Thread.getAllStackTraces().entrySet()) {

src/com/dmdirc/addons/debug/commands/Time.java

@@ -61,7 +61,7 @@ public class Time extends DebugCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         doTime(origin, context.getSource(), args);
     }
@@ -73,16 +73,16 @@ public class Time extends DebugCommand implements IntelligentCommand {
      * @param window The window to be passed on to the timed command, if any
      * @param args The arguments that were passed to the command
      */
-    private void doTime(final FrameContainer<?> origin, final Window window,
+    private void doTime(final FrameContainer origin, final Window window,
             final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), getName(), getUsage());
             return;
         }
 
-        if (origin instanceof WritableFrameContainer<?>) {
-            final WritableFrameContainer<?> container
-                    = (WritableFrameContainer<?>) origin;
+        if (origin instanceof WritableFrameContainer) {
+            final WritableFrameContainer container
+                    = (WritableFrameContainer) origin;
             final long start = System.currentTimeMillis();
             container.getCommandParser().parseCommand(origin, window,
                     args.getArgumentsAsString(0));

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

@@ -44,7 +44,7 @@ public final class DNSCommand extends Command implements 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(), "dns", "<IP|hostname>");

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

@@ -51,7 +51,7 @@ public final class FDNotifyCommand extends Command implements CommandInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin, final CommandArguments args, final CommandContext context) {
+    public void execute(final FrameContainer origin, final CommandArguments args, final CommandContext context) {
         new Thread() {
             /** {@inheritDoc} */
             @Override

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

@@ -158,16 +158,16 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
         boolean useAlternate = false;
 
         for (Object obj : arguments) {
-            if (obj instanceof FrameContainer<?>
-                    && ((FrameContainer<?>) obj).getConfigManager() != null) {
-                useAlternate = ((FrameContainer<?>) obj).getConfigManager()
+            if (obj instanceof FrameContainer
+                    && ((FrameContainer) obj).getConfigManager() != null) {
+                useAlternate = ((FrameContainer) obj).getConfigManager()
                         .getOptionBool(getDomain(), "usealternate");
                 break;
             }
         }
 
         if (!useAlternate && type.equals(CoreActionType.SERVER_GOTPING)) {
-            final FrameContainer<?> active = WindowManager.getActiveWindow();
+            final FrameContainer active = WindowManager.getActiveWindow();
             final String value = formatTime(arguments[1]);
 
             getHistory(((Server) arguments[0])).add((Long) arguments[1]);
@@ -179,7 +179,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
 
             panel.refreshDialog();
         } else if (!useAlternate && type.equals(CoreActionType.SERVER_NOPING)) {
-            final FrameContainer<?> active = WindowManager.getActiveWindow();
+            final FrameContainer active = WindowManager.getActiveWindow();
             final String value = formatTime(arguments[1]) + "+";
 
             pings.put(((Server) arguments[0]), value);
@@ -190,7 +190,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
 
             panel.refreshDialog();
         } else if (type.equals(CoreActionType.SERVER_DISCONNECTED)) {
-            final FrameContainer<?> active = WindowManager.getActiveWindow();
+            final FrameContainer active = WindowManager.getActiveWindow();
 
             if (((Server) arguments[0]).isChild(active) || arguments[0] == active) {
                 panel.setText("Not connected");
@@ -199,7 +199,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
 
             panel.refreshDialog();
         } else if (type.equals(CoreActionType.CLIENT_FRAME_CHANGED)) {
-            final FrameContainer<?> source = (FrameContainer<?>) arguments[0];
+            final FrameContainer source = (FrameContainer) arguments[0];
             if (source == null || source.getServer() == null) {
                 panel.setText("Unknown");
             } else if (source.getServer().getState() != ServerState.CONNECTED) {
@@ -218,7 +218,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
                 final long sent = Long.parseLong(((String[]) arguments[2])[3].substring(9));
                 final Long duration = Long.valueOf(new Date().getTime() - sent);
                 final String value = formatTime(duration);
-                final FrameContainer<?> active = WindowManager.getActiveWindow();
+                final FrameContainer active = WindowManager.getActiveWindow();
 
                 pings.put((Server) arguments[0], value);
                 getHistory(((Server) arguments[0])).add(duration);

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

@@ -26,14 +26,15 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 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;
+
 /**
  * Displays an extended history of a window.
- *
- * @author Chris
  */
-public class HistoryWindow extends FrameContainer<Window> {
+public class HistoryWindow extends FrameContainer {
 
     /**
      * Creates a new HistoryWindow.
@@ -44,8 +45,9 @@ public class HistoryWindow extends FrameContainer<Window> {
      * @param numLines The number of lines to show
      */
     public HistoryWindow(final String title, final ReverseFileReader reader,
-                         final FrameContainer<?> parent, final int numLines) {
-        super("raw", title, title, Window.class, parent.getConfigManager());
+                         final FrameContainer parent, final int numLines) {
+        super("raw", title, title, Window.class, parent.getConfigManager(),
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
 
         WindowManager.addWindow(parent, this);
 

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

@@ -51,7 +51,7 @@ public final class LoggingCommand 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 PluginInfo pluginInfo = PluginManager.getPluginManager().getPluginInfoByName("logging");
         if (pluginInfo == null) {

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

@@ -468,7 +468,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
      * @param frame The frame to add the backbuffer lines to
      * @param filename File to get backbuffer from
      */
-    protected void showBackBuffer(final FrameContainer<?> frame, final String filename) {
+    protected void showBackBuffer(final FrameContainer frame, final String filename) {
         if (frame == null) {
             Logger.userError(ErrorLevel.LOW, "Given a null frame");
             return;
@@ -785,7 +785,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
      * @param target The window whose history we're trying to open
      * @return True if the history is available, false otherwise
      */
-    protected boolean showHistory(final FrameContainer<?> target) {
+    protected boolean showHistory(final FrameContainer target) {
         Object component;
 
         if (target instanceof Channel) {

src/com/dmdirc/addons/notifications/NotificationCommand.java

@@ -58,7 +58,7 @@ public class NotificationCommand 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 > 0 && args.getArguments()[0]
                 .equalsIgnoreCase("--methods")) {
@@ -95,7 +95,7 @@ public class NotificationCommand extends Command implements
      * @param origin The input window where the command was entered
      * @param isSilent Whether this command is being silenced
      */
-    private void doMethodList(final FrameContainer<?> origin,
+    private void doMethodList(final FrameContainer origin,
             final boolean isSilent) {
         final List<PluginInfo> methods = parent.getMethods();
 

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

@@ -62,9 +62,9 @@ public final class NowPlayingCommand extends Command implements
 
     /** {@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 && args.getArguments()[0]
                 .equalsIgnoreCase("--sources")) {
             doSourceList(origin, args.isSilent(), args.getArgumentsAsString(1));
@@ -106,7 +106,7 @@ public final class NowPlayingCommand extends Command implements
      * @param isSilent Whether this command is being silenced
      * @param format Format to be passed to getInformation
      */
-    private void doSourceList(final FrameContainer<?> origin, final boolean isSilent,
+    private void doSourceList(final FrameContainer origin, final boolean isSilent,
             final String format) {
         final List<MediaSource> sources = parent.getSources();
 

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

@@ -70,7 +70,7 @@ public final class OsdCommand extends 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 > 0
                 && "--close".equalsIgnoreCase(args.getArguments()[0])) {

src/com/dmdirc/addons/parserdebug/DebugWindow.java

@@ -27,14 +27,15 @@ import com.dmdirc.Server;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.interfaces.Window;
 
+import java.util.Arrays;
+
 /**
  * This class is used to show the parser debug in a window
- *
- * @author Shane 'Dataforce' McCormack
  */
-public class DebugWindow extends FrameContainer<Window> {
+public class DebugWindow extends FrameContainer {
 
     /** The plugin that owns this window */
     protected DebugPlugin plugin;
@@ -52,7 +53,9 @@ public class DebugWindow extends FrameContainer<Window> {
      * @param server The Server window this is a child of
      */
     public DebugWindow(final DebugPlugin plugin, final String title, final Parser parser, final Server server) {
-        super("raw", "Parser Debug", title, Window.class, server.getConfigManager());
+        super("raw", "Parser Debug", title, Window.class,
+                server.getConfigManager(),
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.plugin = plugin;
         this.parser = parser;
         this.server = server;

src/com/dmdirc/addons/parserdebug/ParserDebugCommand.java

@@ -67,7 +67,7 @@ public final class ParserDebugCommand extends Command implements CommandInfo {
      * @param context The Context of this command execution
      */
     @Override
-    public void execute(final FrameContainer<?> origin, final CommandArguments commandArgs, final CommandContext context) {
+    public void execute(final FrameContainer origin, final CommandArguments commandArgs, final CommandContext context) {
         final boolean isSilent = commandArgs.isSilent();
   
         Parser parser = ((ServerCommandContext) context).getServer().getParser();

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

@@ -28,28 +28,28 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Formatter;
+import java.util.Collections;
 
 import java.util.Date;
 
 /**
  * Implements a fake input window, which sends echoed text to the specified
  * chat window instead.
- * 
- * @author Chris
  */
-public class FakeWriteableFrameContainer extends WritableFrameContainer<InputWindow> {
+public class FakeWriteableFrameContainer extends WritableFrameContainer {
     
     /** The target for this window. */
-    private final MessageTarget<? extends InputWindow> target;
+    private final MessageTarget target;
 
     /**
      * Creates a new instance of FakeInputWindow.
      * 
      * @param target The message target that output gets sent to
      */
-    public FakeWriteableFrameContainer(final MessageTarget<?> target) {
+    public FakeWriteableFrameContainer(final MessageTarget target) {
         super(target.getIcon(), target.getName(), target.getTitle(),
-                InputWindow.class, target.getConfigManager(), target.getCommandParser());
+                InputWindow.class, target.getConfigManager(),
+                target.getCommandParser(), Collections.<String>emptyList());
         this.target = target;
     }
 

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

@@ -44,9 +44,9 @@ public class RedirectCommand 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 MessageTarget<?> target = ((ChatCommandContext) context)
+        final MessageTarget target = ((ChatCommandContext) context)
                 .getChat();
         target.getCommandParser().parseCommand(new FakeWriteableFrameContainer(
                 target), context.getSource(), args.getArgumentsAsString());

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

@@ -62,7 +62,7 @@ public final class ScriptCommand 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[] sargs = args.getArguments();
     

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

@@ -63,7 +63,7 @@ public final class PopupCommand extends Command implements CommandInfo {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer<?> origin,
+    public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         showPopup("DMDirc", args.getArgumentsAsString());
     }

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

@@ -44,7 +44,7 @@ public final class TimedCommand extends TimerTask {
     private final String command;
 
     /** The container to use for executing commands. */
-    private final FrameContainer<?> origin;
+    private final FrameContainer origin;
 
     /** The window the command came from. */
     private final Window window;
@@ -69,7 +69,7 @@ public final class TimedCommand extends TimerTask {
      */
     public TimedCommand(final TimerManager manager, final int timerKey,
             final int repetitions, final int delay, final String command,
-            final FrameContainer<?> origin, final Window window) {
+            final FrameContainer origin, final Window window) {
         super();
 
         this.timerKey = timerKey;
@@ -110,7 +110,7 @@ public final class TimedCommand extends TimerTask {
         if (origin == null) {
             parser = GlobalCommandParser.getGlobalCommandParser();
         } else {
-            parser = ((WritableFrameContainer<?>) origin).getCommandParser();
+            parser = ((WritableFrameContainer) origin).getCommandParser();
         }
 
         parser.parseCommand(origin, window, command);

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

@@ -59,7 +59,7 @@ public final class TimerCommand 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) {
@@ -134,7 +134,7 @@ public final class TimerCommand extends Command implements IntelligentCommand,
      * @param origin The window that the command was entered in
      * @param isSilent Whether this command is being silenced or not
      */
-    private void doUsage(final FrameContainer<?> origin, final boolean isSilent) {
+    private void doUsage(final FrameContainer origin, final boolean isSilent) {
         showUsage(origin, isSilent, "timer", "[--list|--cancel <timer id> | " +
                 "<repetitions> <interval> <command>]");
     }

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

@@ -55,7 +55,7 @@ public class TimerManager {
      * @param commandContext The window the command came from
      */
     public void addTimer(final int repetitions, final int interval,
-            final String command, final FrameContainer<?> origin,
+            final String command, final FrameContainer origin,
             final Window commandContext) {
 
         synchronized (this) {

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

@@ -27,7 +27,6 @@ import com.dmdirc.Server;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.core.components.StatusBarManager;
-import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.ui.interfaces.UIController;
 
 import java.net.URI;
@@ -80,12 +79,6 @@ public final class DummyController extends Plugin implements UIController {
         System.out.println(message);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void showSSLCertificateDialog(final SSLCertificateDialogModel model) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     /** {@inheritDoc} */
     @Override
     public void onLoad() {

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

@@ -34,7 +34,7 @@ import com.dmdirc.ui.interfaces.UIController;
 public class DummyInputWindow implements InputWindow {
 
     /** Our container. */
-    private final WritableFrameContainer<? extends InputWindow> container;
+    private final WritableFrameContainer container;
 
     /**
      * Instantiates a new DummyInputWindow.
@@ -42,7 +42,7 @@ public class DummyInputWindow implements InputWindow {
      * @param owner Parent window
      * @param commandParser Parent command parser
      */
-    public DummyInputWindow(final WritableFrameContainer<? extends InputWindow> owner,
+    public DummyInputWindow(final WritableFrameContainer owner,
             final CommandParser commandParser) {
         this.container = owner;
     }
@@ -55,7 +55,7 @@ public class DummyInputWindow implements InputWindow {
 
     /** {@inheritDoc} */
     @Override
-    public WritableFrameContainer<? extends InputWindow> getContainer() {
+    public WritableFrameContainer getContainer() {
         return container;
     }
 

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

@@ -1,43 +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.addons.ui_dummy;
-
-import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.ui.interfaces.QueryWindow;
-
-/**
- * A dummy query window.
- * 
- * @author chris
- */
-public class DummyQueryWindow extends DummyInputWindow implements QueryWindow {
-
-    /**
-     * Creates a new dummy query window.
-     * 
-     * @param owner The window that owns this one
-     */
-    public DummyQueryWindow(final WritableFrameContainer<? extends QueryWindow> owner) {
-        super(owner, owner.getCommandParser());
-    }
-
-}

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

@@ -1,43 +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.addons.ui_dummy;
-
-import com.dmdirc.Server;
-import com.dmdirc.commandparser.parsers.ServerCommandParser;
-import com.dmdirc.ui.interfaces.ServerWindow;
-
-/**
- * Dummy server window, used for testing.
- */
-public final class DummyServerWindow extends DummyInputWindow implements ServerWindow {
-    
-    /** 
-     * Instantiates this DummyServerWindow. 
-     *
-     * @param parent Parent server
-     */
-    public DummyServerWindow(final Server parent) {
-        super(parent, new ServerCommandParser());
-    }
-    
-}

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

@@ -592,7 +592,7 @@ public final class MainFrame extends JFrame implements WindowListener,
 
     /** {@inheritDoc} */
     @Override
-    public void selectionChanged(final FrameContainer<?> window) {
+    public void selectionChanged(final FrameContainer window) {
         activeFrame = (TextFrame) controller.getWindowFactory()
                 .getSwingWindow(window);
         focusOrder.offerAndMove(activeFrame);
@@ -642,18 +642,18 @@ public final class MainFrame extends JFrame implements WindowListener,
 
     /** {@inheritDoc} */
     @Override
-    public void iconChanged(final FrameContainer<?> window, final String icon) {
+    public void iconChanged(final FrameContainer window, final String icon) {
         //Ignore
     }
 
     /** {@inheritDoc} */
     @Override
-    public void nameChanged(final FrameContainer<?> window, final String name) {
+    public void nameChanged(final FrameContainer window, final String name) {
         //Ignore
     }
 
     @Override
-    public void titleChanged(final FrameContainer<?> window,
+    public void titleChanged(final FrameContainer window,
             final String title) {
         setTitle(title);
     }

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

@@ -37,7 +37,6 @@ import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.URLConfigPanel;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.UpdateConfigPanel;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
-import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.SSLCertificateDialog;
 import com.dmdirc.addons.ui_swing.dialogs.url.URLDialog;
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.SwingFirstRunWizard;
@@ -55,7 +54,6 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
-import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.UIController;
@@ -356,20 +354,6 @@ public class SwingController extends Plugin implements UIController {
         });
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void showSSLCertificateDialog(
-            final SSLCertificateDialogModel model) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                new SSLCertificateDialog(me, model).display();
-            }
-        });
-    }
-
     /** {@inheritDoc} */
     @Override
     public void showFeedbackNag() {

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

@@ -26,39 +26,50 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.components.frames.ChannelFrame;
 import com.dmdirc.addons.ui_swing.components.frames.CustomFrame;
 import com.dmdirc.addons.ui_swing.components.frames.CustomInputFrame;
-import com.dmdirc.addons.ui_swing.components.frames.QueryFrame;
 import com.dmdirc.addons.ui_swing.components.frames.ServerFrame;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.interfaces.ChannelWindow;
+import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.interfaces.FrameListener;
-import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.interfaces.QueryWindow;
-import com.dmdirc.ui.interfaces.ServerWindow;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.util.ListenerList;
+import java.util.Arrays;
+import java.util.Collection;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 
 /**
  * Handles creation of windows in the Swing UI.
  * 
  * @since 0.6.4
- * @author chris
  */
 public class SwingWindowFactory implements FrameListener {
 
     /** A map of known implementations of window interfaces. */
-    private static final Map<Class<? extends Window>, Class<? extends Window>> IMPLEMENTATIONS
-            = new HashMap<Class<? extends Window>, Class<? extends Window>>();
+    private static final Map<Collection<String>, Class<? extends Window>> IMPLEMENTATIONS
+            = new HashMap<Collection<String>, Class<? extends Window>>();
 
     static {
-        IMPLEMENTATIONS.put(Window.class, CustomFrame.class);
-        IMPLEMENTATIONS.put(InputWindow.class, CustomInputFrame.class);
-        IMPLEMENTATIONS.put(ServerWindow.class, ServerFrame.class);
-        IMPLEMENTATIONS.put(QueryWindow.class, QueryFrame.class);
-        IMPLEMENTATIONS.put(ChannelWindow.class, ChannelFrame.class);
+        IMPLEMENTATIONS.put(new HashSet<String>(
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier())),
+                CustomFrame.class);
+        IMPLEMENTATIONS.put(new HashSet<String>(
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier())),
+                CustomInputFrame.class);
+        IMPLEMENTATIONS.put(new HashSet<String>(
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier(),
+                WindowComponent.CERTIFICATE_VIEWER.getIdentifier())),
+                ServerFrame.class);
+        IMPLEMENTATIONS.put(new HashSet<String>(
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier(),
+                WindowComponent.TOPICBAR.getIdentifier(),
+                WindowComponent.USERLIST.getIdentifier())),
+                ChannelFrame.class);
     }
 
     /** The controller that owns this window factory. */
@@ -98,31 +109,29 @@ public class SwingWindowFactory implements FrameListener {
 
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer<?> window, final boolean focus) {
+    public void addWindow(final FrameContainer window, final boolean focus) {
         addWindow(null, window, focus);
     }
 
     /**
      * Creates a new window for the specified container.
      *
-     * @param <T> The type of window that should be created
      * @param window The container that owns the window
      * @param focus Whether the window should be focused initially
      * @return The created window or null on error
      */
-    @SuppressWarnings("unchecked")
-    protected <T extends Window> T doAddWindow(final FrameContainer<T> window,
+    protected Window doAddWindow(final FrameContainer window,
             final boolean focus) {
-        final Class<T> clazz;
+        final Class<? extends Window> clazz;
 
-        if (IMPLEMENTATIONS.containsKey(window.getWindowClass())) {
-            clazz = (Class<T>) IMPLEMENTATIONS.get(window.getWindowClass());
+        if (IMPLEMENTATIONS.containsKey(window.getComponents())) {
+            clazz = IMPLEMENTATIONS.get(window.getComponents());
         } else {
             clazz = window.getWindowClass();
         }
 
         try {
-            final T frame = (T) clazz.getConstructors()[0].newInstance(controller, window);
+            final Window frame = (Window) clazz.getConstructors()[0].newInstance(controller, window);
             window.addWindow(frame);
 
             return frame;
@@ -139,7 +148,7 @@ public class SwingWindowFactory implements FrameListener {
      * @param window The container whose windows should be searched
      * @return A relevant window or null
      */
-    public Window getSwingWindow(final FrameContainer<?> window) {
+    public Window getSwingWindow(final FrameContainer window) {
         if (window == null) {
             return null;
         }
@@ -155,14 +164,14 @@ public class SwingWindowFactory implements FrameListener {
 
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer<?> window) {
+    public void delWindow(final FrameContainer window) {
         delWindow(null, window);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer<?> parent,
-            final FrameContainer<?> window, final boolean focus) {
+    public void addWindow(final FrameContainer parent,
+            final FrameContainer window, final boolean focus) {
         UIUtilities.invokeLater(new Runnable() {
 
             @Override
@@ -187,7 +196,7 @@ public class SwingWindowFactory implements FrameListener {
 
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer<?> parent, final FrameContainer<?> window) {
+    public void delWindow(final FrameContainer parent, final FrameContainer window) {
         UIUtilities.invokeLater(new Runnable() {
 
             @Override

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

@@ -154,7 +154,7 @@ public class MDIBar extends JPanel implements SwingWindowListener,
 
     /** {@inheritDoc} */
     @Override
-    public void selectionChanged(final FrameContainer<?> window) {
+    public void selectionChanged(final FrameContainer window) {
         check();
     }
 }

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

@@ -48,7 +48,7 @@ public class CustomFrame extends TextFrame {
      * @param controller Swing controller
      */
     public CustomFrame(final SwingController controller,
-            final FrameContainer<?> owner) {
+            final FrameContainer owner) {
         super(owner, controller);
 
         initComponents();

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

@@ -26,7 +26,6 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.commandparser.PopupType;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import javax.swing.JPopupMenu;
 
@@ -52,7 +51,7 @@ public class CustomInputFrame extends InputTextFrame {
      * @param controller Swing controller
      */
     public CustomInputFrame(final SwingController controller,
-            final WritableFrameContainer<? extends InputWindow> owner) {
+            final WritableFrameContainer owner) {
         super(controller, owner);
 
         setInputHandler(new SwingInputHandler(getInputField(),

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

@@ -86,7 +86,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      * @param controller Swing controller
      */
     public InputTextFrame(final SwingController controller,
-            final WritableFrameContainer<? extends InputWindow> owner) {
+            final WritableFrameContainer owner) {
         super(owner, controller);
 
         initComponents();
@@ -173,8 +173,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      */
     @Override
     @SuppressWarnings("unchecked")
-    public WritableFrameContainer<? extends InputWindow> getContainer() {
-        return (WritableFrameContainer<? extends InputWindow>) super.
+    public WritableFrameContainer getContainer() {
+        return (WritableFrameContainer) super.
                 getContainer();
     }
 
@@ -196,7 +196,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     public final void setInputHandler(final InputHandler newInputHandler) {
         this.inputHandler = newInputHandler;
         inputHandler.addValidationListener(inputField);
-        inputHandler.setTabCompleter(((WritableFrameContainer<?>) frameParent).
+        inputHandler.setTabCompleter(((WritableFrameContainer) frameParent).
                 getTabCompleter());
     }
 

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

@@ -1,100 +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.addons.ui_swing.components.frames;
-
-import com.dmdirc.Query;
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
-import com.dmdirc.commandparser.PopupType;
-import com.dmdirc.ui.interfaces.QueryWindow;
-
-import javax.swing.JPopupMenu;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * The QueryFrame is the MDI window that shows query messages to the user.
- */
-public final class QueryFrame extends InputTextFrame implements QueryWindow {
-
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 8;
-
-    /**
-     * Creates a new QueryFrame.
-     *
-     * @param owner Parent Frame container
-     * @param controller Swing controller
-     */
-    public QueryFrame(final SwingController controller, final Query owner) {
-        super(controller, owner);
-
-        initComponents();
-
-        setInputHandler(new SwingInputHandler(getInputField(),
-                owner.getCommandParser(), this));
-    }
-
-    /**
-     * Initialises components in this frame.
-     */
-    private void initComponents() {
-        setLayout(new MigLayout("ins 0, fill, hidemode 3, wrap 1"));
-        add(getTextPane(), "grow, push");
-        add(getSearchBar(), "growx, pushx");
-        add(inputPanel, "growx, pushx");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public PopupType getNicknamePopupType() {
-        return PopupType.QUERY_NICK;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public PopupType getChannelPopupType() {
-        return PopupType.QUERY_NORMAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public PopupType getHyperlinkPopupType() {
-        return PopupType.QUERY_HYPERLINK;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public PopupType getNormalPopupType() {
-        return PopupType.QUERY_NORMAL;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void addCustomPopupItems(final JPopupMenu popupMenu) {
-        //Add no custom popup items
-    }
-}

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

@@ -32,7 +32,6 @@ import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.tls.CertificateManager;
 import com.dmdirc.tls.CertificateProblemListener;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
-import com.dmdirc.ui.interfaces.ServerWindow;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -48,7 +47,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * The ServerFrame is the MDI window that shows server messages to the user.
  */
-public final class ServerFrame extends InputTextFrame implements ServerWindow,
+public final class ServerFrame extends InputTextFrame implements
         ActionListener, CertificateProblemListener {
 
     /**

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

@@ -85,7 +85,7 @@ public abstract class TextFrame extends JPanel implements Window,
      */
     private static final long serialVersionUID = 5;
     /** The channel object that owns this frame. */
-    protected final FrameContainer<?> frameParent;
+    protected final FrameContainer frameParent;
     /** Frame output pane. */
     private TextPane textPane;
     /** search bar. */
@@ -101,7 +101,7 @@ public abstract class TextFrame extends JPanel implements Window,
      * @param owner FrameContainer owning this frame.
      * @param controller Swing controller
      */
-    public TextFrame(final FrameContainer<?> owner,
+    public TextFrame(final FrameContainer owner,
             final SwingController controller) {
         super();
         this.controller = controller;
@@ -228,7 +228,7 @@ public abstract class TextFrame extends JPanel implements Window,
 
     /** {@inheritDoc} */
     @Override
-    public FrameContainer<?> getContainer() {
+    public FrameContainer getContainer() {
         return frameParent;
     }
 
@@ -248,7 +248,7 @@ public abstract class TextFrame extends JPanel implements Window,
             return "";
         }
 
-        return frameParent.toString();
+        return frameParent.getName();
     }
 
     /**
@@ -486,7 +486,7 @@ public abstract class TextFrame extends JPanel implements Window,
     
     /** {@inheritDoc} */
     @Override
-    public void windowClosing(final FrameContainer<?> window) {
+    public void windowClosing(final FrameContainer window) {
         setVisible(false);
     }
 

src/com/dmdirc/addons/ui_swing/components/menubar/ChannelMenu.java

@@ -102,7 +102,7 @@ public class ChannelMenu extends JMenu implements ActionListener,
                     "Join channel", "Enter the name of the channel to join.")
                     .display();
         } else if (e.getActionCommand().equals("ChannelSettings")) {
-            final FrameContainer<?> activeWindow = WindowManager
+            final FrameContainer activeWindow = WindowManager
                     .getActiveWindow();
             if (activeWindow instanceof Channel) {
                 controller.showChannelSettingsDialog(((Channel) activeWindow));
@@ -113,7 +113,7 @@ public class ChannelMenu extends JMenu implements ActionListener,
     /** {@inheritDoc} */
     @Override
     public final void menuSelected(final MenuEvent e) {
-        final FrameContainer<?> activeWindow = WindowManager.getActiveWindow();
+        final FrameContainer activeWindow = WindowManager.getActiveWindow();
 
         join.setEnabled(activeWindow != null && activeWindow.getServer()
                 != null && activeWindow.getServer().getState()

src/com/dmdirc/addons/ui_swing/components/menubar/ServerMenu.java

@@ -139,7 +139,7 @@ public class ServerMenu extends JMenu implements ActionListener,
     /** {@inheritDoc} */
     @Override
     public final void menuSelected(final MenuEvent e) {
-        final FrameContainer<?> activeWindow = WindowManager.getActiveWindow();
+        final FrameContainer activeWindow = WindowManager.getActiveWindow();
 
         ssd.setEnabled(activeWindow != null && activeWindow
                 .getServer() != null && activeWindow.getServer().getState()

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

@@ -102,7 +102,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
     /** The parent for the manager. */
     private JComponent parent;
     /** The currently selected frame. */
-    private transient FrameContainer<?> selected;
+    private transient FrameContainer selected;
     /** Selected window. */
     private Window activeWindow;
     /** Sort root windows prefs setting. */
@@ -207,10 +207,10 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * @since 0.6.4
      */
     private void initButtons(
-            final Collection<FrameContainer<?>> windowCollection) {
+            final Collection<FrameContainer> windowCollection) {
         Window window;
         Window parentWindow;
-        for (FrameContainer<?> frame : windowCollection) {
+        for (FrameContainer frame : windowCollection) {
             window = windowFactory.getSwingWindow(frame);
             parentWindow = windowFactory.getSwingWindow(frame.getParent());
             if (window != null) {
@@ -218,8 +218,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
             }
 
             if (!frame.getChildren().isEmpty()) {
-                final ArrayList<FrameContainer<?>> childList = new ArrayList
-                        <FrameContainer<?>>(frame.getChildren());
+                final ArrayList<FrameContainer> childList = new ArrayList
+                        <FrameContainer>(frame.getChildren());
                 initButtons(childList);
             }
         }
@@ -232,7 +232,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * @return {@link FrameToggleButton} object asociated with this
      * FrameContainer. Returns null if none exist
      */
-    public FrameToggleButton getButton(final FrameContainer<?> frame) {
+    public FrameToggleButton getButton(final FrameContainer frame) {
         final Window window = windowFactory.getSwingWindow(frame);
         if (buttons.containsKey(window)) {
             return buttons.get(window);
@@ -265,17 +265,17 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * @since 0.6.4
      */
     private void displayButtons(
-            final Collection<FrameContainer<?>> windowCollection) {
+            final Collection<FrameContainer> windowCollection) {
         FrameToggleButton button;
-        for (FrameContainer<?> window : windowCollection) {
+        for (FrameContainer window : windowCollection) {
             button = getButton(window);
             if (button != null) {
                 button.setPreferredSize(
                         new Dimension(buttonWidth, BUTTON_HEIGHT));
                 buttonPanel.add(button);
                 if (!window.getChildren().isEmpty()) {
-                    final ArrayList<FrameContainer<?>> childList = new ArrayList
-                            <FrameContainer<?>>(window.getChildren());
+                    final ArrayList<FrameContainer> childList = new ArrayList
+                            <FrameContainer>(window.getChildren());
                     if (sortChildWindows) {
                          Collections.sort(childList,
                                  new FrameContainerComparator());
@@ -293,8 +293,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
         buttonPanel.setVisible(false);
         buttonPanel.removeAll();
 
-        final ArrayList<FrameContainer<?>> windowList = new
-                ArrayList<FrameContainer<?>>(WindowManager.getRootWindows());
+        final ArrayList<FrameContainer> windowList = new
+                ArrayList<FrameContainer>(WindowManager.getRootWindows());
         if (sortRootWindows) {
             Collections.sort(windowList, new FrameContainerComparator());
         }
@@ -311,7 +311,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
      */
     private void addButton(final Window source) {
         final FrameToggleButton button = new FrameToggleButton(
-                source.getContainer().toString(), IconManager.getIconManager()
+                source.getContainer().getName(), IconManager.getIconManager()
                 .getIcon(source.getContainer().getIcon()), source);
         button.addActionListener(this);
         button.addMouseListener(this);
@@ -380,7 +380,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         final FrameToggleButton button = (FrameToggleButton) e.getSource();
-        final FrameContainer<?> window =  button.getFrameContainer();
+        final FrameContainer window =  button.getFrameContainer();
         final TextFrame frame = (TextFrame) button.getWindow();
         if (frame != null && window.equals(activeWindow.getContainer())) {
             button.setSelected(true);
@@ -432,7 +432,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void notificationSet(final FrameContainer<?> window,
+    public void notificationSet(final FrameContainer window,
             final Color colour) {
         UIUtilities.invokeLater(new Runnable() {
 
@@ -449,7 +449,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void notificationCleared(final FrameContainer<?> window) {
+    public void notificationCleared(final FrameContainer window) {
         UIUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */
@@ -462,7 +462,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void selectionChanged(final FrameContainer<?> window) {
+    public void selectionChanged(final FrameContainer window) {
         UIUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */
@@ -488,7 +488,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void iconChanged(final FrameContainer<?> window, final String icon) {
+    public void iconChanged(final FrameContainer window, final String icon) {
         UIUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */
@@ -504,7 +504,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void nameChanged(final FrameContainer<?> window, final String name) {
+    public void nameChanged(final FrameContainer window, final String name) {
         UIUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */
@@ -520,7 +520,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void titleChanged(final FrameContainer<?> window,
+    public void titleChanged(final FrameContainer window,
             final String title) {
         // Do nothing
     }

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

@@ -64,7 +64,7 @@ public class FrameToggleButton extends JToggleButton {
      *
      * @return FrameContainer associated with this button
      */
-    public FrameContainer<?> getFrameContainer() {
+    public FrameContainer getFrameContainer() {
         return window.getContainer();
     }
 

src/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java

@@ -165,7 +165,7 @@ public class CtrlTabWindowManager implements SwingWindowListener,
 
     /* {@inheritDoc} */
     @Override
-    public void selectionChanged(final FrameContainer<?> window) {
+    public void selectionChanged(final FrameContainer window) {
         UIUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */

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

@@ -57,7 +57,7 @@ public class NodeLabel extends JPanel implements SelectionListener,
      */
     private static final long serialVersionUID = 1;
     /** The window this node represents in the tree. */
-    private final FrameContainer<?> window;
+    private final FrameContainer window;
     /** Colour used to show if the mouse is over this node. */
     private boolean rollover;
     /** Colour used to show if this node has an active notification. */
@@ -77,7 +77,7 @@ public class NodeLabel extends JPanel implements SelectionListener,
      *
      * @param window Window for this node
      */
-    public NodeLabel(final FrameContainer<?> window) {
+    public NodeLabel(final FrameContainer window) {
         super();
 
         this.window = window;
@@ -94,7 +94,7 @@ public class NodeLabel extends JPanel implements SelectionListener,
         }
 
         icon.setIcon(IconManager.getIconManager().getIcon(window.getIcon()));
-        text.setText(window.toString());
+        text.setText(window.getName());
         text.setBorder(null);
 
         setLayout(new MigLayout("ins 0"));
@@ -115,7 +115,7 @@ public class NodeLabel extends JPanel implements SelectionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void selectionChanged(final FrameContainer<?> window) {
+    public void selectionChanged(final FrameContainer window) {
         if (equals(window)) {
             selected = true;
         } else {
@@ -125,7 +125,7 @@ public class NodeLabel extends JPanel implements SelectionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void notificationSet(final FrameContainer<?> window,
+    public void notificationSet(final FrameContainer window,
             final Color colour) {
         if (equals(window)) {
             notificationColour = colour;
@@ -134,7 +134,7 @@ public class NodeLabel extends JPanel implements SelectionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void notificationCleared(final FrameContainer<?> window) {
+    public void notificationCleared(final FrameContainer window) {
         if (equals(window)) {
             notificationColour = null;
         }
@@ -142,7 +142,7 @@ public class NodeLabel extends JPanel implements SelectionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void iconChanged(final FrameContainer<?> window, final String icon) {
+    public void iconChanged(final FrameContainer window, final String icon) {
         if (equals(window)) {
             this.icon.setIcon(IconManager.getIconManager().getIcon(icon));
         }
@@ -150,13 +150,13 @@ public class NodeLabel extends JPanel implements SelectionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void nameChanged(final FrameContainer<?> window, final String name) {
+    public void nameChanged(final FrameContainer window, final String name) {
         // Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
-    public void titleChanged(final FrameContainer<?> window,
+    public void titleChanged(final FrameContainer window,
             final String title) {
         // Do nothing
     }
@@ -295,13 +295,13 @@ public class NodeLabel extends JPanel implements SelectionListener,
      * @param newText Style to set
      */
     public void setTextStyle(final Styliser styliser, final String newText) {
-        if (currentText.equals(newText + window.toString())) {
+        if (currentText.equals(newText + window.getName())) {
             return;
         }
         text.setText("");
-        currentText = newText + window.toString();
+        currentText = newText + window.getName();
         styliser.addStyledString((StyledDocument) text.getDocument(),
-                new String[] {newText, window.toString(), });
+                new String[] {newText, window.getName(), });
     }
 
 }

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

@@ -76,7 +76,7 @@ public final class TreeFrameManager implements FrameManager,
     /** data model. */
     private TreeViewModel model;
     /** node storage, used for adding and deleting nodes correctly. */
-    private final Map<FrameContainer<?>, TreeViewNode> nodes;
+    private final Map<FrameContainer, TreeViewNode> nodes;
     /** UI Controller. */
     private SwingController controller;
     /** Tree scroller. */
@@ -84,7 +84,7 @@ public final class TreeFrameManager implements FrameManager,
 
     /** creates a new instance of the TreeFrameManager. */
     public TreeFrameManager() {
-        nodes = new HashMap<FrameContainer<?>, TreeViewNode>();
+        nodes = new HashMap<FrameContainer, TreeViewNode>();
     }
 
     /** {@inheritDoc} */
@@ -214,7 +214,7 @@ public final class TreeFrameManager implements FrameManager,
      * @param window Window to add
      */
     public void addWindow(final TreeViewNode parent,
-            final FrameContainer<?> window) {
+            final FrameContainer window) {
         UIUtilities.invokeAndWait(new Runnable() {
 
             /** {@inheritDoc} */
@@ -316,10 +316,10 @@ public final class TreeFrameManager implements FrameManager,
                 }
                 scroller = new TreeTreeScroller(tree);
 
-                for (FrameContainer<?> window
+                for (FrameContainer window
                         : WindowManager.getRootWindows()) {
                     addWindow(null, window);
-                    final Collection<FrameContainer<?>> childWindows = window
+                    final Collection<FrameContainer> childWindows = window
                             .getChildren();
                     for (FrameContainer childWindow : childWindows) {
                         addWindow(nodes.get(window), childWindow);

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

@@ -40,7 +40,7 @@ public class TreeViewNode extends DefaultMutableTreeNode {
     /** Node's label. */
     private final NodeLabel label;
     /** Node's frame container. */
-    private final FrameContainer<?> window;
+    private final FrameContainer window;
 
     /**
      * Instantiates a new tree view node.
@@ -48,7 +48,7 @@ public class TreeViewNode extends DefaultMutableTreeNode {
      * @param label Node label
      * @param window Node window
      */
-    public TreeViewNode(final NodeLabel label, final FrameContainer<?> window) {
+    public TreeViewNode(final NodeLabel label, final FrameContainer window) {
         super();
 
         this.label = label;
@@ -69,7 +69,7 @@ public class TreeViewNode extends DefaultMutableTreeNode {
      *
      * @return Node window
      */
-    public FrameContainer<?> getWindow() {
+    public FrameContainer getWindow() {
         return window;
     }
 }

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenu.java

@@ -59,7 +59,7 @@ public class FrameContainerMenu extends JMenu implements FrameInfoListener,
      */
     public FrameContainerMenu(final FrameContainer frame,
             final SwingController controller) {
-        super(frame.toString());
+        super(frame.getName());
         setIcon(IconManager.getIconManager().getIcon(frame.getIcon()));
         new WindowMenuScroller(this, controller.getDomain(), 0);
 

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenuItem.java

@@ -60,7 +60,7 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
      */
     public FrameContainerMenuItem(final FrameContainer frame,
             final WindowMenuFrameManager manager) {
-        super(frame.toString(), IconManager.getIconManager().getIcon(frame.
+        super(frame.getName(), IconManager.getIconManager().getIcon(frame.
                 getIcon()));
 
         this.frame = frame;

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -368,14 +368,14 @@ public final class WindowMenuFrameManager extends JMenu implements
             if (!(component instanceof FrameContainerMenuInterface)) {
                 continue;
             }
-            final FrameContainer child = ((FrameContainerMenuInterface) component).
-                    getFrame();
+            final FrameContainer child
+                    = ((FrameContainerMenuInterface) component).getFrame();
             if (sortBefore(newChild, child)) {
                 return i;
             } else if (!sortAfter(newChild, child) && IdentityManager.
                     getGlobalConfig().getOptionBool("treeview",
-                    "sortwindows") && newChild.toString().compareToIgnoreCase(
-                    child.toString()) < 0) {
+                    "sortwindows") && newChild.getName().compareToIgnoreCase(
+                    child.getName()) < 0) {
                 return i;
             }
         }

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

@@ -27,7 +27,6 @@ import com.dmdirc.Server;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.ui.core.components.StatusBarManager;
-import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.ui.interfaces.UIController;
 
 import java.net.URI;
@@ -143,12 +142,6 @@ public class WebInterfaceUI implements UIController {
         // Do nothing
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void showSSLCertificateDialog(final SSLCertificateDialogModel model) {
-        // Do nothing
-    }
-
     @Override
     public PreferencesInterface getPluginPrefsPanel() {
         //TODO FIXME

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

@@ -25,20 +25,19 @@ package com.dmdirc.addons.ui_web;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_web.uicomponents.WebChannelWindow;
 import com.dmdirc.addons.ui_web.uicomponents.WebInputWindow;
-import com.dmdirc.addons.ui_web.uicomponents.WebQueryWindow;
 import com.dmdirc.addons.ui_web.uicomponents.WebServerWindow;
 import com.dmdirc.addons.ui_web.uicomponents.WebWindow;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.interfaces.ChannelWindow;
+import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.interfaces.FrameListener;
-import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.interfaces.QueryWindow;
-import com.dmdirc.ui.interfaces.ServerWindow;
 import com.dmdirc.ui.interfaces.Window;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 
 /**
@@ -47,23 +46,36 @@ import java.util.Map;
 public class WebWindowManager implements FrameListener {
 
     /** A map of known implementations of window interfaces. */
-    private static final Map<Class<? extends Window>, Class<? extends Window>> IMPLEMENTATIONS
-            = new HashMap<Class<? extends Window>, Class<? extends Window>>();
+    private static final Map<Collection<String>, Class<? extends Window>> IMPLEMENTATIONS
+            = new HashMap<Collection<String>, Class<? extends Window>>();
 
     static {
-        IMPLEMENTATIONS.put(Window.class, WebWindow.class);
-        IMPLEMENTATIONS.put(InputWindow.class, WebInputWindow.class);
-        IMPLEMENTATIONS.put(ServerWindow.class, WebServerWindow.class);
-        IMPLEMENTATIONS.put(QueryWindow.class, WebQueryWindow.class);
-        IMPLEMENTATIONS.put(ChannelWindow.class, WebChannelWindow.class);
+        IMPLEMENTATIONS.put(new HashSet<String>(
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier())),
+                WebWindow.class);
+        IMPLEMENTATIONS.put(new HashSet<String>(
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier())),
+                WebInputWindow.class);
+        IMPLEMENTATIONS.put(new HashSet<String>(
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier(),
+                WindowComponent.CERTIFICATE_VIEWER.getIdentifier())),
+                WebServerWindow.class);
+        IMPLEMENTATIONS.put(new HashSet<String>(
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier(),
+                WindowComponent.TOPICBAR.getIdentifier(),
+                WindowComponent.USERLIST.getIdentifier())),
+                WebChannelWindow.class);
     }
 
     /** The controller that owns this manager. */
     private final WebInterfaceUI controller;
 
     /** Map of known windows. */
-    private final Map<FrameContainer<?>, Window> windows
-            = new HashMap<FrameContainer<?>, Window>();
+    private final Map<FrameContainer, Window> windows
+            = new HashMap<FrameContainer, Window>();
 
     /**
      * Creates a new window manager for the specified controller.
@@ -75,7 +87,7 @@ public class WebWindowManager implements FrameListener {
 
         WindowManager.addFrameListener(this);
 
-        for (FrameContainer<?> container : WindowManager.getRootWindows()) {
+        for (FrameContainer container : WindowManager.getRootWindows()) {
             recursiveAdd(container);
         }
     }
@@ -87,7 +99,7 @@ public class WebWindowManager implements FrameListener {
      * @param container The container whose window should be retrieved
      * @return The corresponding web window, or null if there is none
      */
-    public Window getWindow(final FrameContainer<?> container) {
+    public Window getWindow(final FrameContainer container) {
         return windows.get(container);
     }
 
@@ -97,23 +109,23 @@ public class WebWindowManager implements FrameListener {
      *
      * @param container The container to create windows for
      */
-    private void recursiveAdd(final FrameContainer<?> container) {
+    private void recursiveAdd(final FrameContainer container) {
         addWindow(container, false);
 
-        for (FrameContainer<?> child : container.getChildren()) {
+        for (FrameContainer child : container.getChildren()) {
             recursiveAdd(child);
         }
     }
 
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer<?> window, final boolean focus) {
+    public void addWindow(final FrameContainer window, final boolean focus) {
         doAddWindow(window, focus);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer<?> window) {
+    public void delWindow(final FrameContainer window) {
         if (windows.containsKey(window)) {
             windows.get(window).close();
             windows.remove(window);
@@ -122,7 +134,7 @@ public class WebWindowManager implements FrameListener {
 
     /** {@inheritDoc} */
     @Override
-    public void addWindow(final FrameContainer<?> parent, final FrameContainer<?> window,
+    public void addWindow(final FrameContainer parent, final FrameContainer window,
             final boolean focus) {
         if (windows.containsKey(parent)) {
             addWindow(window, focus);
@@ -131,7 +143,7 @@ public class WebWindowManager implements FrameListener {
 
     /** {@inheritDoc} */
     @Override
-    public void delWindow(final FrameContainer<?> parent, final FrameContainer<?> window) {
+    public void delWindow(final FrameContainer parent, final FrameContainer window) {
         if (windows.containsKey(parent)) {
             delWindow(window);
         }
@@ -140,23 +152,21 @@ public class WebWindowManager implements FrameListener {
     /**
      * Creates a new window for the specified container.
      *
-     * @param <T> The type of window that should be created
      * @param window The container that owns the window
      * @param focus Whether the window should be focused initially
      */
-    @SuppressWarnings("unchecked")
-    protected <T extends Window> void doAddWindow(final FrameContainer<T> window,
+    protected void doAddWindow(final FrameContainer window,
             final boolean focus) {
-        final Class<T> clazz;
+        final Class<? extends Window> clazz;
 
-        if (IMPLEMENTATIONS.containsKey(window.getWindowClass())) {
-            clazz = (Class<T>) IMPLEMENTATIONS.get(window.getWindowClass());
+        if (IMPLEMENTATIONS.containsKey(window.getComponents())) {
+            clazz = IMPLEMENTATIONS.get(window.getComponents());
         } else {
             clazz = window.getWindowClass();
         }
 
         try {
-            final T frame = (T) clazz.getConstructors()[0].newInstance(controller, window);
+            final Window frame = (Window) clazz.getConstructors()[0].newInstance(controller, window);
             window.addWindow(frame);
 
             windows.put(window, frame);

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

@@ -37,7 +37,7 @@ import java.util.Map;
  */
 public class WebInputWindow extends WebWindow implements InputWindow {
 
-    private final WritableFrameContainer<?> parent;
+    private final WritableFrameContainer parent;
 
     private final CommandParser commandparser;
 
@@ -47,7 +47,7 @@ public class WebInputWindow extends WebWindow implements InputWindow {
             = new HashMap<String, WebInputHandler>();
 
     public WebInputWindow(final WebInterfaceUI controller,
-            final WritableFrameContainer<?> parent) {
+            final WritableFrameContainer parent) {
         super(controller, parent);
         this.parent = parent;
         this.commandparser = parent.getCommandParser();
@@ -95,7 +95,7 @@ public class WebInputWindow extends WebWindow implements InputWindow {
 
     /** {@inheritDoc} */
     @Override
-    public WritableFrameContainer<?> getContainer() {
+    public WritableFrameContainer getContainer() {
         return parent;
     }
 

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

@@ -1,42 +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.addons.ui_web.uicomponents;
-
-import com.dmdirc.Query;
-import com.dmdirc.addons.ui_web.WebInterfaceUI;
-import com.dmdirc.ui.interfaces.QueryWindow;
-
-/**
- *
- * @author chris
- */
-public class WebQueryWindow extends WebInputWindow implements QueryWindow {
-
-    private final Query query;
-
-    public WebQueryWindow(final WebInterfaceUI controller, final Query parent) {
-        super(controller, parent);
-        this.query = parent;
-    }
-
-}

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

@@ -24,13 +24,12 @@ package com.dmdirc.addons.ui_web.uicomponents;
 
 import com.dmdirc.Server;
 import com.dmdirc.addons.ui_web.WebInterfaceUI;
-import com.dmdirc.ui.interfaces.ServerWindow;
 
 /**
  *
  * @author chris
  */
-public class WebServerWindow extends WebInputWindow implements ServerWindow {
+public class WebServerWindow extends WebInputWindow {
 
     private final Server server;
 

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

@@ -58,14 +58,14 @@ public class WebWindow implements Window, IRCDocumentListener,
 
     protected int myID = ++counter;
 
-    private final FrameContainer<?> parent;
+    private final FrameContainer parent;
 
     private final List<String> messages = new ArrayList<String>();
 
     private String title;
 
     public WebWindow(final WebInterfaceUI controller,
-            final FrameContainer<?> parent) {
+            final FrameContainer parent) {
         super();
 
         this.parent = parent;
@@ -106,7 +106,7 @@ public class WebWindow implements Window, IRCDocumentListener,
 
     /** {@inheritDoc} */
     @Override
-    public FrameContainer<?> getContainer() {
+    public FrameContainer getContainer() {
         return parent;
     }
 
@@ -122,18 +122,6 @@ public class WebWindow implements Window, IRCDocumentListener,
         DynamicRequestHandler.addEvent(new Event("closewindow", myID));
     }
 
-    public String getType() {
-        if (this instanceof WebServerWindow) {
-            return "server";
-        } else if (this instanceof WebChannelWindow) {
-            return "channel";
-        } else if (this instanceof WebQueryWindow) {
-            return "query";
-        } else {
-            return "window";
-        }
-    }
-
     public String getId() {
         return String.valueOf(myID);
     }
@@ -270,19 +258,19 @@ public class WebWindow implements Window, IRCDocumentListener,
 
     /** {@inheritDoc} */
     @Override
-    public void iconChanged(final FrameContainer<?> window, final String icon) {
+    public void iconChanged(final FrameContainer window, final String icon) {
         //TODO FIXME
     }
 
     /** {@inheritDoc} */
     @Override
-    public void nameChanged(final FrameContainer<?> window, final String name) {
+    public void nameChanged(final FrameContainer window, final String name) {
         //TODO FIXME
     }
 
     /** {@inheritDoc} */
     @Override
-    public void titleChanged(final FrameContainer<?> window,
+    public void titleChanged(final FrameContainer window,
             final String title) {
         this.title = title;
     }

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

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

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

@@ -54,7 +54,7 @@ public class UrlListCommand 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[] headers = {"URL", "Count"};
         final Map<String, Integer> map = plugin.getURLS();

src/com/dmdirc/addons/windowflashing/FlashWindow.java

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

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

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

test/com/dmdirc/addons/debug/DebugTest.java

@@ -48,7 +48,7 @@ public class DebugTest {
     @Test
     public void testNoArgs() {
         final CommandArguments arguments = mock(CommandArguments.class);
-        final FrameContainer<?> container = mock(FrameContainer.class);
+        final FrameContainer container = mock(FrameContainer.class);
         
         when(arguments.isCommand()).thenReturn(true);
         when(arguments.getArguments()).thenReturn(new String[0]);
@@ -65,7 +65,7 @@ public class DebugTest {
     public void testInvalidArg() {
         final DebugPlugin plugin = mock(DebugPlugin.class);
         final CommandArguments arguments = mock(CommandArguments.class);
-        final FrameContainer<?> container = mock(FrameContainer.class);
+        final FrameContainer container = mock(FrameContainer.class);
         
         when(plugin.getCommand("test")).thenReturn(null);
         when(arguments.isCommand()).thenReturn(true);
@@ -82,7 +82,7 @@ public class DebugTest {
     public void testCommandNoArgs() {
         final DebugPlugin plugin = mock(DebugPlugin.class);
         final CommandArguments arguments = mock(CommandArguments.class);
-        final FrameContainer<?> container = mock(FrameContainer.class);
+        final FrameContainer container = mock(FrameContainer.class);
         final DebugCommand command = mock(DebugCommand.class);
         final CommandContext context = mock(CommandContext.class);
         
@@ -105,7 +105,7 @@ public class DebugTest {
     public void testCommandWithArgs() {
         final DebugPlugin plugin = mock(DebugPlugin.class);
         final CommandArguments arguments = mock(CommandArguments.class);
-        final FrameContainer<?> container = mock(FrameContainer.class);
+        final FrameContainer container = mock(FrameContainer.class);
         final DebugCommand command = mock(DebugCommand.class);
         final CommandContext context = mock(CommandContext.class);
         

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.redirect;
 
+import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -50,10 +51,8 @@ public class RedirectCommandTest {
     @Test
     public void testExecute() {
         final RedirectCommand command = new RedirectCommand();
-        final MessageTarget<InputWindow> target = mock(MessageTarget.class);
+        final MessageTarget target = mock(MessageTarget.class);
         final InputWindow window = mock(InputWindow.class);
-        when(target.getWindows()).thenReturn(new ArrayList<InputWindow>(Arrays.asList(window)));
-        final CommandParser parser = new ServerCommandParser();
         //when(window.getCommandParser()).thenReturn(parser);
         when(window.getContainer().getConfigManager()).thenReturn(IdentityManager.getGlobalConfig());
 

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

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

test/com/dmdirc/harness/ui/DMDircUITestCase.java

@@ -89,10 +89,10 @@ public class DMDircUITestCase extends UISpecTestCase {
      *
      * @return FrameContainer mock
      */
-    public static WritableFrameContainer<CustomInputFrame> getMockedContainer() {
+    public static WritableFrameContainer getMockedContainer() {
         final IRCDocument document = mock(IRCDocument.class);
         @SuppressWarnings("unchecked")
-        final WritableFrameContainer<CustomInputFrame> container = mock(
+        final WritableFrameContainer container = mock(
                 WritableFrameContainer.class);
         final ConfigManager config = mock(ConfigManager.class);
         when(container.getDocument()).thenReturn(document);