Tidy how CommandParsers are created.

Instead of passing them in to the FrameContainer ctor, create
them afterwards.

This means the reference in FrameContainer can't be final but
removes the horrible setOwner() kludge that was previously in
CommandParser, and cuts down the deps needed to pass in to the
FrameContainer ctor.

src/com/dmdirc/Channel.java

 package com.dmdirc;
 
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.parsers.ChannelCommandParser;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ChannelClosedEvent;
 import com.dmdirc.events.ChannelSelfActionEvent;
 import com.dmdirc.events.NickListClientRemovedEvent;
 import com.dmdirc.events.NickListClientsChangedEvent;
 import com.dmdirc.events.NickListUpdatedEvent;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
      * @param newChannelInfo      The parser's channel object that corresponds to this channel
      * @param configMigrator      The config migrator which provides the config for this channel.
      * @param tabCompleterFactory The factory to use to create tab completers.
-     * @param commandController   The controller to load commands from.
      * @param messageSinkManager  The sink manager to use to despatch messages.
-     * @param eventBus            The bus to despatch events onto.
      */
     public Channel(
             final Connection connection,
             final ChannelInfo newChannelInfo,
             final ConfigProviderMigrator configMigrator,
             final TabCompleterFactory tabCompleterFactory,
-            final CommandController commandController,
             final MessageSinkManager messageSinkManager,
-            final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory,
             final GroupChatUserManager groupChatUserManager) {
         super(connection.getWindowModel(), "channel-inactive",
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
                 backBufferFactory,
-                new ChannelCommandParser(connection.getWindowModel(), commandController,  eventBus),
                 tabCompleterFactory.getTabCompleter(connection.getWindowModel().getTabCompleter(),
                         configMigrator.getConfigProvider(), CommandType.TYPE_CHANNEL,
                         CommandType.TYPE_CHAT),

src/com/dmdirc/ChannelFactory.java

 
 package com.dmdirc;
 
+import com.dmdirc.commandparser.parsers.ChannelCommandParser;
 import com.dmdirc.events.ChannelOpenedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
             final ChannelInfo channelInfo,
             final ConfigProviderMigrator configMigrator) {
         final Channel channel = new Channel(connection, channelInfo, configMigrator,
-                tabCompleterFactory, commandController, messageSinkManager, eventBus,
-                backBufferFactory, groupChatUserManager);
+                tabCompleterFactory, messageSinkManager, backBufferFactory, groupChatUserManager);
+        channel.setCommandParser(new ChannelCommandParser(connection.getWindowModel(),
+                commandController, eventBus, channel));
         windowManager.addWindow(connection.getWindowModel(), channel);
         connection.getWindowModel().getEventBus().publish(new ChannelOpenedEvent(channel));
         return channel;

src/com/dmdirc/FrameContainer.java

     /** The back buffer for this container. */
     private BackBuffer backBuffer;
 
-    /**
-     * The command parser used for commands in this container.
-     * <p>
-     * Only defined if this container is {@link #writable}.
-     */
-    private final Optional<CommandParser> commandParser;
     /**
      * The manager to use to dispatch messages to sinks.
      * <p>
      */
     private final Optional<TabCompleter> tabCompleter;
 
+    /**
+     * The command parser used for commands in this container.
+     * <p>
+     * Only defined if this container is {@link #writable}.
+     */
+    private Optional<CommandParser> commandParser = Optional.empty();
+
     /**
      * Instantiate new frame container.
      */
         this.title = title;
         this.components = new HashSet<>(components);
         this.writable = false;
-        this.commandParser = Optional.empty();
         this.tabCompleter = Optional.empty();
         this.messageSinkManager = Optional.empty();
         this.backBufferFactory = backBufferFactory;
             final String title,
             final AggregateConfigProvider config,
             final BackBufferFactory backBufferFactory,
-            final CommandParser commandParser,
             final TabCompleter tabCompleter,
             final MessageSinkManager messageSinkManager,
             final DMDircMBassador eventBus,
         this.title = title;
         this.components = new HashSet<>(components);
         this.writable = true;
-        this.commandParser = Optional.of(commandParser);
         this.tabCompleter = Optional.of(tabCompleter);
         this.messageSinkManager = Optional.of(messageSinkManager);
         this.backBufferFactory = backBufferFactory;
-        commandParser.setOwner(this);
 
         eventBusManager = new ChildEventBusManager(eventBus);
         eventBusManager.connect();
         backBuffer.startAddingEvents();
     }
 
+    public void setCommandParser(final CommandParser commandParser) {
+        this.commandParser = Optional.ofNullable(commandParser);
+    }
+
     @Override
     public Optional<WindowModel> getParent() {
         return parent;

src/com/dmdirc/GlobalWindow.java

             final GlobalCommandParser parser, final TabCompleterFactory tabCompleterFactory,
             final MessageSinkManager messageSinkManager,
             final DMDircMBassador eventBus, final BackBufferFactory backBufferFactory) {
-        super(null, "icon", "Global", "(Global)", config, backBufferFactory, parser,
+        super(null, "icon", "Global", "(Global)", config, backBufferFactory,
                 tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL),
                 messageSinkManager, eventBus,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));
         initBackBuffer();
+        setCommandParser(parser);
     }
 
     @Override

src/com/dmdirc/Query.java

 package com.dmdirc;
 
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.parsers.QueryCommandParser;
 import com.dmdirc.events.AppErrorEvent;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.events.QueryActionEvent;
 import com.dmdirc.events.QueryQuitEvent;
 import com.dmdirc.events.QuerySelfActionEvent;
 import com.dmdirc.events.QuerySelfMessageEvent;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
             final Connection connection,
             final User user,
             final TabCompleterFactory tabCompleterFactory,
-            final CommandController commandController,
             final MessageSinkManager messageSinkManager,
             final BackBufferFactory backBufferFactory) {
         super(connection.getWindowModel(), "query",
                 user.getNickname(),
                 connection.getWindowModel().getConfigManager(),
                 backBufferFactory,
-                new QueryCommandParser(connection.getWindowModel(),
-                        commandController, connection.getWindowModel().getEventBus()),
                 tabCompleterFactory.getTabCompleter(connection.getWindowModel().getTabCompleter(),
                         connection.getWindowModel().getConfigManager(),
                         CommandType.TYPE_QUERY, CommandType.TYPE_CHAT),

src/com/dmdirc/QueryFactory.java

 
 package com.dmdirc;
 
+import com.dmdirc.commandparser.parsers.QueryCommandParser;
 import com.dmdirc.events.QueryOpenedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
     }
 
     public Query getQuery(final Connection connection, final User user) {
-        final Query query = new Query(connection, user, tabCompleterFactory, commandController,
+        final Query query = new Query(connection, user, tabCompleterFactory,
                 messageSinkManager, backBufferFactory);
+        query.setCommandParser(new QueryCommandParser(connection.getWindowModel(),
+                commandController, connection.getWindowModel().getEventBus(), query));
         windowManager.addWindow(connection.getWindowModel(), query);
         connection.getWindowModel().getEventBus().publish(new QueryOpenedEvent(query));
         return query;

src/com/dmdirc/Server.java

 package com.dmdirc;
 
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.events.AppErrorEvent;
 import com.dmdirc.events.ServerConnectErrorEvent;
      */
     public Server(
             final ConfigProviderMigrator configMigrator,
-            final CommandParser commandParser,
             final ParserFactory parserFactory,
             final TabCompleterFactory tabCompleterFactory,
             final IdentityFactory identityFactory,
                 getHost(uri),
                 configMigrator.getConfigProvider(),
                 backBufferFactory,
-                commandParser,
                 tabCompleterFactory.getTabCompleter(configMigrator.getConfigProvider(),
                         CommandType.TYPE_SERVER, CommandType.TYPE_GLOBAL),
                 messageSinkManager,

src/com/dmdirc/ServerFactoryImpl.java

 
 package com.dmdirc;
 
-import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.config.profiles.Profile;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
     private final IdentityFactory identityFactory;
     private final MessageSinkManager messageSinkManager;
     private final Provider<QueryFactory> queryFactory;
+    private final Provider<CommandController> commandController;
     private final DMDircMBassador eventBus;
     private final MessageEncoderFactory messageEncoderFactory;
     private final ConfigProvider userSettings;
             final IdentityFactory identityFactory,
             final MessageSinkManager messageSinkManager,
             final Provider<QueryFactory> queryFactory,
+            final Provider<CommandController> commandController,
             final DMDircMBassador eventBus,
             final MessageEncoderFactory messageEncoderFactory,
             @ClientModule.UserConfig final ConfigProvider userSettings,
         this.identityFactory = identityFactory;
         this.messageSinkManager = messageSinkManager;
         this.queryFactory = queryFactory;
+        this.commandController = commandController;
         this.eventBus = eventBus;
         this.messageEncoderFactory = messageEncoderFactory;
         this.userSettings = userSettings;
 
     public Server getServer(
             final ConfigProviderMigrator configMigrator,
-            final CommandParser commandParser,
             final ScheduledExecutorService executorService,
             final URI uri,
             final Profile profile) {
-        return new Server(configMigrator, commandParser, parserFactory,
+        final Server server = new Server(configMigrator, parserFactory,
                 tabCompleterFactory, identityFactory, messageSinkManager,
                 queryFactory.get(), eventBus, messageEncoderFactory, userSettings,
                 groupChatManagerFactory, executorService, uri, profile, backBufferFactory,
                 userManager);
+        server.setCommandParser(new ServerCommandParser(server.getConfigManager(),
+                commandController.get(), eventBus, server));
+        return server;
     }
 }

src/com/dmdirc/ServerManager.java

 
         final Server server = serverFactoryImpl.getServer(
                 configProvider,
-                new ServerCommandParser(configProvider.getConfigProvider(), commandController.get(),
-                        eventBus),
                 Executors.newScheduledThreadPool(1,
                         new ThreadFactoryBuilder().setNameFormat("server-timer-%d").build()),
                 uri,

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

     /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** The group chat instance that this parser is attached to. */
-    private GroupChat groupChat;
+    private final GroupChat groupChat;
 
     /**
      * Creates a new instance of ChannelCommandParser.
      * @param commandController The controller to load commands from.
      * @param eventBus          Event bus to post events on
      */
-    public ChannelCommandParser(final WindowModel owner,
+    public ChannelCommandParser(
+            final WindowModel owner,
             final CommandController commandController,
-            final DMDircMBassador eventBus) {
-        super(owner, commandController, eventBus);
-    }
-
-    @Override
-    public void setOwner(final WindowModel owner) {
-        if (groupChat == null) {
-            // TODO: Can't assume that framecontainers may be group chats.
-            groupChat = (GroupChat) owner;
-        }
+            final DMDircMBassador eventBus,
+            final GroupChat groupChat) {
+        super(owner, commandController, eventBus, groupChat);
 
-        super.setOwner(owner);
+        this.groupChat = groupChat;
     }
 
     @Override

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

     /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** The container that owns this parser. */
-    private Chat owner;
+    private final Chat owner;
 
     /**
      * Creates a new chat command parser that belongs to a child of the specified server.
      * @param commandController The controller to load commands from.
      * @param eventBus          Event but to post events on
      */
-    public ChatCommandParser(final WindowModel owner, final CommandController commandController,
-            final DMDircMBassador eventBus) {
-        super(owner.getConfigManager(), commandController, eventBus);
-        super.setOwner(owner);
-    }
-
-    @Override
-    public void setOwner(final WindowModel owner) {
-        if (this.owner == null && owner instanceof Chat) {
-            this.owner = (Chat) owner;
-        }
+    public ChatCommandParser(
+            final WindowModel owner,
+            final CommandController commandController,
+            final DMDircMBassador eventBus,
+            final Chat chat) {
+        super(owner.getConfigManager(), commandController, eventBus, chat.getConnection().get());
+        this.owner = chat;
     }
 
     @Override

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

         loadCommands();
     }
 
-    /**
-     * Sets the owner of this command parser.
-     *
-     * @param owner The container which owns this parser
-     *
-     * @since 0.6.4
-     */
-    public abstract void setOwner(final WindowModel owner);
-
     /** Loads the relevant commands into the parser. */
     protected abstract void loadCommands();
 

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

         this.eventBus = eventBus;
     }
 
-    @Override
-    public void setOwner(final WindowModel owner) {
-        // Don't care
-    }
-
     /** Loads the relevant commands into the parser. */
     @Override
     protected void loadCommands() {

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

     /**
      * The query instance that this parser is attached to.
      */
-    private Query query;
+    private final Query query;
 
     /**
      * Creates a new instance of QueryCommandParser.
      * @param eventBus          Event bus to post events on
      */
     public QueryCommandParser(final WindowModel owner, final CommandController commandController,
-            final DMDircMBassador eventBus) {
-        super(owner, commandController, eventBus);
-    }
-
-    @Override
-    public void setOwner(final WindowModel owner) {
-        if (query == null) {
-            query = (Query) owner;
-        }
-
-        super.setOwner(query);
+            final DMDircMBassador eventBus, final Query query) {
+        super(owner, commandController, eventBus, query);
+        this.query = query;
     }
 
     /** Loads the relevant commands into the parser. */

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

     /** A version number for this class. */
     private static final long serialVersionUID = 1;
 
+    /**
+     * The server instance that this parser is attached to.
+     */
+    private final Connection server;
+
     /**
      * Creates a new command parser for server commands.
      *
     public ServerCommandParser(
             final AggregateConfigProvider configManager,
             final CommandController commandController,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            final Connection connection) {
         super(configManager, commandController, eventBus);
-    }
-    /**
-     * The server instance that this parser is attached to.
-     */
-    private Connection server;
-
-    @Override
-    public void setOwner(final WindowModel owner) {
-        if (server == null && owner instanceof Connection) {
-            server = (Connection) owner;
-        }
-
-        super.setOwner(owner);
+        this.server = connection;
     }
 
     /** Loads the relevant commands into the parser. */

test/com/dmdirc/ServerManagerTest.java

 
 package com.dmdirc;
 
-import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.config.profiles.ProfileManager;
 import com.dmdirc.interfaces.CommandController;
                 anyString())).thenReturn(configProviderMigrator);
         when(configProviderMigrator.getConfigProvider()).thenReturn(configProvider);
 
-        when(serverFactoryImpl.getServer(eq(configProviderMigrator), any(CommandParser.class),
+        when(serverFactoryImpl.getServer(eq(configProviderMigrator),
                 any(ScheduledExecutorService.class), uriCaptor.capture(), eq(profile)))
                 .thenReturn(server);
     }

test/com/dmdirc/harness/TestCommandParser.java

         invalidCommand = args.getCommandName();
     }
 
-    @Override
-    public void setOwner(final WindowModel owner) {
-        // Don't care
-    }
-
 }

test/com/dmdirc/harness/TestWritableFrameContainer.java

             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
         super(null, "raw", "Raw", "(Raw)", cm, backBufferFactory,
-                new GlobalCommandParser(cm, commandManager, eventBus),
                 new TabCompleter(mock(CommandController.class), cm),
                 messageSinkManager,
                 eventBus,
                 Collections.<String>emptySet());
 
+        setCommandParser(new GlobalCommandParser(cm, commandManager, eventBus));
         this.lineLength = lineLength;
     }