Replace loads of servers with connections.

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

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

@@ -23,39 +23,39 @@
 package com.dmdirc.commandparser.commands.context;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.interfaces.Connection;
 
 /**
- * A command context for server commands.
+ * A command context for connection commands.
  *
  * @since 0.6.4
  */
 public class ServerCommandContext extends CommandContext {
 
-    /** The server the command was executed for. */
-    private final Server server;
+    /** The connection the command was executed for. */
+    private final Connection connection;
 
     /**
-     * Creates a new server command context.
+     * Creates a new connection command context.
      *
      * @param source      The source of the command
      * @param commandInfo The command info object which associated the command with the input
-     * @param server      The server associated with the command
+     * @param connection      The connection associated with the command
      */
     public ServerCommandContext(final FrameContainer source, final CommandInfo commandInfo,
-            final Server server) {
+            final Connection connection) {
         super(source, commandInfo);
-        this.server = server;
+        this.connection = connection;
     }
 
     /**
-     * Retrieves the server associated with this context.
+     * Retrieves the connection associated with this context.
      *
-     * @return This context's server
+     * @return This context's connection
      */
-    public Server getServer() {
-        return server;
+    public Connection getConnection() {
+        return connection;
     }
 
 }

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -33,6 +32,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 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.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
 
@@ -62,7 +62,7 @@ public class AllChannels extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
+        final Connection server = ((ServerCommandContext) context).getConnection();
         final String command = args.getArgumentsAsString();
 
         for (String channel : server.getChannels()) {

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -33,6 +32,7 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 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 javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -60,13 +60,13 @@ public class Away extends Command {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
+        final Connection connection = ((ServerCommandContext) context).getConnection();
         final String line = args.getArgumentsAsString();
 
         if (line.isEmpty()) {
-            server.getParser().getLocalClient().setBack();
+            connection.getParser().getLocalClient().setBack();
         } else {
-            server.getParser().getLocalClient().setAway(line);
+            connection.getParser().getLocalClient().setAway(line);
         }
     }
 

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -34,6 +33,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 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.ui.input.AdditionalTabTargets;
 
 import javax.annotation.Nonnull;
@@ -62,8 +62,8 @@ public class Back extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
-        server.getParser().getLocalClient().setBack();
+        final Connection connection = ((ServerCommandContext) context).getConnection();
+        connection.getParser().getLocalClient().setBack();
     }
 
     @Override

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -32,6 +31,7 @@ import com.dmdirc.commandparser.commands.Command;
 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.util.InvalidURIException;
 import com.dmdirc.util.URIParser;
 
@@ -74,9 +74,9 @@ public class ChangeServer extends Command {
         }
 
         try {
-            final Server server = ((ServerCommandContext) context).getServer();
+            final Connection connection = ((ServerCommandContext) context).getConnection();
             final URI address = uriParser.parseFromText(args.getArgumentsAsString());
-            server.connect(address, server.getProfile());
+            connection.connect(address, connection.getProfile());
         } catch (InvalidURIException ex) {
             origin.addLine(FORMAT_ERROR, "Invalid URI: " + ex.getMessage()
                     + (ex.getCause() == null ? "" : ": " + ex.getCause().getMessage()));

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -34,6 +33,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 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.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -64,11 +64,11 @@ public class Ctcp extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
+        final Connection connection = ((ServerCommandContext) context).getConnection();
         if (args.getArguments().length < 2) {
             showUsage(origin, args.isSilent(), "ctcp", "<target> <type> [arguments]");
         } else {
-            server.getParser().sendCTCP(args.getArguments()[0],
+            connection.getParser().sendCTCP(args.getArguments()[0],
                     args.getArguments()[1], args.getArgumentsAsString(2));
             sendLine(origin, args.isSilent(), "selfCTCP", args.getArguments()[0],
                     args.getArgumentsAsString(1));

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -32,6 +31,7 @@ import com.dmdirc.commandparser.commands.Command;
 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 javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -59,7 +59,7 @@ public class Disconnect extends Command {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
+        final Connection connection = ((ServerCommandContext) context).getConnection();
         final String line;
 
         if (args.getArguments().length == 0) {
@@ -68,7 +68,7 @@ public class Disconnect extends Command {
             line = args.getArgumentsAsString();
         }
 
-        server.disconnect(line);
+        connection.disconnect(line);
     }
 
 }

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -33,6 +32,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 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.parser.common.IgnoreList;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -67,22 +67,22 @@ public class Ignore extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
+        final Connection connection = ((ServerCommandContext) context).getConnection();
 
         if (args.getArguments().length == 0) {
-            executeView(origin, server, args.isSilent(), args, false);
+            executeView(origin, connection, args.isSilent(), args, false);
         } else if ("--remove".equalsIgnoreCase(args.getArguments()[0])) {
-            executeRemove(origin, server, args.isSilent(), args);
+            executeRemove(origin, connection, args.isSilent(), args);
         } else if ("--regex".equalsIgnoreCase(args.getArguments()[0])) {
-            executeRegex(origin, server, args.isSilent(), args);
+            executeRegex(origin, connection, args.isSilent(), args);
         } else {
-            executeAdd(origin, server, args.isSilent(), args);
+            executeAdd(origin, connection, args.isSilent(), args);
         }
     }
 
-    protected void executeView(final FrameContainer origin, final Server server,
+    protected void executeView(final FrameContainer origin, final Connection connection,
             final boolean isSilent, final CommandArguments args, final boolean forceRegex) {
-        final IgnoreList ignoreList = server.getIgnoreList();
+        final IgnoreList ignoreList = connection.getIgnoreList();
 
         if (ignoreList.count() == 0) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,
@@ -108,24 +108,24 @@ public class Ignore extends Command implements IntelligentCommand {
         }
     }
 
-    protected void executeAdd(final FrameContainer origin, final Server server,
+    protected void executeAdd(final FrameContainer origin, final Connection connection,
             final boolean isSilent, final CommandArguments args) {
-        final IgnoreList ignoreList = server.getIgnoreList();
+        final IgnoreList ignoreList = connection.getIgnoreList();
         final String target = args.getArgumentsAsString();
 
         ignoreList.addSimple(target);
-        server.saveIgnoreList();
+        connection.saveIgnoreList();
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Added " + target + " to the ignore list.");
     }
 
-    protected void executeRegex(final FrameContainer origin, final Server server,
+    protected void executeRegex(final FrameContainer origin, final Connection connection,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 1) {
-            executeView(origin, server, args.isSilent(), args, true);
+            executeView(origin, connection, args.isSilent(), args, true);
             return;
         }
 
-        final IgnoreList ignoreList = server.getIgnoreList();
+        final IgnoreList ignoreList = connection.getIgnoreList();
         final String target = args.getArgumentsAsString(1);
 
         try {
@@ -138,23 +138,23 @@ public class Ignore extends Command implements IntelligentCommand {
         }
 
         ignoreList.add(target);
-        server.saveIgnoreList();
+        connection.saveIgnoreList();
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Added " + target + " to the ignore list.");
     }
 
-    protected void executeRemove(final FrameContainer origin, final Server server,
+    protected void executeRemove(final FrameContainer origin, final Connection connection,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 1) {
             showUsage(origin, args.isSilent(), "ignore", "--remove <host>");
             return;
         }
 
-        final IgnoreList ignoreList = server.getIgnoreList();
+        final IgnoreList ignoreList = connection.getIgnoreList();
         final String host = args.getArgumentsAsString(1);
 
         if (ignoreList.canConvert() && ignoreList.getSimpleList().contains(host)) {
             ignoreList.remove(ignoreList.getSimpleList().indexOf(host));
-            server.saveIgnoreList();
+            connection.saveIgnoreList();
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Removed " + host
                     + " from the ignore list.");
             return;
@@ -162,7 +162,7 @@ public class Ignore extends Command implements IntelligentCommand {
 
         if (ignoreList.getRegexList().contains(host)) {
             ignoreList.remove(ignoreList.getRegexList().indexOf(host));
-            server.saveIgnoreList();
+            connection.saveIgnoreList();
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Removed " + host
                     + " from the ignore list.");
             return;
@@ -183,7 +183,7 @@ public class Ignore extends Command implements IntelligentCommand {
             targets.add("--remove");
             targets.include(TabCompletionType.CHANNEL_NICK);
             targets.include(TabCompletionType.QUERY_NICK);
-        } else if (arg == 1 && context.getPreviousArgs().get(0).equals("--remove")) {
+        } else if (arg == 1 && "--remove".equals(context.getPreviousArgs().get(0))) {
             final IgnoreList ignoreList = context.getWindow().getConnection()
                     .getIgnoreList();
             if (ignoreList.canConvert()) {
@@ -195,7 +195,7 @@ public class Ignore extends Command implements IntelligentCommand {
                 targets.add(entry);
             }
 
-        } else if (arg == 1 && context.getPreviousArgs().get(0).equals("--regex")) {
+        } else if (arg == 1 && "--regex".equals(context.getPreviousArgs().get(0))) {
             targets.include(TabCompletionType.CHANNEL_NICK);
             targets.include(TabCompletionType.QUERY_NICK);
         }

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

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -82,7 +81,7 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
+        final Connection connection = ((ServerCommandContext) context).getConnection();
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "join", "join <channel [key]>[,channel [key]...]");
             return;
@@ -101,7 +100,7 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
             }
         }
 
-        server.join(!args.isSilent(), channels.toArray(new ChannelJoinRequest[channels.size()]));
+        connection.join(!args.isSilent(), channels.toArray(new ChannelJoinRequest[channels.size()]));
     }
 
     @Handler

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -35,6 +34,7 @@ import com.dmdirc.commandparser.commands.WrappableCommand;
 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.parser.interfaces.Parser;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -67,7 +67,7 @@ public class Message extends Command implements IntelligentCommand,
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
+        final Connection connection = ((ServerCommandContext) context).getConnection();
         if (args.getArguments().length < 2) {
             showUsage(origin, args.isSilent(), "msg", "<target> <message>");
         } else {
@@ -77,12 +77,12 @@ 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.
-            if (!args.isSilent() && server.hasChannel(target)) {
-                server.getChannel(target).sendLine(message);
-            } else if (!args.isSilent() && server.hasQuery(target)) {
-                server.getQuery(target).sendLine(message, target);
+            if (!args.isSilent() && connection.hasChannel(target)) {
+                connection.getChannel(target).sendLine(message);
+            } else if (!args.isSilent() && connection.hasQuery(target)) {
+                connection.getQuery(target).sendLine(message, target);
             } else {
-                final Parser parser = server.getParser();
+                final Parser parser = connection.getParser();
 
                 if (parser == null) {
                     // This can happen if the server gets disconnected after
@@ -116,8 +116,8 @@ public class Message extends Command implements IntelligentCommand,
     public int getLineCount(final FrameContainer origin, final CommandArguments arguments) {
         if (arguments.getArguments().length >= 2) {
             final String target = arguments.getArguments()[0];
-            return ((Server) origin.getConnection()).getNumLines("PRIVMSG "
-                    + target + " :" + arguments.getArgumentsAsString(1));
+            return origin.getConnection().getWindowModel().getNumLines(
+                    "PRIVMSG " + target + " :" + arguments.getArgumentsAsString(1));
         } else {
             return 1;
         }

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -34,6 +33,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 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.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -64,13 +64,13 @@ public class Nick extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
+        final Connection connection = ((ServerCommandContext) context).getConnection();
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "nick", "<new nickname>");
             return;
         }
 
-        server.getParser().getLocalClient().setNickname(args.getArguments()[0]);
+        connection.getParser().getLocalClient().setNickname(args.getArguments()[0]);
     }
 
     @Override

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -34,6 +33,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 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.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -64,11 +64,11 @@ public class Notice extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
+        final Connection connection = ((ServerCommandContext) context).getConnection();
         if (args.getArguments().length < 2) {
             showUsage(origin, args.isSilent(), "notice", "<target> <message>");
         } else {
-            server.getParser().sendNotice(args.getArguments()[0],
+            connection.getParser().sendNotice(args.getArguments()[0],
                     args.getArgumentsAsString(1));
             sendLine(origin, args.isSilent(), "selfNotice", args.getArguments()[0],
                     args.getArgumentsAsString(1));

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

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -35,6 +34,7 @@ import com.dmdirc.commandparser.commands.WrappableCommand;
 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.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.Styliser;
@@ -71,8 +71,8 @@ public class OpenQuery extends Command implements IntelligentCommand,
             return;
         }
 
-        final Server server = ((ServerCommandContext) context).getServer();
-        if (server.getParser().isValidChannelName(args.getArguments()[0])) {
+        final Connection connection = ((ServerCommandContext) context).getConnection();
+        if (connection.getParser().isValidChannelName(args.getArguments()[0])) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "You can't open a query "
                     + "with a channel; maybe you meant " + Styliser.CODE_FIXED
                     + Styliser.CODE_BOLD
@@ -83,7 +83,7 @@ public class OpenQuery extends Command implements IntelligentCommand,
             return;
         }
 
-        final Query query = server.getQuery(args.getArguments()[0], !args.isSilent());
+        final Query query = connection.getQuery(args.getArguments()[0], !args.isSilent());
 
         if (args.getArguments().length > 1) {
             query.sendLine(args.getArgumentsAsString(1), args.getArguments()[0]);
@@ -113,7 +113,7 @@ public class OpenQuery extends Command implements IntelligentCommand,
     public int getLineCount(final FrameContainer origin, final CommandArguments arguments) {
         if (arguments.getArguments().length >= 2) {
             final String target = arguments.getArguments()[0];
-            return ((Server) origin.getConnection()).getNumLines("PRIVMSG "
+            return ((Connection) origin.getConnection()).getWindowModel().getNumLines("PRIVMSG "
                     + target + " :" + arguments.getArgumentsAsString(1));
         } else {
             return 1;

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -33,6 +32,7 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 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 javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -61,10 +61,10 @@ public class Raw extends Command {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
+        final Connection connection = ((ServerCommandContext) context).getConnection();
         final String line = args.getArgumentsAsString();
 
-        server.getParser().sendRawMessage(line);
+        connection.getParser().sendRawMessage(line);
         sendLine(origin, args.isSilent(), "rawCommand", line);
     }
 

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -32,6 +31,7 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 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 javax.annotation.Nonnull;
 
@@ -58,8 +58,9 @@ public class RawServerCommand extends Command implements CommandInfo {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
-        server.getParser().sendRawMessage(myName.toUpperCase() + " " + args.getArgumentsAsString());
+        final Connection connection = ((ServerCommandContext) context).getConnection();
+        connection.getParser().sendRawMessage(myName.toUpperCase() + ' '
+                + args.getArgumentsAsString());
     }
 
     @Override

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -32,6 +31,7 @@ import com.dmdirc.commandparser.commands.Command;
 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 javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -59,7 +59,7 @@ public class Reconnect extends Command {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
+        final Connection connection = ((ServerCommandContext) context).getConnection();
         final String line;
 
         if (args.getArguments().length == 0) {
@@ -68,7 +68,7 @@ public class Reconnect extends Command {
             line = args.getArgumentsAsString();
         }
 
-        server.reconnect(line);
+        connection.reconnect(line);
     }
 
 }

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -34,6 +33,7 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 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 javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -62,14 +62,14 @@ public class Umode extends Command {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
-        if (server.getState() != ServerState.CONNECTED) {
+        final Connection connection = ((ServerCommandContext) context).getConnection();
+        if (connection.getState() != ServerState.CONNECTED) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "Not connected");
             return;
         }
 
-        server.getParser().sendRawMessage("MODE "
-                + server.getParser().getLocalClient().getNickname()
+        connection.getParser().sendRawMessage("MODE "
+                + connection.getParser().getLocalClient().getNickname()
                 + " " + args.getArgumentsAsString());
     }
 

src/com/dmdirc/interfaces/Connection.java

@@ -33,6 +33,7 @@ import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.parser.common.IgnoreList;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.interfaces.ProtocolDescription;
 import com.dmdirc.tls.CertificateProblemListener;
 
 import java.net.URI;
@@ -409,7 +410,7 @@ public interface Connection {
      * Parses the specified hostmask in a manner prescribed by the protocol currently used by this
      * server.
      *
-     * @see com.dmdirc.parser.interfaces.ProtocolDescription#parseHostmask(java.lang.String)
+     * @see ProtocolDescription#parseHostmask(String)
      * @param hostmask The hostmask to be parsed
      *
      * @return An array containing the nickname, username and hostname

test/com/dmdirc/commandparser/commands/global/NewServerTest.java

@@ -22,10 +22,10 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionFactory;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -34,7 +34,7 @@ import com.dmdirc.util.URIParser;
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Arrays;
+import java.util.Collections;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -58,13 +58,14 @@ public class NewServerTest {
     @Mock private FrameContainer container;
     @Mock private PluginManager pluginManager;
     @Mock private ConnectionFactory factory;
-    @Mock private Server server;
+    @Mock private Connection connection;
     private NewServer command;
 
     @Before
     public void setup() {
-        when(factory.createServer(any(URI.class), any(ConfigProvider.class))).thenReturn(server);
-        when(identityController.getProvidersByType("profile")).thenReturn(Arrays.asList(new ConfigProvider[] { identity }));
+        when(factory.createServer(any(URI.class), any(ConfigProvider.class))).thenReturn(connection);
+        when(identityController.getProvidersByType("profile")).thenReturn(
+                Collections.singletonList(identity));
         command = new NewServer(controller, factory, pluginManager, identityController, new URIParser());
     }
 
@@ -74,7 +75,7 @@ public class NewServerTest {
                 new CommandContext(null, NewServer.INFO));
 
         verify(factory).createServer(eq(new URI("irc://irc.foo.com")), any(ConfigProvider.class));
-        verify(server).connect();
+        verify(connection).connect();
     }
 
     @Test
@@ -83,7 +84,7 @@ public class NewServerTest {
                 new CommandContext(null, NewServer.INFO));
 
         verify(factory).createServer(eq(new URI("irc://irc.foo.com:1234")), any(ConfigProvider.class));
-        verify(server).connect();
+        verify(connection).connect();
     }
 
     @Test
@@ -92,7 +93,7 @@ public class NewServerTest {
                 new CommandContext(null, NewServer.INFO));
 
         verify(factory).createServer(eq(new URI("otheruri://foo.com:123/blah")), any(ConfigProvider.class));
-        verify(server).connect();
+        verify(connection).connect();
     }
 
     @Test