Use GroupChat in Connection.getChannel().

src/com/dmdirc/Channel.java

@@ -570,4 +570,9 @@ public class Channel extends MessageTarget implements GroupChat {
                 .collect(Collectors.toList());
     }
 
+    @Override
+    public FrameContainer getWindowModel() {
+        return this;
+    }
+
 }

src/com/dmdirc/MessageEncoder.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.parser.interfaces.Encoder;
 import com.dmdirc.parser.interfaces.Parser;
@@ -65,7 +66,8 @@ public class MessageEncoder implements Encoder {
 
         if (target != null && parser.isValidChannelName(target)) {
             encoding = connection.getChannel(target)
-                    .map(Channel::getConfigManager)
+                    .map(GroupChat::getWindowModel)
+                    .map(FrameContainer::getConfigManager)
                     .map(cm -> cm.getOption("general", "encoding"))
                     .orElse(encoding);
         }

src/com/dmdirc/Server.java

@@ -34,6 +34,7 @@ import com.dmdirc.events.ServerConnectingEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.events.ServerInviteExpiredEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -483,8 +484,8 @@ public class Server extends FrameContainer implements Connection {
     }
 
     @Override
-    public Optional<Channel> getChannel(final String channel) {
-        return channels.get(channel);
+    public Optional<GroupChat> getChannel(final String channel) {
+        return channels.get(channel).map(c -> (GroupChat) c);
     }
 
     @Override
@@ -590,7 +591,7 @@ public class Server extends FrameContainer implements Connection {
 
         backgroundChannels.remove(chan.getName());
 
-        final Optional<Channel> channel = getChannel(chan.getName());
+        final Optional<Channel> channel = channels.get(chan.getName());
         if (channel.isPresent()) {
             channel.get().setChannelInfo(chan);
             channel.get().selfJoin();
@@ -723,7 +724,7 @@ public class Server extends FrameContainer implements Connection {
                                 + request.getName();
                     }
 
-                    if (getChannel(name).map(Channel::isOnChannel).orElse(false)) {
+                    if (getChannel(name).map(GroupChat::isOnChannel).orElse(false)) {
                         if (!focus) {
                             backgroundChannels.add(name);
                         }

src/com/dmdirc/commandparser/commands/server/Message.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.server;
 
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -36,6 +35,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -80,7 +80,7 @@ public class Message extends Command implements IntelligentCommand,
 
             // If this is a known server or channel, and this is not a silent
             // invocation, use sendLine, else send it raw to the parser.
-            final Optional<Channel> channel = connection.getChannel(target);
+            final Optional<GroupChat> channel = connection.getChannel(target);
             if (!args.isSilent() && channel.isPresent()) {
                 channel.get().sendLine(message);
             } else if (!args.isSilent() && connection.hasQuery(target)) {

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.parsers;
 
-import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
@@ -37,6 +36,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.UnknownCommandEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.collections.RollingList;
@@ -208,9 +208,10 @@ public abstract class CommandParser implements Serializable {
                         + args.getCommandName()
                         + (cargs.length > 1 ? ' ' + args.getArgumentsAsString(1) : "");
 
-                final Optional<Channel> channel = server.getChannel(channelName);
+                final Optional<GroupChat> channel = server.getChannel(channelName);
                 if (channel.isPresent()) {
-                    channel.get().getCommandParser().parseCommand(origin, newCommandString, false);
+                    channel.get().getWindowModel().getCommandParser()
+                            .parseCommand(origin, newCommandString, false);
                 } else {
                     final Map.Entry<CommandInfo, Command> actCommand = commandManager.getCommand(
                             CommandType.TYPE_CHANNEL, command);

src/com/dmdirc/interfaces/Connection.java

@@ -155,7 +155,7 @@ public interface Connection {
      *
      * @return The appropriate channel object
      */
-    Optional<Channel> getChannel(final String channel);
+    Optional<GroupChat> getChannel(final String channel);
 
     /**
      * Retrieves the possible channel prefixes in use on this server.
@@ -437,17 +437,17 @@ public interface Connection {
     void updateTitle();
 
     /**
-     * Gets the core model for the input/output window for this connection.
+     * Sends a raw line to the underlying connection.
      *
-     * @return A model for windows based on this connection.
+     * @param line The line to be sent
      */
-    FrameContainer getWindowModel();
+    void sendLine(String line);
 
     /**
-     * Sends a raw line to the underlying connection.
+     * Gets the core model for the input/output window for this connection.
      *
-     * @param line The line to be sent
+     * @return A model for windows based on this connection.
      */
-    void sendLine(String line);
+    FrameContainer getWindowModel();
 
 }

src/com/dmdirc/interfaces/GroupChat.java

@@ -23,6 +23,7 @@
 package com.dmdirc.interfaces;
 
 import com.dmdirc.DMDircMBassador;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Topic;
 
 import java.util.Collection;
@@ -117,4 +118,11 @@ public interface GroupChat extends Chat {
      */
     Collection<GroupChatUser> getUsers();
 
+    /**
+     * Gets the core model for the input/output window for this connection.
+     *
+     * @return A model for windows based on this connection.
+     */
+    FrameContainer getWindowModel();
+
 }

test/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -86,6 +86,7 @@ public class CommandParserTest {
         channelCommandParser = new TestCommandParser(configProvider, commandController, eventBus);
         channelCommandParser.registerCommand(channelCommand, channelCommandInfo);
 
+        when(channel.getWindowModel()).thenReturn(channel);
         when(channel.getCommandParser()).thenReturn(channelCommandParser);
     }