Make CommandParser use WindowModel.

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.commandparser.commands.context;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * A specialised {@link CommandContext} for commands executed in channels.
@@ -43,7 +43,7 @@ public class ChannelCommandContext extends ChatCommandContext {
      * @param commandInfo The command info object which associated the command with the input
      * @param groupChat  The group chat associated with the command
      */
-    public ChannelCommandContext(final FrameContainer source,
+    public ChannelCommandContext(final WindowModel source,
             final CommandInfo commandInfo, final GroupChat groupChat) {
         super(source, commandInfo, groupChat);
         this.groupChat = groupChat;

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.commandparser.commands.context;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.interfaces.Chat;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Optional;
 
@@ -45,11 +45,11 @@ public class ChatCommandContext extends ServerCommandContext {
      * @param commandInfo The command info object which associated the command with the input
      * @param chat        The chat container associated with the command
      */
-    public ChatCommandContext(final FrameContainer source,
+    public ChatCommandContext(final WindowModel source,
             final CommandInfo commandInfo, final Chat chat) {
         super(source, commandInfo,
                 Optional.ofNullable(source)
-                        .flatMap(FrameContainer::getConnection)
+                        .flatMap(WindowModel::getConnection)
                         .orElse(null));
         this.chat = chat;
     }

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.commandparser.commands.context;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Provides information relating to the context that a command was executed in.
@@ -35,7 +35,7 @@ public class CommandContext {
     /** The command info object which associated the command with the input. */
     protected final CommandInfo commandInfo;
     /** The source of this command. */
-    protected final FrameContainer source;
+    protected final WindowModel source;
 
     /**
      * Creates a new command context.
@@ -43,7 +43,7 @@ public class CommandContext {
      * @param source      The source of the command
      * @param commandInfo The command info object which associated the command with the input
      */
-    public CommandContext(final FrameContainer source, final CommandInfo commandInfo) {
+    public CommandContext(final WindowModel source, final CommandInfo commandInfo) {
         this.source = source;
         this.commandInfo = commandInfo;
     }
@@ -63,7 +63,7 @@ public class CommandContext {
      *
      * @return The window the command came from, or null
      */
-    public FrameContainer getSource() {
+    public WindowModel getSource() {
         return source;
     }
 

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.commandparser.commands.context;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * A query-specific command context.
@@ -43,7 +43,7 @@ public class QueryCommandContext extends ChatCommandContext {
      * @param commandInfo The command info object which associated the command with the input
      * @param query       The query associated with the command
      */
-    public QueryCommandContext(final FrameContainer source,
+    public QueryCommandContext(final WindowModel source,
             final CommandInfo commandInfo, final Query query) {
         super(source, commandInfo, query);
         this.query = query;

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.commandparser.commands.context;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * A command context for connection commands.
@@ -43,7 +43,7 @@ public class ServerCommandContext extends CommandContext {
      * @param commandInfo The command info object which associated the command with the input
      * @param connection      The connection associated with the command
      */
-    public ServerCommandContext(final FrameContainer source, final CommandInfo commandInfo,
+    public ServerCommandContext(final WindowModel source, final CommandInfo commandInfo,
             final Connection connection) {
         super(source, commandInfo);
         this.connection = connection;

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

@@ -32,6 +32,7 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 
@@ -59,7 +60,7 @@ public class ChannelCommandParser extends ChatCommandParser {
     }
 
     @Override
-    public void setOwner(final FrameContainer owner) {
+    public void setOwner(final WindowModel owner) {
         if (groupChat == null) {
             // TODO: Can't assume that framecontainers may be group chats.
             groupChat = (GroupChat) owner;
@@ -76,7 +77,7 @@ public class ChannelCommandParser extends ChatCommandParser {
 
     @Override
     protected CommandContext getCommandContext(
-            final FrameContainer origin,
+            final WindowModel origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args) {
@@ -85,7 +86,7 @@ public class ChannelCommandParser extends ChatCommandParser {
 
     @Override
     protected void executeCommand(
-            @Nonnull final FrameContainer origin,
+            @Nonnull final WindowModel origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args,

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

@@ -32,6 +32,7 @@ import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.Chat;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 
@@ -61,7 +62,7 @@ public class ChatCommandParser extends ServerCommandParser {
     }
 
     @Override
-    public void setOwner(final FrameContainer owner) {
+    public void setOwner(final WindowModel owner) {
         if (this.owner == null && owner instanceof Chat) {
             this.owner = (Chat) owner;
         }
@@ -69,7 +70,7 @@ public class ChatCommandParser extends ServerCommandParser {
 
     @Override
     protected CommandContext getCommandContext(
-            final FrameContainer origin,
+            final WindowModel origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args) {
@@ -78,7 +79,7 @@ public class ChatCommandParser extends ServerCommandParser {
 
     @Override
     protected void executeCommand(
-            @Nonnull final FrameContainer origin,
+            @Nonnull final WindowModel origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args,
@@ -91,7 +92,7 @@ public class ChatCommandParser extends ServerCommandParser {
     }
 
     @Override
-    protected void handleNonCommand(final FrameContainer origin,
+    protected void handleNonCommand(final WindowModel origin,
             final String line) {
         owner.sendLine(line);
     }

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

@@ -38,6 +38,7 @@ import com.dmdirc.events.UnknownCommandEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.collections.RollingList;
@@ -94,7 +95,7 @@ public abstract class CommandParser implements Serializable {
      *
      * @since 0.6.4
      */
-    public abstract void setOwner(final FrameContainer owner);
+    public abstract void setOwner(final WindowModel owner);
 
     /** Loads the relevant commands into the parser. */
     protected abstract void loadCommands();
@@ -140,7 +141,7 @@ public abstract class CommandParser implements Serializable {
      *
      * @since 0.6.4
      */
-    public final void parseCommand(@Nonnull final FrameContainer origin, final String line,
+    public final void parseCommand(@Nonnull final WindowModel origin, final String line,
             final boolean parseChannel) {
         checkNotNull(origin);
 
@@ -176,7 +177,7 @@ public abstract class CommandParser implements Serializable {
      *
      * @return True iff the command was handled, false otherwise
      */
-    protected boolean handleChannelCommand(@Nonnull final FrameContainer origin,
+    protected boolean handleChannelCommand(@Nonnull final WindowModel origin,
             final CommandArguments args, final boolean parseChannel) {
         final boolean silent = args.isSilent();
         final String command = args.getCommandName();
@@ -200,7 +201,8 @@ public abstract class CommandParser implements Serializable {
         if (someValid) {
             for (String channelName : parts) {
                 if (!server.getGroupChatManager().isValidChannelName(channelName)) {
-                    origin.getEventBus().publishAsync(new CommandErrorEvent(origin,
+                    origin.getEventBus().publishAsync(new CommandErrorEvent(
+                            (FrameContainer) origin,
                             "Invalid channel name: " + channelName));
                     continue;
                 }
@@ -301,7 +303,7 @@ public abstract class CommandParser implements Serializable {
      * @return The context for the command.
      */
     protected abstract CommandContext getCommandContext(
-            final FrameContainer origin,
+            final WindowModel origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args);
@@ -316,7 +318,7 @@ public abstract class CommandParser implements Serializable {
      * @param context     The context to use when executing the command
      */
     protected abstract void executeCommand(
-            @Nonnull final FrameContainer origin,
+            @Nonnull final WindowModel origin,
             final CommandInfo commandInfo, final Command command,
             final CommandArguments args, final CommandContext context);
 
@@ -330,13 +332,13 @@ public abstract class CommandParser implements Serializable {
      *
      * @since 0.6.3m1
      */
-    protected void handleInvalidCommand(final FrameContainer origin,
+    protected void handleInvalidCommand(final WindowModel origin,
             final CommandArguments args) {
         if (origin == null) {
             eventBus.publish(new UnknownCommandEvent(null, args.getCommandName(), args.getArguments()));
         } else {
-            final UnknownCommandEvent event = new UnknownCommandEvent(origin, args.getCommandName(),
-                    args.getArguments());
+            final UnknownCommandEvent event = new UnknownCommandEvent((FrameContainer) origin,
+                    args.getCommandName(), args.getArguments());
             final String format = EventUtils.postDisplayable(eventBus, event, "unknownCommand");
 
             origin.addLine(format, args.getCommandName());
@@ -350,7 +352,7 @@ public abstract class CommandParser implements Serializable {
      * @param origin The window in which the command was typed
      * @param line   The line input by the user
      */
-    protected abstract void handleNonCommand(final FrameContainer origin,
+    protected abstract void handleNonCommand(final WindowModel origin,
             final String line);
 
     /**

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

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 
@@ -67,7 +68,7 @@ public class GlobalCommandParser extends CommandParser {
     }
 
     @Override
-    public void setOwner(final FrameContainer owner) {
+    public void setOwner(final WindowModel owner) {
         // Don't care
     }
 
@@ -79,7 +80,7 @@ public class GlobalCommandParser extends CommandParser {
 
     @Override
     protected CommandContext getCommandContext(
-            final FrameContainer origin,
+            final WindowModel origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args) {
@@ -88,7 +89,7 @@ public class GlobalCommandParser extends CommandParser {
 
     @Override
     protected void executeCommand(
-            @Nonnull final FrameContainer origin,
+            @Nonnull final WindowModel origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args,
@@ -104,14 +105,15 @@ public class GlobalCommandParser extends CommandParser {
      * @param line   The line input by the user
      */
     @Override
-    protected void handleNonCommand(final FrameContainer origin, final String line) {
+    protected void handleNonCommand(final WindowModel origin, final String line) {
         if (origin == null) {
             eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM,
                     new IllegalArgumentException("Invalid Global Command: " + line),
                     "Invalid Global Command: " + line, ""));
         } else {
             origin.getEventBus().publishAsync(
-                    new CommandErrorEvent(origin, "Invalid global command: " + line));
+                    new CommandErrorEvent((FrameContainer) origin,
+                            "Invalid global command: " + line));
         }
     }
 

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

@@ -32,6 +32,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.QueryCommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
 
@@ -61,7 +62,7 @@ public class QueryCommandParser extends ChatCommandParser {
     }
 
     @Override
-    public void setOwner(final FrameContainer owner) {
+    public void setOwner(final WindowModel owner) {
         if (query == null) {
             query = (Query) owner;
         }
@@ -78,7 +79,7 @@ public class QueryCommandParser extends ChatCommandParser {
 
     @Override
     protected CommandContext getCommandContext(
-            final FrameContainer origin,
+            final WindowModel origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args) {
@@ -87,7 +88,7 @@ public class QueryCommandParser extends ChatCommandParser {
 
     @Override
     protected void executeCommand(
-            @Nonnull final FrameContainer origin,
+            @Nonnull final WindowModel origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args,

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

@@ -34,6 +34,7 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import javax.annotation.Nonnull;
@@ -65,7 +66,7 @@ public class ServerCommandParser extends GlobalCommandParser {
     private Connection server;
 
     @Override
-    public void setOwner(final FrameContainer owner) {
+    public void setOwner(final WindowModel owner) {
         if (server == null && owner instanceof Connection) {
             server = (Connection) owner;
         }
@@ -81,7 +82,7 @@ public class ServerCommandParser extends GlobalCommandParser {
 
     @Override
     protected CommandContext getCommandContext(
-            final FrameContainer origin,
+            final WindowModel origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args) {
@@ -90,7 +91,7 @@ public class ServerCommandParser extends GlobalCommandParser {
 
     @Override
     protected void executeCommand(
-            @Nonnull final FrameContainer origin,
+            @Nonnull final WindowModel origin,
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args,
@@ -101,7 +102,8 @@ public class ServerCommandParser extends GlobalCommandParser {
                     && server.getState() != ServerState.CONNECTING)
                     || !server.getParser().isPresent())) {
                 if (!args.isSilent()) {
-                    origin.getEventBus().publishAsync(new CommandErrorEvent(origin,
+                    origin.getEventBus().publishAsync(new CommandErrorEvent(
+                            (FrameContainer) origin,
                             "You must be connected to use this command"));
                 }
             } else {
@@ -120,7 +122,7 @@ public class ServerCommandParser extends GlobalCommandParser {
      * @param line   The line input by the user
      */
     @Override
-    protected void handleNonCommand(final FrameContainer origin, final String line) {
+    protected void handleNonCommand(final WindowModel origin, final String line) {
         server.sendLine(line);
     }
 

test/com/dmdirc/harness/TestCommandParser.java

@@ -23,13 +23,13 @@
 package com.dmdirc.harness;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import javax.annotation.Nonnull;
@@ -59,7 +59,7 @@ public class TestCommandParser extends CommandParser {
     }
 
     @Override
-    protected void executeCommand(@Nonnull final FrameContainer origin, final CommandInfo commandInfo, final Command command,
+    protected void executeCommand(@Nonnull final WindowModel origin, final CommandInfo commandInfo, final Command command,
             final CommandArguments args, final CommandContext context) {
         executedCommand = command;
         wasSilent = args.isSilent();
@@ -67,24 +67,24 @@ public class TestCommandParser extends CommandParser {
     }
 
     @Override
-    protected CommandContext getCommandContext(final FrameContainer origin, final CommandInfo commandInfo,
+    protected CommandContext getCommandContext(final WindowModel origin, final CommandInfo commandInfo,
             final Command command, final CommandArguments args) {
         return new CommandContext(origin, commandInfo);
     }
 
     @Override
-    protected void handleNonCommand(final FrameContainer origin, final String line) {
+    protected void handleNonCommand(final WindowModel origin, final String line) {
         nonCommandLine = line;
     }
 
     @Override
-    protected void handleInvalidCommand(final FrameContainer origin,
+    protected void handleInvalidCommand(final WindowModel origin,
             final CommandArguments args) {
         invalidCommand = args.getCommandName();
     }
 
     @Override
-    public void setOwner(final FrameContainer owner) {
+    public void setOwner(final WindowModel owner) {
         // Don't care
     }