Use Connection iface in place of Server.

Change-Id: I871f3e5e99c1112189065f143d97d8bfbebf83ef
Reviewed-on: http://gerrit.dmdirc.com/2933
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.dcc;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.addons.dcc.io.DCC;
@@ -41,6 +40,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.messages.MessageSinkManager;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.WindowManager;
@@ -108,8 +108,8 @@ public class DCCCommand extends Command implements IntelligentCommand {
             final CommandArguments args, final CommandContext context) {
         if (args.getArguments().length > 1) {
             final String target = args.getArguments()[1];
-            final Server server = ((ServerCommandContext) context).getServer();
-            final Parser parser = server.getParser();
+            final Connection connection = ((ServerCommandContext) context).getServer();
+            final Parser parser = connection.getParser();
             final String myNickname = parser.getLocalClient().getNickname();
 
             if (parser.isValidChannelName(target)
@@ -137,9 +137,9 @@ public class DCCCommand extends Command implements IntelligentCommand {
             }
             final String type = args.getArguments()[0];
             if (type.equalsIgnoreCase("chat")) {
-                startChat(parser, server, origin, myNickname, target, true);
+                startChat(parser, connection, origin, myNickname, target, true);
             } else if (type.equalsIgnoreCase("send")) {
-                sendFile(target, origin, server, true,
+                sendFile(target, origin, connection, true,
                         args.getArgumentsAsString(2));
             } else {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,
@@ -154,13 +154,13 @@ public class DCCCommand extends Command implements IntelligentCommand {
      * Starts a DCC Chat.
      *
      * @param parser Parser from which command originated
-     * @param server Server from which command originated
+     * @param connection Server from which command originated
      * @param origin Frame container from which command originated
      * @param myNickname My current nickname
      * @param target Target of the command
      * @param isSilent Is this a silent command
      */
-    private void startChat(final Parser parser, final Server server,
+    private void startChat(final Parser parser, final Connection connection,
             final FrameContainer origin, final String myNickname,
             final String target, final boolean isSilent) {
         final DCCChat chat = new DCCChat();
@@ -172,7 +172,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
             parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(
                     myPlugin.getListenIP(parser)) + " " + chat.getPort());
             ActionManager.getActionManager().triggerEvent(
-                    DCCActions.DCC_CHAT_REQUEST_SENT, null, server, target);
+                    DCCActions.DCC_CHAT_REQUEST_SENT, null, connection, target);
             sendLine(origin, isSilent, "DCCChatStarting", target,
                     chat.getHost(), chat.getPort());
             window.addLine("DCCChatStarting", target, chat.getHost(),
@@ -189,13 +189,13 @@ public class DCCCommand extends Command implements IntelligentCommand {
      *
      * @param target Person this dcc is to.
      * @param origin The InputWindow this command was issued on
-     * @param server The server instance that this command is being executed on
+     * @param connection The server instance that this command is being executed on
      * @param isSilent Whether this command is silenced or not
      * @param filename The file to send
      * @since 0.6.3m1
      */
     public void sendFile(final String target, final FrameContainer origin,
-            final Server server, final boolean isSilent, final String filename) {
+            final Connection connection, final boolean isSilent, final String filename) {
         // New thread to ask the user what file to send
         final File givenFile = new File(filename);
         final File selectedFile = UIUtilities.invokeAndWait(new Callable<File>() {
@@ -233,7 +233,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
 
                 ActionManager.getActionManager().triggerEvent(
                         DCCActions.DCC_SEND_REQUEST_SENT,
-                        null, server, target, selectedFile);
+                        null, connection, target, selectedFile);
 
                 sendLine(origin, isSilent, FORMAT_OUTPUT,
                         "Starting DCC Send with: " + target);
@@ -243,10 +243,10 @@ public class DCCCommand extends Command implements IntelligentCommand {
 
                 if (origin.getConfigManager().getOptionBool(
                         myPlugin.getDomain(), "send.reverse")) {
-                    final Parser parser = server.getParser();
+                    final Parser parser = connection.getParser();
                     final TransferContainer container = new TransferContainer(myPlugin, send,
                             origin.getConfigManager(), "Send: " + target,
-                            target, server);
+                            target, connection);
                     windowManager.addWindow(myPlugin.getContainer(), container);
                     parser.sendCTCP(target, "DCC", "SEND \""
                             + selectedFile.getName() + "\" "
@@ -255,11 +255,11 @@ public class DCCCommand extends Command implements IntelligentCommand {
                             + send.makeToken()
                             + (send.isTurbo() ? " T" : ""));
                 } else {
-                    final Parser parser = server.getParser();
+                    final Parser parser = connection.getParser();
                     if (myPlugin.listen(send)) {
                         final TransferContainer container = new TransferContainer(myPlugin, send,
                                 origin.getConfigManager(), "*Send: "
-                                + target, target, server);
+                                + target, target, connection);
                         windowManager.addWindow(myPlugin.getContainer(), container);
                         parser.sendCTCP(target, "DCC", "SEND \""
                                 + selectedFile.getName() + "\" "

src/com/dmdirc/addons/dcc/DCCManager.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.dcc;
 
-import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.dcc.actions.DCCActions;
@@ -40,6 +39,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -412,7 +412,7 @@ public class DCCManager implements ActionListener {
             } catch (NumberFormatException nfe) {
                 return;
             }
-            final String myNickname = ((Server) arguments[0]).getParser()
+            final String myNickname = ((Connection) arguments[0]).getParser()
                     .getLocalClient().getNickname();
             final DCCFrameContainer f = new ChatContainer(chat, config, commandController,
                     "Chat: " + nickname, myNickname, nickname, tabCompleterFactory,
@@ -426,7 +426,7 @@ public class DCCManager implements ActionListener {
                     DCCActions.DCC_CHAT_REQUEST, null, arguments[0],
                     nickname);
             askQuestion("User " + nickname + " on "
-                    + ((Server) arguments[0]).getName()
+                    + ((Connection) arguments[0]).getAddress()
                     + " would like to start a DCC Chat with you.\n\n"
                     + "Do you want to continue?",
                     "DCC Chat Request", JOptionPane.YES_OPTION,
@@ -519,7 +519,7 @@ public class DCCManager implements ActionListener {
                         DCCActions.DCC_SEND_REQUEST, null,
                         arguments[0], nickname, filename);
                 askQuestion("User " + nickname + " on "
-                        + ((Server) arguments[0]).getName()
+                        + ((Connection) arguments[0]).getAddress()
                         + " would like to send you a file over DCC.\n\nFile: "
                         + filename + "\n\nDo you want to continue?",
                         "DCC Send Request", JOptionPane.YES_OPTION, type,
@@ -540,7 +540,7 @@ public class DCCManager implements ActionListener {
             if (newSend) {
                 send.setFileName(filename);
                 send.setFileSize(size);
-                saveFile(nickname, send, ((Server) arguments[0]).getParser(),
+                saveFile(nickname, send, ((Connection) arguments[0]).getParser(),
                         "0".equals(port), token);
             } else {
                 send.connect();
@@ -600,7 +600,7 @@ public class DCCManager implements ActionListener {
                         && (!token.equals(send.getToken()))) {
                     continue;
                 }
-                final Parser parser = ((Server) arguments[0]).getParser();
+                final Parser parser = ((Connection) arguments[0]).getParser();
                 final String nick = ((ClientInfo) arguments[1]).getNickname();
                 if (ctcpData[0].equalsIgnoreCase("resume")) {
                     parser.sendCTCP(nick, "DCC", "ACCEPT "+ ((quoted) ? "\""

src/com/dmdirc/addons/dcc/TransferContainer.java

@@ -29,6 +29,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
@@ -73,8 +74,8 @@ public class TransferContainer extends FrameContainer implements
     /** IRC Parser that caused this send */
     private Parser parser = null;
 
-    /** Server that caused this send */
-    private Server server = null;
+    /** Connection the send was initiated on. */
+    private Connection connection = null;
 
     /** Show open button. */
     private boolean showOpen = Desktop.isDesktopSupported() &&
@@ -89,20 +90,20 @@ public class TransferContainer extends FrameContainer implements
      * @param config Config manager
      * @param title The title of this window
      * @param targetNick Nickname of target
-     * @param server The server that initiated this send
+     * @param connection The connection that the send was that initiated on
      */
     public TransferContainer(final DCCManager plugin, final DCCTransfer dcc,
             final AggregateConfigProvider config, final String title,
-            final String targetNick, final Server server) {
+            final String targetNick, final Connection connection) {
         super(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
                 title, title, config,
                 Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel"));
         this.plugin = plugin;
         this.dcc = dcc;
-        this.server = server;
+        this.connection = connection;
         this.config = config;
-        parser = server == null ? null : server.getParser();
+        parser = connection == null ? null : connection.getParser();
         myPlugin = plugin;
 
         if (parser != null) {
@@ -308,12 +309,12 @@ public class TransferContainer extends FrameContainer implements
         }
         dcc.reset();
 
-        if (server != null && server.getState() == ServerState.CONNECTED) {
-            final String myNickname = server.getParser().getLocalClient()
+        if (connection != null && connection.getState() == ServerState.CONNECTED) {
+            final String myNickname = connection.getParser().getLocalClient()
                     .getNickname();
             // Check again incase we have changed nickname to the same nickname
             //that this send is for.
-            if (server.getParser().getStringConverter().equalsIgnoreCase(
+            if (connection.getParser().getStringConverter().equalsIgnoreCase(
                     otherNickname, myNickname)) {
                 final Thread errorThread = new Thread(new Runnable() {
 
@@ -371,8 +372,8 @@ public class TransferContainer extends FrameContainer implements
     }
 
     public void addSocketCloseCallback(final SocketCloseListener listener) {
-        if (server != null && server.getParser() != null) {
-            server.getParser().getCallbackManager()
+        if (connection != null && connection.getParser() != null) {
+            connection.getParser().getCallbackManager()
                     .addNonCriticalCallback(SocketCloseListener.class,
                     listener);
         }

src/com/dmdirc/addons/dcc/actions/DCCEvents.java

@@ -22,25 +22,22 @@
 
 package com.dmdirc.addons.dcc.actions;
 
-import com.dmdirc.Server;
-import com.dmdirc.interfaces.actions.ActionMetaType;
-
 import com.dmdirc.addons.dcc.ChatContainer;
 import com.dmdirc.addons.dcc.TransferContainer;
+import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.actions.ActionMetaType;
 
 import java.io.File;
 
 /**
  * Defines DCC-related events.
- *
- * @author Chris
  */
 public enum DCCEvents implements ActionMetaType {
 
     /** DCC Chat Request. */
-    DCC_CHAT_REQUEST(new String[]{"server", "client"}, Server.class, String.class),
+    DCC_CHAT_REQUEST(new String[]{"connection", "client"}, Connection.class, String.class),
     /** DCC Chat Request Sent. */
-    DCC_CHAT_REQUEST_SENT(new String[]{"server", "client"}, Server.class, String.class),
+    DCC_CHAT_REQUEST_SENT(new String[]{"connection", "client"}, Connection.class, String.class),
     /** DCC Message from another person. */
     DCC_CHAT_MESSAGE(new String[]{"DCCChatWindow", "Nickname", "Message"}, ChatContainer.class, String.class, String.class),
     /** DCC Message to another person. */
@@ -56,9 +53,9 @@ public enum DCCEvents implements ActionMetaType {
     /** DCC Send Data Transfered */
     DCC_SEND_DATATRANSFERED(new String[]{"DCCSendWindow", "Bytes Transfered"}, TransferContainer.class, int.class),
     /** DCC Send Request. */
-    DCC_SEND_REQUEST(new String[]{"server", "client", "file"}, Server.class, String.class, String.class),
+    DCC_SEND_REQUEST(new String[]{"connection", "client", "file"}, Connection.class, String.class, String.class),
     /** DCC Send Request Sent. */
-    DCC_SEND_REQUEST_SENT(new String[]{"server", "client", "file"}, Server.class, String.class, File.class);
+    DCC_SEND_REQUEST_SENT(new String[]{"connection", "client", "file"}, Connection.class, String.class, File.class);
 
     /** The names of the arguments for this meta type. */
     private String[] argNames;

src/com/dmdirc/addons/debug/commands/ServerInfo.java

@@ -23,11 +23,11 @@
 package com.dmdirc.addons.debug.commands;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.Connection;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -67,9 +67,9 @@ public class ServerInfo extends DebugCommand {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,
                     "This window isn't connected to a server");
         } else {
-            final Server server = origin.getServer();
+            final Connection server = origin.getServer();
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Server name: "
-                    + server.getName());
+                    + server.getAddress());
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Actual name: "
                     + server.getParser().getServerName());
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Network: "

src/com/dmdirc/addons/debug/commands/ServerState.java

@@ -23,11 +23,11 @@
 package com.dmdirc.addons.debug.commands;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.Connection;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -67,7 +67,7 @@ public class ServerState extends DebugCommand {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,
                     "This window isn't connected to a server");
         } else {
-            final Server server = origin.getServer();
+            final Connection server = origin.getServer();
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
                     server.getStatus().getTransitionHistory());
         }

src/com/dmdirc/addons/identd/IdentClient.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.identd;
 
-import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -133,8 +133,8 @@ public class IdentClient implements Runnable {
             return String.format("%d , %d : ERROR : INVALID-PORT", myPort, theirPort);
         }
 
-        final Server server = getServerByPort(myPort);
-        if (!config.getOptionBool(myPlugin.getDomain(), "advanced.alwaysOn") && (server == null || config.getOptionBool(myPlugin.getDomain(), "advanced.isNoUser"))) {
+        final Connection connection = getConnectionByPort(myPort);
+        if (!config.getOptionBool(myPlugin.getDomain(), "advanced.alwaysOn") && (connection == null || config.getOptionBool(myPlugin.getDomain(), "advanced.isNoUser"))) {
             return String.format("%d , %d : ERROR : NO-USER", myPort, theirPort);
         }
 
@@ -175,10 +175,10 @@ public class IdentClient implements Runnable {
         final String customName = config.getOption(myPlugin.getDomain(), "general.customName");
         if (config.getOptionBool(myPlugin.getDomain(), "general.useCustomName") && customName != null && customName.length() > 0 && customName.length() < 513) {
             username = customName;
-        } else if (server != null && config.getOptionBool(myPlugin.getDomain(), "general.useNickname")) {
-            username = server.getParser().getLocalClient().getNickname();
-        } else if (server != null && config.getOptionBool(myPlugin.getDomain(), "general.useUsername")) {
-            username = server.getParser().getLocalClient().getUsername();
+        } else if (connection != null && config.getOptionBool(myPlugin.getDomain(), "general.useNickname")) {
+            username = connection.getParser().getLocalClient().getNickname();
+        } else if (connection != null && config.getOptionBool(myPlugin.getDomain(), "general.useUsername")) {
+            username = connection.getParser().getLocalClient().getUsername();
         } else {
             username = System.getProperty("user.name");
         }
@@ -226,10 +226,10 @@ public class IdentClient implements Runnable {
      * @param port Port to check for
      * @return The server instance listening on the given port
      */
-    protected Server getServerByPort(final int port) {
-        for (Server server : serverManager.getServers()) {
-            if (server.getParser().getLocalPort() == port) {
-                return server;
+    protected Connection getConnectionByPort(final int port) {
+        for (Connection connection : serverManager.getServers()) {
+            if (connection.getParser().getLocalPort() == port) {
+                return connection;
             }
         }
         return null;

src/com/dmdirc/addons/identd/IdentdPlugin.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.identd;
 
-import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -32,6 +31,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -49,8 +49,8 @@ import lombok.Getter;
  */
 public class IdentdPlugin extends BasePlugin implements ActionListener {
 
-    /** Array list to store all the servers in that need ident replies. */
-    private final List<Server> servers = new ArrayList<>();
+    /** List of all the connections that need ident replies. */
+    private final List<Connection> connections = new ArrayList<>();
     /** The IdentdServer that we use. */
     private IdentdServer myServer;
     /** This plugin's plugin info. */
@@ -106,7 +106,7 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
     @Override
     public void onUnload() {
         myServer.stopServer();
-        servers.clear();
+        connections.clear();
         actionController.unregisterListener(this);
     }
 
@@ -121,18 +121,18 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
     public void processEvent(final ActionType type, final StringBuffer format,
             final Object... arguments) {
         if (type == CoreActionType.SERVER_CONNECTING) {
-            synchronized (servers) {
-                if (servers.isEmpty()) {
+            synchronized (connections) {
+                if (connections.isEmpty()) {
                     myServer.startServer();
                 }
-                servers.add((Server) arguments[0]);
+                connections.add((Connection) arguments[0]);
             }
         } else if (type == CoreActionType.SERVER_CONNECTED
                 || type == CoreActionType.SERVER_CONNECTERROR) {
-            synchronized (servers) {
-                servers.remove(arguments[0]);
+            synchronized (connections) {
+                connections.remove(arguments[0]);
 
-                if (servers.isEmpty() && !config.getOptionBool(getDomain(),
+                if (connections.isEmpty() && !config.getOptionBool(getDomain(),
                         "advanced.alwaysOn")) {
                     myServer.stopServer();
                 }

src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.lagdisplay;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
@@ -36,6 +35,7 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
@@ -57,9 +57,9 @@ public final class LagDisplayPlugin extends BasePlugin implements
     /** The panel we use in the status bar. */
     private final LagDisplayPanel panel;
     /** A cache of ping times. */
-    private final Map<Server, String> pings = new WeakHashMap<>();
+    private final Map<Connection, String> pings = new WeakHashMap<>();
     /** Ping history. */
-    private final Map<Server, RollingList<Long>> history = new HashMap<>();
+    private final Map<Connection, RollingList<Long>> history = new HashMap<>();
     /** Parent Swing UI. */
     private final SwingController controller;
     /** Whether or not to show a graph in the info popup. */
@@ -121,14 +121,14 @@ public final class LagDisplayPlugin extends BasePlugin implements
      * Retrieves the history of the specified server. If there is no history,
      * a new list is added to the history map and returned.
      *
-     * @param server The server whose history is being requested
+     * @param connection The connection whose history is being requested
      * @return The history for the specified server
      */
-    protected RollingList<Long> getHistory(final Server server) {
-        if (!history.containsKey(server)) {
-            history.put(server, new RollingList<Long>(historySize));
+    protected RollingList<Long> getHistory(final Connection connection) {
+        if (!history.containsKey(connection)) {
+            history.put(connection, new RollingList<Long>(historySize));
         }
-        return history.get(server);
+        return history.get(connection);
     }
 
     /**
@@ -183,14 +183,17 @@ public final class LagDisplayPlugin extends BasePlugin implements
         final TextFrame activeFrame = controller.getMainFrame().getActiveFrame();
         final FrameContainer active = activeFrame == null ? null
                 : activeFrame.getContainer();
+        final boolean isActive = active != null
+                && arguments[0] instanceof Connection
+                && ((Connection) arguments[0]).equals(active.getServer());
 
         if (!useAlternate && type.equals(CoreActionType.SERVER_GOTPING)) {
             final String value = formatTime(arguments[1]);
 
-            getHistory(((Server) arguments[0])).add((Long) arguments[1]);
-            pings.put(((Server) arguments[0]), value);
+            getHistory(((Connection) arguments[0])).add((Long) arguments[1]);
+            pings.put(((Connection) arguments[0]), value);
 
-            if (((Server) arguments[0]).isChild(active) || arguments[0] == active) {
+            if (isActive) {
                 panel.getComponent().setText(value);
             }
 
@@ -198,22 +201,22 @@ public final class LagDisplayPlugin extends BasePlugin implements
         } else if (!useAlternate && type.equals(CoreActionType.SERVER_NOPING)) {
             final String value = formatTime(arguments[1]) + "+";
 
-            pings.put(((Server) arguments[0]), value);
+            pings.put(((Connection) arguments[0]), value);
 
-            if (((Server) arguments[0]).isChild(active) || arguments[0] == active) {
+            if (isActive) {
                 panel.getComponent().setText(value);
             }
 
             panel.refreshDialog();
         } else if (type.equals(CoreActionType.SERVER_DISCONNECTED)) {
-            if (((Server) arguments[0]).isChild(active) || arguments[0] == active) {
+            if (isActive) {
                 panel.getComponent().setText("Not connected");
                 pings.remove(arguments[0]);
             }
 
             panel.refreshDialog();
         } else if (useAlternate && type.equals(CoreActionType.SERVER_PINGSENT)) {
-            ((Server) arguments[0]).getParser().sendRawMessage("LAGCHECK_" + new Date().getTime());
+            ((Connection) arguments[0]).getParser().sendRawMessage("LAGCHECK_" + new Date().getTime());
         } else if (useAlternate && type.equals(CoreActionType.SERVER_NUMERIC)
                 && ((Integer) arguments[1]).intValue() == 421
                 && ((String[]) arguments[2])[3].startsWith("LAGCHECK_")) {
@@ -222,10 +225,10 @@ public final class LagDisplayPlugin extends BasePlugin implements
                 final Long duration = Long.valueOf(new Date().getTime() - sent);
                 final String value = formatTime(duration);
 
-                pings.put((Server) arguments[0], value);
-                getHistory(((Server) arguments[0])).add(duration);
+                pings.put((Connection) arguments[0], value);
+                getHistory(((Connection) arguments[0])).add(duration);
 
-                if (((Server) arguments[0]).isChild(active) || arguments[0] == active) {
+                if (isActive) {
                     panel.getComponent().setText(value);
                 }
             } catch (NumberFormatException ex) {
@@ -241,13 +244,13 @@ public final class LagDisplayPlugin extends BasePlugin implements
     }
 
     /**
-     * Retrieves the ping time for the specified server.
+     * Retrieves the ping time for the specified connection.
      *
-     * @param server The server whose ping time is being requested
+     * @param connection The connection whose ping time is being requested
      * @return A String representation of the current lag, or "Unknown"
      */
-    public String getTime(final Server server) {
-        return pings.get(server) == null ? "Unknown" : pings.get(server);
+    public String getTime(final Connection connection) {
+        return pings.get(connection) == null ? "Unknown" : pings.get(connection);
     }
 
     /**

src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -35,6 +35,7 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
@@ -849,8 +850,8 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
         } else if (target instanceof Query) {
             final Parser parser = ((Query) target).getServer().getParser();
             component = parser.getClient(((Query) target).getHost());
-        } else if (target instanceof Server) {
-            component = ((Server) target).getParser();
+        } else if (target instanceof Connection) {
+            component = ((Connection) target).getParser();
         } else {
             // Unknown component
             return false;

src/com/dmdirc/addons/parserdebug/DebugPlugin.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.parserdebug;
 
-import com.dmdirc.Server;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
@@ -106,8 +106,8 @@ public final class DebugPlugin extends BaseCommandPlugin implements
     @Override
     public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
         if (type == CoreActionType.SERVER_DISCONNECTED) {
-            final Server thisServer = (Server) arguments[0];
-            final Parser parser = thisServer.getParser();
+            final Connection connection = (Connection) arguments[0];
+            final Parser parser = connection.getParser();
             if (registeredParsers.containsKey(parser)) {
                 try {
                     final DebugWindow window = registeredParsers.get(parser);

src/com/dmdirc/addons/relaybot/RelayBotPlugin.java

@@ -34,6 +34,7 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.actions.ActionType;
@@ -156,20 +157,20 @@ public class RelayBotPlugin extends BasePlugin implements ActionListener, Config
                 }
             }
         } else if (type == CoreActionType.SERVER_CONNECTED) {
-            final Server server = (Server) arguments[0];
+            final Connection connection = (Connection) arguments[0];
 
-            final Parser parser = server.getParser();
+            final Parser parser = connection.getParser();
             if (parser instanceof IRCParser && !(parser.getCallbackManager() instanceof RelayCallbackManager)) {
                 new RelayCallbackManager(this, (IRCParser) parser);
             }
         } else if (type == CoreActionType.SERVER_DISCONNECTED) {
-            final Server server = (Server) arguments[0];
+            final Connection connection = (Connection) arguments[0];
 
             // RelayCallbackManager will revert itself when this happens.
 
             // Unset any listeners for channels of this server
-            for (String channel : server.getChannels()) {
-                removeHandler(server.getChannel(channel));
+            for (String channel : connection.getChannels()) {
+                removeHandler(connection.getChannel(channel));
             }
         }
     }

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -121,7 +121,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     @Getter
     private final ConfigProvider globalIdentity;
     /** Addon config identity. */
-    @Getter
     private final ConfigProvider addonIdentity;
     /** Global Swing UI Icon manager. */
     @Getter
@@ -494,9 +493,9 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     /** {@inheritDoc} */
     @Override
     public void domainUpdated() {
-        getAddonIdentity().setOption("ui", "textPaneFontName",
+        addonIdentity.setOption("ui", "textPaneFontName",
                 UIManager.getFont("TextPane.font").getFamily());
-        getAddonIdentity().setOption("ui", "textPaneFontSize",
+        addonIdentity.setOption("ui", "textPaneFontSize",
                 UIManager.getFont("TextPane.font").getSize());
     }
 

src/com/dmdirc/addons/ui_swing/components/frames/ServerFrame.java

@@ -29,6 +29,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.SSLCertificateDialog;
 import com.dmdirc.commandparser.PopupType;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.tls.CertificateManager;
 import com.dmdirc.tls.CertificateProblemListener;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
@@ -167,7 +168,7 @@ public final class ServerFrame extends InputTextFrame implements
     /** {@inheritDoc} */
     @Override
     public void dispose() {
-        ((Server) frameParent).removeCertificateProblemListener(this);
+        ((Connection) frameParent).removeCertificateProblemListener(this);
         super.dispose();
     }
 }

src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java

@@ -32,6 +32,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.InviteListener;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
@@ -170,12 +171,12 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
     public void processEvent(final ActionType type, final StringBuffer format,
             final Object... arguments) {
         if (type == CoreActionType.SERVER_CONNECTED) {
-            if (arguments[0] instanceof Server) {
-                ((Server) arguments[0]).addInviteListener(this);
+            if (arguments[0] instanceof Connection) {
+                ((Connection) arguments[0]).addInviteListener(this);
             }
         } else {
-            if (arguments[0] instanceof Server) {
-                ((Server) arguments[0]).removeInviteListener(this);
+            if (arguments[0] instanceof Connection) {
+                ((Connection) arguments[0]).removeInviteListener(this);
             }
         }
     }

src/com/dmdirc/addons/ui_swing/components/statusbar/InvitePopup.java

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.Invite;
-import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.util.DateUtils;
 
 import java.awt.Window;
@@ -45,27 +45,27 @@ public class InvitePopup extends StatusbarPopupWindow {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    /** The server to show invites for. */
-    private final Server server;
+    /** The connection to show invites for. */
+    private final Connection connection;
 
     /**
-     * Creates a new InvitePopup for the specified panel and server.
+     * Creates a new InvitePopup for the specified panel and connection.
      *
      * @param controller Swing controller
      * @param parent The parent of this popup
-     * @param server The server to show invites for
+     * @param connection The connection to show invites for
      * @param parentWindow Parent window
      */
     public InvitePopup(final SwingController controller, final JPanel parent,
-            final Server server, final Window parentWindow) {
+            final Connection connection, final Window parentWindow) {
         super(controller, parent, parentWindow);
-        this.server = server;
+        this.connection = connection;
     }
 
     /** {@inheritDoc} */
     @Override
     protected void initContent(final JPanel panel) {
-        for (final Invite invite : server.getInvites()) {
+        for (final Invite invite : connection.getInvites()) {
             panel.add(new JLabel(invite.getChannel()), "growx, pushx");
             panel.add(new JLabel(invite.getSource()[0], JLabel.CENTER),
                     "growx, pushx, al center");

src/com/dmdirc/addons/ui_swing/dialogs/NewServerDialog.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs;
 
-import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -32,6 +31,7 @@ import com.dmdirc.addons.ui_swing.components.vetoable.VetoableChangeEvent;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxModel;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxSelectionListener;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderListener;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -263,7 +263,7 @@ public final class NewServerDialog extends StandardDialog implements
                     }
                 }.executeInExecutor();
             } else {
-                final Server server = getController().getMainFrame()
+                final Connection connection = getController().getMainFrame()
                         .getActiveFrame().getContainer().getServer();
 
                 new LoggingSwingWorker<Void, Void>() {
@@ -271,10 +271,10 @@ public final class NewServerDialog extends StandardDialog implements
                     /** {@inheritDoc} */
                     @Override
                     protected Void doInBackground() {
-                        if (server == null) {
+                        if (connection == null) {
                             serverManager.connectToAddress(address, profile);
                         } else {
-                            server.connect(address, profile);
+                            connection.connect(address, profile);
                         }
                         return null;
                     }

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/IgnoreListPanel.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.serversetting;
 
-import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.common.IgnoreList;
 import com.dmdirc.util.validators.NotEmptyValidator;
 import com.dmdirc.util.validators.RegexValidator;
@@ -57,8 +57,8 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
 
     /** Serial version UID. */
     private static final long serialVersionUID = 2;
-    /** Parent server. */
-    private final Server server;
+    /** Parent connection. */
+    private final Connection connection;
     /** Parent window. */
     private final Window parentWindow;
     /** Swing controller. */
@@ -82,15 +82,15 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
      * Creates a new instance of IgnoreList.
      *
      * @param controller Swing controller
-     * @param server Parent server
+     * @param connection The connection whose ignore list should be displayed.
      * @param parentWindow Parent window
      */
     public IgnoreListPanel(final SwingController controller,
-            final Server server, final Window parentWindow) {
+            final Connection connection, final Window parentWindow) {
         super();
 
         this.controller = controller;
-        this.server = server;
+        this.connection = connection;
         this.parentWindow = parentWindow;
 
         this.setOpaque(UIUtilities.getTabbedPaneOpaque());
@@ -101,7 +101,7 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
 
     /** Initialises the components. */
     private void initComponents() {
-        cachedIgnoreList = new IgnoreList(server.getIgnoreList().getRegexList());
+        cachedIgnoreList = new IgnoreList(connection.getIgnoreList().getRegexList());
 
         listModel = new IgnoreListModel(cachedIgnoreList);
         list = new JList(listModel);
@@ -164,9 +164,9 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
 
     /** Saves the ignore list. */
     public void saveList() {
-        server.getIgnoreList().clear();
-        server.getIgnoreList().addAll(cachedIgnoreList.getRegexList());
-        server.saveIgnoreList();
+        connection.getIgnoreList().clear();
+        connection.getIgnoreList().addAll(cachedIgnoreList.getRegexList());
+        connection.saveIgnoreList();
     }
 
     /**

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/PerformTab.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.serversetting;
 
-import com.dmdirc.Server;
 import com.dmdirc.actions.wrappers.PerformType;
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
@@ -30,6 +29,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.performpanel.PerformPanel;
 import com.dmdirc.addons.ui_swing.components.renderers.PerformRenderer;
+import com.dmdirc.interfaces.Connection;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -45,12 +45,12 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Perform panel.
  */
-public final class PerformTab extends JPanel implements ActionListener {
+public class PerformTab extends JPanel implements ActionListener {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
-    /** Parent server. */
-    private final Server server;
+    /** Parent connection. */
+    private final Connection connection;
     /** Swing controller. */
     private final SwingController controller;
     /** Perform wrapper to read/write performs to. */
@@ -65,17 +65,17 @@ public final class PerformTab extends JPanel implements ActionListener {
      *
      * @param controller Swing controller
      * @param wrapper Perform wrapper to read/write performs to.
-     * @param server Parent server
+     * @param connection Connection whose perform should be displayed.
      */
     public PerformTab(
             final SwingController controller,
             final PerformWrapper wrapper,
-            final Server server) {
+            final Connection connection) {
         super();
 
         this.controller = controller;
         this.wrapper = wrapper;
-        this.server = server;
+        this.connection = connection;
 
         setOpaque(UIUtilities.getTabbedPaneOpaque());
         initComponents();
@@ -94,13 +94,13 @@ public final class PerformTab extends JPanel implements ActionListener {
         final Collection<PerformDescription> performList = new ArrayList<>();
 
         final PerformDescription networkPerform = new PerformDescription(
-                PerformType.NETWORK, server.getNetwork());
+                PerformType.NETWORK, connection.getNetwork());
         final PerformDescription networkProfilePerform = new PerformDescription(
-                PerformType.NETWORK, server.getNetwork() ,server.getProfile().getName());
+                PerformType.NETWORK, connection.getNetwork() ,connection.getProfile().getName());
         final PerformDescription serverPerform = new PerformDescription(
-                PerformType.SERVER, server.getAddress());
+                PerformType.SERVER, connection.getAddress());
         final PerformDescription serverProfilePerform = new PerformDescription(
-                PerformType.SERVER, server.getAddress() ,server.getProfile().getName());
+                PerformType.SERVER, connection.getAddress() ,connection.getProfile().getName());
 
         model.addElement(networkPerform);
         model.addElement(networkProfilePerform);

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -25,7 +25,6 @@ package com.dmdirc.addons.windowstatus;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
-import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -35,13 +34,14 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.implementations.BasePlugin;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -150,8 +150,8 @@ public final class WindowStatusPlugin extends BasePlugin
         }
         final StringBuffer textString = new StringBuffer();
 
-        if (current instanceof Server) {
-            textString.append(((Server) current).getName());
+        if (current instanceof Connection) {
+            textString.append(((Connection) current).getAddress());
         } else if (current instanceof Channel) {
             final ChannelInfo chan = ((Channel) current).getChannelInfo();
             final Map<Integer, String> names = new HashMap<>();