Don't pass classes into frame containers

Change-Id: I32d75cc6dee8dce03390a2d29026f70e5ebf2bc4
Depends-On: I6c243840a40655bbbdd7a32ab707a7f2e15880ae
Reviewed-on: http://gerrit.dmdirc.com/2098
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

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

@@ -27,7 +27,6 @@ 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;
 
@@ -54,8 +53,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
      */
     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(),
+        super(title, "dcc-chat-inactive",DCCCommandParser.getDCCCommandParser(),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                 WindowComponent.INPUTFIELD.getIdentifier()));
         this.dccChat = dcc;

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

@@ -27,7 +27,6 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.Collection;
 
@@ -44,15 +43,13 @@ public abstract class DCCFrameContainer extends WritableFrameContainer {
      *
      * @param title The title of this window
      * @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<? extends InputWindow> windowClass, final CommandParser parser,
-            final Collection<String> components) {
-        super(icon, title, title, windowClass,
-                IdentityManager.getGlobalConfig(), parser, components);
+            final CommandParser parser, final Collection<String> components) {
+        super(icon, title, title, IdentityManager.getGlobalConfig(), parser,
+                components);
     }
 
     /** {@inheritDoc} */

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.dcc;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.components.frames.ComponentFrame;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.plugins.PluginManager;
@@ -47,8 +46,7 @@ public class PlaceholderContainer extends FrameContainer {
      * @param plugin The plugin which owns this placeholder
      */
     public PlaceholderContainer(final DCCPlugin plugin) {
-        super("dcc", "DCCs", "DCCs", ComponentFrame.class,
-                IdentityManager.getGlobalConfig(),
+        super("dcc", "DCCs", "DCCs", IdentityManager.getGlobalConfig(),
                 Arrays.asList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
 
         this.plugin = plugin;

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

@@ -29,7 +29,6 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
-import com.dmdirc.addons.ui_swing.components.frames.ComponentFrame;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
@@ -93,8 +92,7 @@ public class TransferContainer extends FrameContainer implements
             final String title, final String targetNick, final Server server) {
         super(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
-                title, title, ComponentFrame.class,
-                IdentityManager.getGlobalConfig(),
+                title, title, IdentityManager.getGlobalConfig(),
                 Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel"));
         this.plugin = plugin;
         this.dcc = dcc;

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

@@ -27,7 +27,6 @@ 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;
 
@@ -46,7 +45,7 @@ public class HistoryWindow extends FrameContainer {
      */
     public HistoryWindow(final String title, final ReverseFileReader reader,
                          final FrameContainer parent, final int numLines) {
-        super("raw", title, title, Window.class, parent.getConfigManager(),
+        super("raw", title, title, parent.getConfigManager(),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
 
         WindowManager.getWindowManager().addWindow(parent, this);

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

@@ -28,7 +28,6 @@ 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;
 
@@ -53,8 +52,7 @@ public class DebugWindow extends FrameContainer {
      * @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, server.getConfigManager(),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.plugin = plugin;
         this.parser = parser;

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

@@ -26,7 +26,6 @@ import com.dmdirc.MessageTarget;
 import com.dmdirc.Server;
 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;
@@ -48,8 +47,8 @@ public class FakeWriteableFrameContainer extends WritableFrameContainer {
      */
     public FakeWriteableFrameContainer(final MessageTarget target) {
         super(target.getIcon(), target.getName(), target.getTitle(),
-                InputWindow.class, target.getConfigManager(),
-                target.getCommandParser(), Collections.<String>emptyList());
+                target.getConfigManager(), target.getCommandParser(),
+                Collections.<String>emptyList());
         this.target = target;
     }