Don't expose servers.

Change-Id: I5db4e866f20ca7e8d4c1ba596ef6248755f4d2ec
Depends-On: I58e485b06887b1215b4d4cba7f2244404a7b81aa
Reviewed-on: http://gerrit.dmdirc.com/3870
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/ServerManager.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
@@ -146,8 +147,8 @@ public class ServerManager implements ServerFactory {
      *
      * @return A list of all servers
      */
-    public List<Server> getServers() {
-        return new ArrayList<>(servers);
+    public List<Connection> getServers() {
+        return new ArrayList<Connection>(servers);
     }
 
     /**
@@ -189,8 +190,8 @@ public class ServerManager implements ServerFactory {
      *
      * @return A list of servers connected to the network
      */
-    public List<Server> getServersByNetwork(final String network) {
-        final List<Server> res = new ArrayList<>();
+    public List<Connection> getServersByNetwork(final String network) {
+        final List<Connection> res = new ArrayList<>();
 
         for (Server server : servers) {
             if (server.isNetwork(network)) {
@@ -210,7 +211,7 @@ public class ServerManager implements ServerFactory {
      *
      * @since 0.6.3
      */
-    public Server connectToAddress(final URI uri) {
+    public Connection connectToAddress(final URI uri) {
         return connectToAddress(uri,
                 identityController.getProvidersByType("profile").get(0));
     }
@@ -257,11 +258,11 @@ public class ServerManager implements ServerFactory {
      * Connects the user to Quakenet if necessary and joins #DMDirc.
      */
     public void joinDevChat() {
-        final List<Server> qnetServers = getServersByNetwork("Quakenet");
+        final List<Connection> qnetServers = getServersByNetwork("Quakenet");
 
-        Server connectedServer = null;
+        Connection connectedServer = null;
 
-        for (Server server : qnetServers) {
+        for (Connection server : qnetServers) {
             if (server.getState() == ServerState.CONNECTED) {
                 connectedServer = server;
 

src/com/dmdirc/commandparser/CommandManager.java

@@ -23,12 +23,12 @@
 package com.dmdirc.commandparser;
 
 import com.dmdirc.Query;
-import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -155,10 +155,11 @@ public class CommandManager implements CommandController {
         final String commandName = getCommandChar() + command.getName();
 
         // TODO: This logic is probably in two places. Abstract it.
-        for (Server server : serverManager.getServers()) {
+        for (Connection server : serverManager.getServers()) {
             if (command.getType() == CommandType.TYPE_SERVER
                     || command.getType() == CommandType.TYPE_GLOBAL) {
-                registerCommandName(server.getTabCompleter(), commandName, register);
+                registerCommandName(server.getWindowModel().getTabCompleter(),
+                        commandName, register);
             }
 
             if (command.getType() == CommandType.TYPE_CHANNEL

src/com/dmdirc/commandparser/commands/global/AllServers.java

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -33,6 +32,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
 
@@ -68,8 +68,9 @@ public class AllServers extends Command implements IntelligentCommand {
             final CommandArguments args, final CommandContext context) {
         final String command = args.getArgumentsAsString();
 
-        for (Server target : serverManager.getServers()) {
-            target.getCommandParser().parseCommand(target, command);
+        for (Connection target : serverManager.getServers()) {
+            target.getWindowModel().getCommandParser()
+                    .parseCommand(target.getWindowModel(), command);
         }
     }
 

test/com/dmdirc/ServerManagerTest.java

@@ -206,8 +206,8 @@ public class ServerManagerTest {
 
     @Test
     public void testAddsNewServersToWindowManager() {
-        final Server newServer = serverManager.connectToAddress(URI.create("irc://fobar"));
-        verify(windowManager).addWindow(newServer);
+        serverManager.connectToAddress(URI.create("irc://fobar"));
+        verify(windowManager).addWindow(server);
     }
 
     @Test