Use new GroupChatManager methods.

Remove them from the Connection interface.

src/com/dmdirc/MessageEncoder.java

@@ -65,7 +65,7 @@ public class MessageEncoder implements Encoder {
                 .getOption("general", "encoding");
 
         if (target != null && parser.isValidChannelName(target)) {
-            encoding = connection.getChannel(target)
+            encoding = connection.getGroupChatManager().getChannel(target)
                     .map(GroupChat::getWindowModel)
                     .map(FrameContainer::getConfigManager)
                     .map(cm -> cm.getOption("general", "encoding"))

src/com/dmdirc/ServerManager.java

@@ -188,7 +188,8 @@ public class ServerManager implements ConnectionManager {
         } else {
             final Collection<? extends ChannelJoinRequest> joinRequests =
                     server.getParser().get().extractChannels(uri);
-            server.join(joinRequests.toArray(new ChannelJoinRequest[joinRequests.size()]));
+            server.getGroupChatManager()
+                    .join(joinRequests.toArray(new ChannelJoinRequest[joinRequests.size()]));
         }
 
         return server;
@@ -204,8 +205,8 @@ public class ServerManager implements ConnectionManager {
             if (server.getState() == ServerState.CONNECTED) {
                 connectedServer = server;
 
-                if (server.getChannel("#DMDirc").isPresent()) {
-                    server.join(new ChannelJoinRequest("#DMDirc"));
+                if (server.getGroupChatManager().getChannel("#DMDirc").isPresent()) {
+                    server.getGroupChatManager().join(new ChannelJoinRequest("#DMDirc"));
                     return;
                 }
             }
@@ -219,7 +220,7 @@ public class ServerManager implements ConnectionManager {
                         "Unable to construct new server", ""));
             }
         } else {
-            connectedServer.join(new ChannelJoinRequest("#DMDirc"));
+            connectedServer.getGroupChatManager().join(new ChannelJoinRequest("#DMDirc"));
         }
     }
 

src/com/dmdirc/commandparser/CommandManager.java

@@ -178,7 +178,7 @@ public class CommandManager implements CommandController {
 
             if (command.getType() == CommandType.TYPE_CHANNEL
                     || command.getType() == CommandType.TYPE_CHAT) {
-                for (GroupChat channel : server.getChannels()) {
+                for (GroupChat channel : server.getGroupChatManager().getChannels()) {
                     registerCommandName(channel.getWindowModel().getTabCompleter(),
                             commandName, register);
                 }

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

@@ -70,7 +70,7 @@ public class AllChannels extends Command implements IntelligentCommand {
         final Connection server = ((ServerCommandContext) context).getConnection();
         final String command = args.getArgumentsAsString();
 
-        for (GroupChat channel : server.getChannels()) {
+        for (GroupChat channel : server.getGroupChatManager().getChannels()) {
             channel.getWindowModel().getCommandParser().parseCommand(channel.getWindowModel(),
                     command);
         }

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

@@ -100,7 +100,8 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
             }
         }
 
-        connection.join(!args.isSilent(), channels.toArray(new ChannelJoinRequest[channels.size()]));
+        connection.getGroupChatManager()
+                .join(!args.isSilent(), channels.toArray(new ChannelJoinRequest[channels.size()]));
     }
 
     @Handler
@@ -140,11 +141,12 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
         if (!showExisting) {
             // Only tab complete channels we're not already on
             targets.addAll(results.stream()
-                    .filter(result -> !connection.getChannel(result).isPresent())
+                    .filter(result -> !connection.getGroupChatManager()
+                            .getChannel(result).isPresent())
                     .map(result -> prefix + result).collect(Collectors.toList()));
         }
 
-        for (char chPrefix : connection.getChannelPrefixes().toCharArray()) {
+        for (char chPrefix : connection.getGroupChatManager().getChannelPrefixes().toCharArray()) {
             // Let them tab complete the prefixes as well
             targets.add(prefix + chPrefix);
         }

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

@@ -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<GroupChat> channel = connection.getChannel(target);
+            final Optional<GroupChat> channel = connection.getGroupChatManager().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

@@ -193,12 +193,12 @@ public abstract class CommandParser implements Serializable {
         final String[] parts = cargs[0].split(",");
         boolean someValid = false;
         for (String part : parts) {
-            someValid |= server.isValidChannelName(part);
+            someValid |= server.getGroupChatManager().isValidChannelName(part);
         }
 
         if (someValid) {
             for (String channelName : parts) {
-                if (!server.isValidChannelName(channelName)) {
+                if (!server.getGroupChatManager().isValidChannelName(channelName)) {
                     origin.addLine("commandError", "Invalid channel name: " + channelName);
                     continue;
                 }
@@ -208,7 +208,8 @@ public abstract class CommandParser implements Serializable {
                         + args.getCommandName()
                         + (cargs.length > 1 ? ' ' + args.getArgumentsAsString(1) : "");
 
-                final Optional<GroupChat> channel = server.getChannel(channelName);
+                final Optional<GroupChat> channel = server.getGroupChatManager()
+                        .getChannel(channelName);
                 if (channel.isPresent()) {
                     channel.get().getWindowModel().getCommandParser()
                             .parseCommand(origin, newCommandString, false);

src/com/dmdirc/interfaces/Connection.java

@@ -29,7 +29,6 @@ import com.dmdirc.ServerState;
 import com.dmdirc.ServerStatus;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.parser.common.IgnoreList;
 import com.dmdirc.parser.interfaces.Parser;
 
@@ -147,29 +146,6 @@ public interface Connection {
      */
     String getAwayMessage();
 
-    /**
-     * Retrieves the specified channel belonging to this server.
-     *
-     * @param channel The channel to be retrieved
-     *
-     * @return The appropriate channel object
-     */
-    Optional<GroupChat> getChannel(final String channel);
-
-    /**
-     * Retrieves the possible channel prefixes in use on this server.
-     *
-     * @return This server's possible channel prefixes
-     */
-    String getChannelPrefixes();
-
-    /**
-     * Gets a collection of all channels on this connection.
-     *
-     * @return collection of channels belonging to this connection
-     */
-    Collection<GroupChat> getChannels();
-
     /**
      * Retrieves this server's ignore list.
      *
@@ -328,38 +304,6 @@ public interface Connection {
      */
     boolean isNetwork(final String target);
 
-    /**
-     * Determines if the specified channel name is valid. A channel name is valid if we already have
-     * an existing Channel with the same name, or we have a valid parser instance and the parser
-     * says it's valid.
-     *
-     * @param channelName The name of the channel to test
-     *
-     * @return True if the channel name is valid, false otherwise
-     */
-    boolean isValidChannelName(final String channelName);
-
-    /**
-     * Attempts to join the specified channels. If channels with the same name already exist, they
-     * are (re)joined and their windows activated.
-     *
-     * @param requests The channel join requests to process
-     *
-     * @since 0.6.4
-     */
-    void join(final ChannelJoinRequest... requests);
-
-    /**
-     * Attempts to join the specified channels. If channels with the same name already exist, they
-     * are (re)joined.
-     *
-     * @param focus    Whether or not to focus any new channels
-     * @param requests The channel join requests to process
-     *
-     * @since 0.6.4
-     */
-    void join(final boolean focus, final ChannelJoinRequest... requests);
-
     /**
      * Reconnects to the server with a specified reason.
      *

src/com/dmdirc/lists/GroupListManager.java

@@ -98,7 +98,7 @@ public class GroupListManager implements GroupListStartListener,
      * @param entry Group list entry to join
      */
     public void joinGroupListEntry(final GroupListEntry entry) {
-        connection.join(new ChannelJoinRequest(entry.getName()));
+        connection.getGroupChatManager().join(new ChannelJoinRequest(entry.getName()));
     }
 
     /**

src/com/dmdirc/ui/messages/Styliser.java

@@ -261,7 +261,7 @@ public class Styliser implements ConfigChangeListener {
     public String doLinks(final String string) {
         String target = string;
         final String prefixes = connection == null ? null
-                : connection.getChannelPrefixes();
+                : connection.getGroupChatManager().getChannelPrefixes();
 
         String target2 = target;
         target = target.replaceAll(URL_REGEXP, CODE_HYPERLINK + "$0" + CODE_HYPERLINK);

src/com/dmdirc/ui/messages/sink/ChannelMessageSink.java

@@ -58,7 +58,8 @@ public class ChannelMessageSink implements MessageSink {
             final String messageType, final Object... args) {
         final String channelName = String.format(patternMatches[0], args);
         final Connection connection = source.getConnection().get();
-        final Optional<GroupChat> channel = connection.getChannel(channelName);
+        final Optional<GroupChat> channel = connection.getGroupChatManager()
+                .getChannel(channelName);
 
         if (channel.isPresent()) {
             channel.get().getWindowModel().addLine(messageType, date, args);

src/com/dmdirc/ui/messages/sink/CommonChannelsMessageSink.java

@@ -62,7 +62,7 @@ public class CommonChannelsMessageSink implements MessageSink {
         final User user = connection.getUser(username);
         boolean found = false;
 
-        for (GroupChat channel : connection.getChannels()) {
+        for (GroupChat channel : connection.getGroupChatManager().getChannels()) {
             if (channel.getUser(user).isPresent()) {
                 channel.getWindowModel().addLine(messageType, date, args);
                 found = true;

test/com/dmdirc/ServerManagerTest.java

@@ -26,6 +26,7 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.config.profiles.ProfileManager;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
@@ -68,6 +69,7 @@ public class ServerManagerTest {
     @Mock private WindowManager windowManager;
     @Mock private ServerFactoryImpl serverFactoryImpl;
     @Mock private Server server;
+    @Mock private GroupChatManager groupChatManager;
     @Mock private DMDircMBassador eventBus;
     @Mock private Channel channel;
 
@@ -81,6 +83,7 @@ public class ServerManagerTest {
                 commandControllerProvider, windowManager, serverFactoryImpl, eventBus);
 
         when(server.getState()).thenReturn(ServerState.DISCONNECTED);
+        when(server.getGroupChatManager()).thenReturn(groupChatManager);
         when(commandControllerProvider.get()).thenReturn(commandController);
 
         when(profileManager.getProfiles()).thenReturn(Collections.singletonList(profile));
@@ -160,27 +163,29 @@ public class ServerManagerTest {
     @Test
     public void testDevChatWithChannel() {
         final Server serverA = mock(Server.class);
+        when(serverA.getGroupChatManager()).thenReturn(groupChatManager);
         when(serverA.isNetwork("Quakenet")).thenReturn(true);
-        when(serverA.getChannel("#DMDirc")).thenReturn(Optional.of(channel));
+        when(groupChatManager.getChannel("#DMDirc")).thenReturn(Optional.of(channel));
         when(serverA.getState()).thenReturn(ServerState.CONNECTED);
 
         serverManager.registerServer(serverA);
         serverManager.joinDevChat();
 
-        verify(serverA).join(new ChannelJoinRequest("#DMDirc"));
+        verify(groupChatManager).join(new ChannelJoinRequest("#DMDirc"));
     }
 
     @Test
     public void testDevChatWithoutChannel() {
         final Server serverA = mock(Server.class);
         when(serverA.isNetwork("Quakenet")).thenReturn(true);
-        when(serverA.getChannel("#DMDirc")).thenReturn(Optional.empty());
+        when(serverA.getGroupChatManager()).thenReturn(groupChatManager);
+        when(groupChatManager.getChannel("#DMDirc")).thenReturn(Optional.empty());
         when(serverA.getState()).thenReturn(ServerState.CONNECTED);
 
         serverManager.registerServer(serverA);
         serverManager.joinDevChat();
 
-        verify(serverA).join(new ChannelJoinRequest("#DMDirc"));
+        verify(groupChatManager).join(new ChannelJoinRequest("#DMDirc"));
     }
 
     @Test

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

@@ -30,6 +30,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.harness.TestCommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.util.Optional;
@@ -59,6 +60,7 @@ public class CommandParserTest {
     @Mock private FrameContainer container;
     @Mock private Channel channel;
     @Mock private Connection connection;
+    @Mock private GroupChatManager groupChatManager;
     @Mock private DMDircMBassador eventBus;
     private TestCommandParser commandParser;
     private TestCommandParser channelCommandParser;
@@ -75,9 +77,10 @@ public class CommandParserTest {
         when(configProvider.getOptionInt("general", "commandhistory")).thenReturn(10);
 
         when(container.getConnection()).thenReturn(Optional.of(connection));
-        when(connection.isValidChannelName("#channel1")).thenReturn(true);
-        when(connection.isValidChannelName("#channel2")).thenReturn(true);
-        when(connection.getChannel("#channel1")).thenReturn(Optional.of(channel));
+        when(connection.getGroupChatManager()).thenReturn(groupChatManager);
+        when(groupChatManager.isValidChannelName("#channel1")).thenReturn(true);
+        when(groupChatManager.isValidChannelName("#channel2")).thenReturn(true);
+        when(groupChatManager.getChannel("#channel1")).thenReturn(Optional.of(channel));
 
         commandParser = new TestCommandParser(configProvider, commandController, eventBus);
         commandParser.registerCommand(command, commandInfo);

test/com/dmdirc/ui/messages/IntelligentLinkingTest.java

@@ -23,6 +23,7 @@ package com.dmdirc.ui.messages;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.util.Arrays;
@@ -50,7 +51,9 @@ public class IntelligentLinkingTest {
 
         final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
         final Connection connection = mock(Connection.class);
-        when(connection.getChannelPrefixes()).thenReturn("#&+");
+        final GroupChatManager groupChatManager = mock(GroupChatManager.class);
+        when(connection.getGroupChatManager()).thenReturn(groupChatManager);
+        when(groupChatManager.getChannelPrefixes()).thenReturn("#&+");
 
         styliser = new Styliser(connection, manager, new ColourManager(manager,
                 mock(DMDircMBassador.class)));