Unbreak and break some more stuff

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

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

@@ -53,13 +53,14 @@ public class DCCChatWindow extends DCCFrame implements DCCChatHandler {
      */
     public DCCChatWindow(final DCCPlugin plugin, final DCCChat dcc,
             final String title, final String nick, final String targetNick) {
-        super(plugin, title, "dcc-chat-inactive", false);
+        super(plugin, title, "dcc-chat-inactive", false,
+                DCCCommandParser.getDCCCommandParser());
         this.dcc = dcc;
         dcc.setHandler(this);
         nickname = nick;
         otherNickname = targetNick;
 
-        myWindow = Main.getUI().getInputWindow(this, DCCCommandParser.getDCCCommandParser());
+        myWindow = Main.getUI().getInputWindow(this);
         plugin.addWindow(this);
 
         setTitle(title);

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

@@ -95,4 +95,10 @@ public class DCCCommandParser extends CommandParser {
         ((WritableFrameContainer) origin).sendLine(line);
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public void setOwner(final FrameContainer owner) {
+        // Don't care
+    }
+
 }

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

@@ -124,9 +124,11 @@ public abstract class DCCFrame extends WritableFrameContainer {
      * @param plugin The DCCPlugin that owns this frame
      * @param title The title of this window
      * @param icon The icon to use
+     * @param parser Command parser to use for this window
      */
-    public DCCFrame(final DCCPlugin plugin, final String title, final String icon) {
-        this(plugin, title, icon, true);
+    public DCCFrame(final DCCPlugin plugin, final String title,
+            final String icon, final CommandParser parser) {
+        this(plugin, title, icon, true, parser);
     }
 
     /**
@@ -136,9 +138,11 @@ public abstract class DCCFrame extends WritableFrameContainer {
      * @param title The title of this window
      * @param defaultWindow Create default (empty) window. (non-default = chat frame)
      * @param icon The icon to use
+     * @param parser Command parser to use for this window
      */
-    public DCCFrame(final DCCPlugin plugin, final String title, final String icon, final boolean defaultWindow) {
-        super(icon, title, title, IdentityManager.getGlobalConfig());
+    public DCCFrame(final DCCPlugin plugin, final String title, final String icon,
+            final boolean defaultWindow, final CommandParser parser) {
+        super(icon, title, title, IdentityManager.getGlobalConfig(), parser);
         this.plugin = plugin;
 
         if (defaultWindow) {

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

@@ -633,7 +633,7 @@ class PlaceholderDCCFrame extends DCCFrame {
      * @param plugin Parent plugin
      */
     public PlaceholderDCCFrame(final DCCPlugin plugin) {
-        super(plugin, "DCCs", "dcc");
+        super(plugin, "DCCs", "dcc", DCCCommandParser.getDCCCommandParser());
     }
 
     @Override

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

@@ -111,7 +111,8 @@ public class DCCTransferWindow extends DCCFrame implements DCCTransferHandler,
     public DCCTransferWindow(final DCCPlugin plugin, final DCCTransfer dcc,
             final String title, final String targetNick, final Server server) {
         super(plugin, title, dcc.getType() == DCCTransfer.TransferType.SEND
-                ? "dcc-send-inactive" : "dcc-receive-inactive");
+                ? "dcc-send-inactive" : "dcc-receive-inactive",
+                DCCCommandParser.getDCCCommandParser());
         this.dcc = dcc;
         this.server = server;
         this.parser = server == null ? null : server.getParser();

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

@@ -43,7 +43,7 @@ public final class DummyChannelWindow extends DummyInputWindow implements Channe
      * @param parent Parent channel
      */
     public DummyChannelWindow(final Channel parent) {
-        super(parent, new ChannelCommandParser(parent.getServer(), parent));
+        super(parent, parent.getCommandParser());
         this.parent = parent;
     }
 

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

@@ -99,9 +99,8 @@ public final class DummyController extends Plugin implements UIController {
     
     /** {@inheritDoc} */
     @Override
-    public InputWindow getInputWindow(final WritableFrameContainer owner, 
-            final CommandParser commandParser) {
-        return new DummyInputWindow(owner, commandParser);
+    public InputWindow getInputWindow(final WritableFrameContainer owner) {
+        return new DummyInputWindow(owner, owner.getCommandParser());
     }
     
     /** {@inheritDoc} */

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

@@ -40,7 +40,7 @@ public final class DummyServerWindow extends DummyInputWindow implements ServerW
      * @param parent Parent server
      */
     public DummyServerWindow(final Server parent) {
-        super(parent, new ServerCommandParser(parent));
+        super(parent, new ServerCommandParser());
         
         this.parent = parent;
     }

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

@@ -51,7 +51,6 @@ import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
 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;
-import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -236,8 +235,7 @@ public final class SwingController extends Plugin implements Serializable,
 
     /** {@inheritDoc} */
     @Override
-    public InputWindow getInputWindow(final WritableFrameContainer owner,
-            final CommandParser commandParser) {
+    public InputWindow getInputWindow(final WritableFrameContainer owner) {
         LOGGER.finest("getInputWindow()");
 
         return UIUtilities.invokeAndWait(new ReturnableThread<CustomInputFrame>() {
@@ -246,8 +244,7 @@ public final class SwingController extends Plugin implements Serializable,
             @Override
             public void run() {
                 LOGGER.finest("getInputWindow(): run");
-                setObject(new CustomInputFrame(owner, commandParser,
-                        SwingController.this));
+                setObject(new CustomInputFrame(owner, SwingController.this));
                 LOGGER.finest("getInputWindow(): object set: " + getObject());
             }
         });

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

@@ -35,7 +35,6 @@ import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.TopicBar;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.commandparser.PopupType;
-import com.dmdirc.commandparser.parsers.ChannelCommandParser;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
@@ -66,7 +65,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
      */
     private static final long serialVersionUID = 10;
     /** This channel's command parser. */
-    private final ChannelCommandParser commandParser;
+    private final CommandParser commandParser;
     /** split pane. */
     private SplitPane splitPane;
     /** popup menu item. */
@@ -104,8 +103,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
                 "shownicklist", this);
         ActionManager.addListener(this, CoreActionType.CLIENT_CLOSING);
 
-        commandParser = new ChannelCommandParser(((Channel) getContainer()).
-                getServer(),(Channel) getContainer());
+        commandParser = owner.getCommandParser();
 
         setInputHandler(new SwingInputHandler(getInputField(), commandParser,
                 this));

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

@@ -45,23 +45,17 @@ public class CustomInputFrame extends InputTextFrame {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
-    /** The command parser to use. */
-    private final CommandParser commandParser;
 
     /**
      * Creates a new instance of CustomInputFrame.
      * 
      * @param owner The frame container that owns this frame
-     * @param commandParser The command parser to use for this frmae
      * @param controller Swing controller
      */
-    public CustomInputFrame(final WritableFrameContainer owner,
-            final CommandParser commandParser, final SwingController controller) {
+    public CustomInputFrame(final WritableFrameContainer owner, final SwingController controller) {
         super(owner, controller);
 
-        this.commandParser = commandParser;
-
-        setInputHandler(new SwingInputHandler(getInputField(), commandParser, this));
+        setInputHandler(new SwingInputHandler(getInputField(), owner.getCommandParser(), this));
 
         initComponents();
     }
@@ -69,7 +63,7 @@ public class CustomInputFrame extends InputTextFrame {
     /** {@inheritDoc} */
     @Override
     public final CommandParser getCommandParser() {
-        return commandParser;
+        return ((WritableFrameContainer) frameParent).getCommandParser();
     }
 
     /**

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

@@ -25,7 +25,6 @@ import com.dmdirc.Query;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.commandparser.parsers.QueryCommandParser;
 import com.dmdirc.ui.interfaces.QueryWindow;
 import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
 
@@ -45,9 +44,7 @@ public final class QueryFrame extends InputTextFrame implements QueryWindow {
      */
     private static final long serialVersionUID = 8;
     /** This channel's command parser. */
-    private final QueryCommandParser commandParser;
-    /** This frame's parent. */
-    private final Query parentQuery;
+    private final CommandParser commandParser;
 
     /**
      * Creates a new QueryFrame.
@@ -58,11 +55,9 @@ public final class QueryFrame extends InputTextFrame implements QueryWindow {
     public QueryFrame(final Query owner, final SwingController controller) {
         super(owner, controller);
 
-        parentQuery = owner;
-
         initComponents();
 
-        commandParser = new QueryCommandParser(((Query) getContainer()).getServer(), (Query) getContainer());
+        commandParser = owner.getCommandParser();
 
         setInputHandler(new SwingInputHandler(getInputField(), commandParser, this));
     }

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

@@ -27,7 +27,6 @@ import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.ui.interfaces.ServerWindow;
 import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
@@ -53,7 +52,7 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
      */
     private static final long serialVersionUID = 9;
     /** This channel's command parser. */
-    private final ServerCommandParser commandParser;
+    private final CommandParser commandParser;
     /** popup menu item. */
     private JMenuItem settingsMI;
 
@@ -68,7 +67,7 @@ public final class ServerFrame extends InputTextFrame implements ServerWindow,
 
         initComponents();
         
-        commandParser = new ServerCommandParser((Server) getContainer());
+        commandParser = owner.getCommandParser();
 
         setInputHandler(new SwingInputHandler(getInputField(), commandParser, this));
     }

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

@@ -27,7 +27,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.ui.interfaces.ChannelWindow;
@@ -164,9 +163,8 @@ public class WebInterfaceUI implements UIController {
 
     /** {@inheritDoc} */
     @Override
-    public InputWindow getInputWindow(final WritableFrameContainer owner,
-            final CommandParser commandParser) {
-        return new WebInputWindow(owner, commandParser);
+    public InputWindow getInputWindow(final WritableFrameContainer owner) {
+        return new WebInputWindow(owner, owner.getCommandParser());
     }
 
     /** {@inheritDoc} */

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_web.uicomponents;
 
 import com.dmdirc.Channel;
-import com.dmdirc.commandparser.parsers.ChannelCommandParser;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.interfaces.ChannelWindow;
 import com.dmdirc.addons.ui_web.DynamicRequestHandler;
@@ -40,7 +39,7 @@ public class WebChannelWindow extends WebInputWindow implements ChannelWindow {
     private final Channel channel;
 
     public WebChannelWindow(Channel channel) {
-        super(channel, new ChannelCommandParser(channel.getServer(), channel));
+        super(channel, channel.getCommandParser());
         this.channel = channel;
     }
 

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_web.uicomponents;
 
 import com.dmdirc.Query;
-import com.dmdirc.commandparser.parsers.QueryCommandParser;
 import com.dmdirc.ui.interfaces.QueryWindow;
 
 /**
@@ -35,7 +34,7 @@ public class WebQueryWindow extends WebInputWindow implements QueryWindow {
     private final Query query;
 
     public WebQueryWindow(final Query parent) {
-        super(parent, new QueryCommandParser(parent.getServer(), parent));
+        super(parent, parent.getCommandParser());
         this.query = parent;
     }
 

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_web.uicomponents;
 
 import com.dmdirc.Server;
-import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.ui.interfaces.ServerWindow;
 
 /**
@@ -35,7 +34,7 @@ public class WebServerWindow extends WebInputWindow implements ServerWindow {
     private final Server server;
 
     public WebServerWindow(Server server) {
-        super(server, new ServerCommandParser(server));
+        super(server, server.getCommandParser());
         
         this.server = server;
     }