Use ConnectionManager.

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

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

@@ -23,9 +23,9 @@
 package com.dmdirc.addons.identd;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.ServerManager;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
@@ -51,7 +51,7 @@ public class IdentClient implements Runnable {
     /** The Thread in use for this client. */
     private volatile Thread thread;
     /** Server manager. */
-    private final ServerManager serverManager;
+    private final ConnectionManager connectionManager;
     /** Global configuration to read settings from. */
     private final AggregateConfigProvider config;
     /** This plugin's settings domain. */
@@ -63,17 +63,17 @@ public class IdentClient implements Runnable {
      * @param eventBus      The event bus to post errors on
      * @param server        The server that owns this
      * @param socket        The socket we are handing
-     * @param serverManager Server manager to retrieve servers from
+     * @param connectionManager Server manager to retrieve servers from
      * @param config        Global config to read settings from
      * @param domain        This plugin's settings domain
      */
     public IdentClient(final DMDircMBassador eventBus, final IdentdServer server, final Socket socket,
-            final ServerManager serverManager, final AggregateConfigProvider config,
+            final ConnectionManager connectionManager, final AggregateConfigProvider config,
             final String domain) {
         this.eventBus = eventBus;
         this.server = server;
         this.socket = socket;
-        this.serverManager = serverManager;
+        this.connectionManager = connectionManager;
         this.config = config;
         this.domain = domain;
     }
@@ -239,7 +239,7 @@ public class IdentClient implements Runnable {
      * @return The server instance listening on the given port
      */
     protected Connection getConnectionByPort(final int port) {
-        for (Connection connection : serverManager.getServers()) {
+        for (Connection connection : connectionManager.getConnections()) {
             if (connection.getParser().getLocalPort() == port) {
                 return connection;
             }

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

@@ -24,8 +24,8 @@ package com.dmdirc.addons.identd;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.ServerManager;
 import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginDomain;
@@ -52,7 +52,7 @@ public final class IdentdServer implements Runnable {
     /** Arraylist of all the clients we have */
     private final List<IdentClient> clientList = new ArrayList<>();
     /** Server manager. */
-    private final ServerManager serverManager;
+    private final ConnectionManager connectionManager;
     /** Have we failed to start this server previously? */
     private boolean failed;
     /** Global configuration to read plugin's from. */
@@ -64,17 +64,17 @@ public final class IdentdServer implements Runnable {
      * Create the IdentdServer.
      *
      * @param eventBus      The event bus to post errors on
-     * @param serverManager Server manager to iterate over servers
+     * @param connectionManager Server manager to iterate over servers
      * @param config        Global config
      * @param domain        This plugin's setting domain
      */
     @Inject
     public IdentdServer(final DMDircMBassador eventBus,
-            final ServerManager serverManager,
+            final ConnectionManager connectionManager,
             @GlobalConfig final AggregateConfigProvider config,
             @PluginDomain(IdentdPlugin.class) final String domain) {
         this.eventBus = eventBus;
-        this.serverManager = serverManager;
+        this.connectionManager = connectionManager;
         this.config = config;
         this.domain = domain;
     }
@@ -89,7 +89,7 @@ public final class IdentdServer implements Runnable {
             try {
                 final Socket clientSocket = serverSocket.accept();
                 final IdentClient client = new IdentClient(eventBus, this, clientSocket,
-                        serverManager, config, domain);
+                        connectionManager, config, domain);
                 client.start();
                 addClient(client);
             } catch (IOException e) {

identd/test/com/dmdirc/addons/identd/IdentClientTest.java

@@ -24,8 +24,8 @@ package com.dmdirc.addons.identd;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Server;
-import com.dmdirc.ServerManager;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.when;
 public class IdentClientTest {
 
     @Mock private AggregateConfigProvider acp;
-    @Mock private ServerManager sm;
+    @Mock private ConnectionManager sm;
     @Mock private Server server;
     @Mock private IRCParser parser;
     @Mock private IRCClientInfo client;
@@ -57,7 +57,7 @@ public class IdentClientTest {
         final List<Connection> servers = new ArrayList<>();
         servers.add(server);
 
-        when(sm.getServers()).thenReturn(servers);
+        when(sm.getConnections()).thenReturn(servers);
         when(server.getParser()).thenReturn(parser);
         when(parser.getLocalPort()).thenReturn(60);
         when(parser.getLocalClient()).thenReturn(client);

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.lagdisplay;
 
-import com.dmdirc.ServerManager;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPanel;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupWindow;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.ConnectionManager;
 
 import java.util.List;
 
@@ -48,7 +48,7 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
     /** Swing main frame. */
     private final MainFrame mainFrame;
     /** Server manager to retrieve servers from. */
-    private final ServerManager serverManager;
+    private final ConnectionManager connectionManager;
 
     /**
      * Creates a new ServerInfoDialog.
@@ -56,23 +56,23 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
      * @param manager       The {@link LagDisplayManager} we're using for info
      * @param parent        The {@link JPanel} to use for positioning
      * @param mainFrame     The frame that will own this dialog.
-     * @param serverManager The manager to use to iterate servers.
+     * @param connectionManager The manager to use to iterate servers.
      */
     public ServerInfoDialog(
             final LagDisplayManager manager,
             final StatusbarPanel<JLabel> parent,
             final MainFrame mainFrame,
-            final ServerManager serverManager) {
+            final ConnectionManager connectionManager) {
         super(parent, mainFrame);
 
         this.manager = manager;
         this.mainFrame = mainFrame;
-        this.serverManager = serverManager;
+        this.connectionManager = connectionManager;
     }
 
     @Override
     protected void initContent(final JPanel panel) {
-        final List<Connection> connections = serverManager.getServers();
+        final List<Connection> connections = connectionManager.getConnections();
 
         if (connections.isEmpty()) {
             panel.add(new JLabel("No open servers."));

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.lagdisplay;
 
-import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPanel;
+import com.dmdirc.interfaces.ConnectionManager;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -38,19 +38,19 @@ public class ServerInfoDialogFactory {
 
     private final LagDisplayManager manager;
     private final MainFrame mainFrame;
-    private final ServerManager serverManager;
+    private final ConnectionManager connectionManager;
 
     @Inject
     public ServerInfoDialogFactory(final LagDisplayManager manager, final MainFrame mainFrame,
-            final ServerManager serverManager) {
+            final ConnectionManager connectionManager) {
         this.manager = manager;
         this.mainFrame = mainFrame;
-        this.serverManager = serverManager;
+        this.connectionManager = connectionManager;
     }
 
     public ServerInfoDialog getServerInfoDialog(
             final StatusbarPanel<JLabel> parent) {
-        return new ServerInfoDialog(manager, parent, mainFrame, serverManager);
+        return new ServerInfoDialog(manager, parent, mainFrame, connectionManager);
     }
 
 }

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/ServerListModel.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.serverlistdialog;
 
-import com.dmdirc.ServerManager;
 import com.dmdirc.actions.wrappers.PerformType;
 import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
 import com.dmdirc.addons.serverlists.ServerEntry;
 import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
 import com.dmdirc.addons.serverlists.ServerList;
+import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.util.collections.ListenerList;
 
@@ -51,23 +51,23 @@ public class ServerListModel {
     /** Active server item. */
     private ServerGroupItem activeItem;
     /** ServerManager that ServerEntrys use to create servers */
-    private final ServerManager serverManager;
+    private final ConnectionManager connectionManager;
     /** The controller to read/write settings with. */
     private final IdentityController identityController;
 
     /**
      * Creates a new server list model.
      *
-     * @param serverManager      ServerManager currently in use.
+     * @param connectionManager      ServerManager currently in use.
      * @param identityController The controller to read/write settings with.
      * @param serverList         The server list to use for the top-level entries.
      */
     @Inject
     public ServerListModel(
-            final ServerManager serverManager,
+            final ConnectionManager connectionManager,
             final IdentityController identityController,
             final ServerList serverList) {
-        this.serverManager = serverManager;
+        this.connectionManager = connectionManager;
         this.identityController = identityController;
         list = serverList;
         listeners = new ListenerList();
@@ -227,8 +227,8 @@ public class ServerListModel {
      */
     public void addEntry(final ServerGroup parentGroup, final String entryName,
             final URI url) {
-        final ServerGroupItem sg = new ServerEntry(identityController,
-                serverManager, parentGroup, entryName, url, null);
+        final ServerGroupItem sg = new ServerEntry(identityController, connectionManager,
+                parentGroup, entryName, url, null);
         parentGroup.addItem(sg);
         for (ServerListListener listener : listeners.get(
                 ServerListListener.class)) {

serverlists/src/com/dmdirc/addons/serverlists/ServerEntry.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.serverlists;
 
-import com.dmdirc.ServerManager;
+import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.IdentityController;
 
 import java.net.URI;
@@ -39,13 +39,13 @@ public class ServerEntry extends ServerGroupItemBase {
     /** The group that owns this entry. */
     private final ServerGroup group;
     /** The manager to use to create new servers. */
-    private final ServerManager serverManager;
+    private final ConnectionManager connectionManager;
 
     /**
      * Creates a new server entry.
      *
      * @param identityController The controller to read/write settings with.
-     * @param serverManager      The server manager to connect to servers with.
+     * @param connectionManager      The server manager to connect to servers with.
      * @param group              The group that owns this entry
      * @param name               The name of this server
      * @param address            The address of this server
@@ -53,12 +53,12 @@ public class ServerEntry extends ServerGroupItemBase {
      */
     public ServerEntry(
             final IdentityController identityController,
-            final ServerManager serverManager,
+            final ConnectionManager connectionManager,
             final ServerGroup group, final String name,
             final URI address, final String profile) {
         super(identityController);
 
-        this.serverManager = serverManager;
+        this.connectionManager = connectionManager;
         setName(name);
         setProfile(profile);
         this.address = address;
@@ -97,7 +97,7 @@ public class ServerEntry extends ServerGroupItemBase {
 
     @Override
     public void connect() {
-        serverManager.connectToAddress(address, getProfileIdentity());
+        connectionManager.connectToAddress(address, getProfileIdentity());
     }
 
     @Override

serverlists/src/com/dmdirc/addons/serverlists/ServerList.java

@@ -24,10 +24,10 @@ package com.dmdirc.addons.serverlists;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Precondition;
-import com.dmdirc.ServerManager;
 import com.dmdirc.addons.serverlists.io.ServerGroupReader;
 import com.dmdirc.addons.serverlists.io.ServerGroupWriter;
 import com.dmdirc.addons.serverlists.service.ServerListServiceProvider;
+import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderListener;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -52,7 +52,7 @@ public class ServerList implements ConfigProviderListener {
     /** A list of all known groups. */
     private final Map<ServerGroup, ServerGroupWriter> groups = new HashMap<>();
     /** ServerManager that ServerEntrys use to create servers */
-    private final ServerManager serverManager;
+    private final ConnectionManager connectionManager;
     /** The controller to read/write settings with. */
     private final IdentityController identityController;
     /** The factory to create new identities with. */
@@ -62,7 +62,7 @@ public class ServerList implements ConfigProviderListener {
      * Creates a new ServerList and loads groups and servers.
      *
      * @param pluginManager      Plugin Manager to use.
-     * @param serverManager      Server Manager to use.
+     * @param connectionManager      Server Manager to use.
      * @param identityController The controller to read/write settings with.
      * @param identityFactory    The factory to create new identities with.
      * @param eventBus           The event bus to post errors to
@@ -70,11 +70,11 @@ public class ServerList implements ConfigProviderListener {
     @Inject
     public ServerList(
             final PluginManager pluginManager,
-            final ServerManager serverManager,
+            final ConnectionManager connectionManager,
             final IdentityController identityController,
             final IdentityFactory identityFactory,
             final DMDircMBassador eventBus) {
-        this.serverManager = serverManager;
+        this.connectionManager = connectionManager;
         this.identityController = identityController;
         this.identityFactory = identityFactory;
 
@@ -162,7 +162,7 @@ public class ServerList implements ConfigProviderListener {
     public void configProviderAdded(final ConfigProvider configProvider) {
         try {
             final ServerGroupReader reader
-                    = new ServerGroupReader(serverManager, identityController, configProvider);
+                    = new ServerGroupReader(connectionManager, identityController, configProvider);
             addServerGroup(reader.read(), reader.getWriter());
         } catch (IllegalArgumentException ex) {
             // Silently ignore

serverlists/src/com/dmdirc/addons/serverlists/io/ServerEntryReader.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.serverlists.io;
 
-import com.dmdirc.ServerManager;
 import com.dmdirc.addons.serverlists.ServerEntry;
 import com.dmdirc.addons.serverlists.ServerGroup;
+import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 
@@ -40,15 +40,15 @@ import java.net.URISyntaxException;
 public class ServerEntryReader {
 
     /** ServerManager that ServerEntrys use to create servers */
-    private final ServerManager serverManager;
+    private final ConnectionManager connectionManager;
     /** The controller to read/write settings with. */
     private final IdentityController identityController;
     /** The identity to read entries from. */
     private final ConfigProvider identity;
 
-    public ServerEntryReader(final ServerManager serverManager,
+    public ServerEntryReader(final ConnectionManager connectionManager,
             final IdentityController identityController, final ConfigProvider identity) {
-        this.serverManager = serverManager;
+        this.connectionManager = connectionManager;
         this.identityController = identityController;
         this.identity = identity;
     }
@@ -75,7 +75,7 @@ public class ServerEntryReader {
         final String serverName = identity.getOption(name, "name");
         final URI serverURI = new URI(identity.getOption(name, "address"));
 
-        return new ServerEntry(identityController, serverManager, group, serverName, serverURI, null);
+        return new ServerEntry(identityController, connectionManager, group, serverName, serverURI, null);
     }
 
 }

serverlists/src/com/dmdirc/addons/serverlists/io/ServerGroupReader.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.serverlists.io;
 
-import com.dmdirc.ServerManager;
 import com.dmdirc.addons.serverlists.ServerGroup;
+import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 
@@ -48,17 +48,17 @@ public class ServerGroupReader {
     /**
      * Creates a new ServerGroupReader that will read from the specified identity.
      *
-     * @param serverManager      The server manager to use to connect to servers.
+     * @param connectionManager      The server manager to use to connect to servers.
      * @param identityController The identity controller to use.
      * @param identity           The identity describing the server group
      */
     public ServerGroupReader(
-            final ServerManager serverManager,
+            final ConnectionManager connectionManager,
             final IdentityController identityController,
             final ConfigProvider identity) {
         this.identity = identity;
         this.identityController = identityController;
-        this.entryReader = new ServerEntryReader(serverManager, identityController, identity);
+        this.entryReader = new ServerEntryReader(connectionManager, identityController, identity);
     }
 
     /**

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

@@ -24,10 +24,10 @@ package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.events.ClientOpenedEvent;
 import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.util.InvalidURIException;
@@ -73,7 +73,7 @@ public class Apple implements InvocationHandler {
     /** Whether the CLIENT_OPENED action has been called or not. */
     private boolean clientOpened = false;
     /** The server manager to use to connect to URLs. */
-    private final ServerManager serverManager;
+    private final ConnectionManager connectionManager;
     /** Event bus. */
     private final DMDircMBassador eventBus;
 
@@ -84,16 +84,16 @@ public class Apple implements InvocationHandler {
      * This will attempt to load the native library and register the URL open callback.
      *
      * @param configManager Config manager
-     * @param serverManager The server manager to use to connect to URLs.
+     * @param connectionManager The server manager to use to connect to URLs.
      * @param eventBus      The bus to listen for events on.
      */
     @Inject
     public Apple(
             @GlobalConfig final AggregateConfigProvider configManager,
-            final ServerManager serverManager,
+            final ConnectionManager connectionManager,
             final DMDircMBassador eventBus) {
         this.configManager = configManager;
-        this.serverManager = serverManager;
+        this.connectionManager = connectionManager;
         this.eventBus = eventBus;
     }
 
@@ -444,7 +444,7 @@ public class Apple implements InvocationHandler {
         synchronized (addresses) {
             clientOpened = true;
             for (final URI addr : addresses) {
-                serverManager.connectToAddress(addr);
+                connectionManager.connectToAddress(addr);
             }
             addresses.clear();
         }
@@ -515,7 +515,7 @@ public class Apple implements InvocationHandler {
                     Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader());
                 }
 
-                serverManager.connectToAddress(uri);
+                connectionManager.connectToAddress(uri);
             } else {
                 addresses.add(uri);
             }

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

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.ServerManager;
 import com.dmdirc.events.ClientClosingEvent;
+import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -42,7 +42,7 @@ public class QuitWorker extends SwingWorker<Void, Void> {
     /** The config to read settings from. */
     private final AggregateConfigProvider globalConfig;
     /** The server manager to use to disconnect all servers. */
-    private final ServerManager serverManager;
+    private final ConnectionManager connectionManager;
     /** The main frame to interact with. */
     private final MainFrame mainFrame;
     /** Bus to dispatch events on. */
@@ -52,19 +52,19 @@ public class QuitWorker extends SwingWorker<Void, Void> {
      * Creates a new {@link QuitWorker}.
      *
      * @param identityController The identity controller to use to read/write settings.
-     * @param serverManager      The server manager to use to disconnect all servers.
+     * @param connectionManager      The server manager to use to disconnect all servers.
      * @param mainFrame          The main frame to interact with.
      * @param eventBus           Bus to dispatch events on.
      */
     @Inject
     public QuitWorker(
             final IdentityController identityController,
-            final ServerManager serverManager,
+            final ConnectionManager connectionManager,
             final MainFrame mainFrame,
             final DMDircMBassador eventBus) {
         this.globalIdentity = identityController.getUserSettings();
         this.globalConfig = identityController.getGlobalConfiguration();
-        this.serverManager = serverManager;
+        this.connectionManager = connectionManager;
         this.mainFrame = mainFrame;
         this.eventBus = eventBus;
     }
@@ -72,7 +72,7 @@ public class QuitWorker extends SwingWorker<Void, Void> {
     @Override
     protected Void doInBackground() {
         eventBus.publishAsync(new ClientClosingEvent());
-        serverManager.closeAll(globalConfig.getOption("general", "closemessage"));
+        connectionManager.closeAll(globalConfig.getOption("general", "closemessage"));
         globalIdentity.setOption("ui", "frameManagerSize",
                 String.valueOf(mainFrame.getFrameManagerSize()));
         return null;

ui_swing/src/com/dmdirc/addons/ui_swing/components/menubar/HelpMenu.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.components.menubar;
 
-import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.dialogs.about.AboutDialog;
 import com.dmdirc.addons.ui_swing.dialogs.feedback.FeedbackDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
+import com.dmdirc.interfaces.ConnectionManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -45,7 +45,7 @@ public class HelpMenu extends JMenu implements ActionListener {
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Server manager to use to join dev chat. */
-    private final ServerManager serverManager;
+    private final ConnectionManager connectionManager;
     /** Provider of feedback dialogs. */
     private final DialogProvider<FeedbackDialog> feedbackDialogProvider;
     /** Provider of about dialogs. */
@@ -54,17 +54,17 @@ public class HelpMenu extends JMenu implements ActionListener {
     /**
      * Instantiates a new help menu.
      *
-     * @param serverManager          The manager to use to join dev chat.
+     * @param connectionManager          The manager to use to join dev chat.
      * @param feedbackDialogProvider Provider of feedback dialogs.
      * @param aboutDialogProvider    Provider of about dialogs.
      */
     @Inject
     public HelpMenu(
-            final ServerManager serverManager,
+            final ConnectionManager connectionManager,
             final DialogProvider<FeedbackDialog> feedbackDialogProvider,
             final DialogProvider<AboutDialog> aboutDialogProvider) {
         super("Help");
-        this.serverManager = serverManager;
+        this.connectionManager = connectionManager;
         this.feedbackDialogProvider = feedbackDialogProvider;
         this.aboutDialogProvider = aboutDialogProvider;
         setMnemonic('h');
@@ -108,7 +108,7 @@ public class HelpMenu extends JMenu implements ActionListener {
                 aboutDialogProvider.displayOrRequestFocus();
                 break;
             case "JoinDevChat":
-                serverManager.joinDevChat();
+                connectionManager.joinDevChat();
                 break;
             case "feedback":
                 feedbackDialogProvider.displayOrRequestFocus();

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Invite;
-import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -34,6 +33,7 @@ import com.dmdirc.events.ServerConnectErrorEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.InviteListener;
 import com.dmdirc.ui.IconManager;
 
@@ -75,14 +75,14 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements InviteLi
      *
      * @param eventBus      The event bus to subscribe to events on
      * @param iconManager   The manager to retrieve the invite icon from.
-     * @param serverManager The manager to use to iterate servers.
+     * @param connectionManager The manager to use to iterate servers.
      * @param mainFrame     Main frame
      */
     @Inject
     public InviteLabel(
             final DMDircMBassador eventBus,
             @GlobalConfig final IconManager iconManager,
-            final ServerManager serverManager,
+            final ConnectionManager connectionManager,
             final MainFrame mainFrame) {
         super(new JLabel());
 
@@ -99,7 +99,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements InviteLi
         accept.setActionCommand("acceptAll");
         accept.addActionListener(this);
 
-        for (final Connection connection : serverManager.getServers()) {
+        for (final Connection connection : connectionManager.getConnections()) {
             connection.addInviteListener(this);
         }
 

ui_swing/src/com/dmdirc/addons/ui_swing/injection/SwingModule.java

@@ -26,7 +26,6 @@ import com.dmdirc.ClientModule;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.MainFrame;
@@ -54,6 +53,7 @@ import com.dmdirc.addons.ui_swing.framemanager.FrameManagerProvider;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManagerProvider;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
+import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -200,9 +200,9 @@ public class SwingModule {
     public URLHandler getURLHandler(
             final DMDircMBassador eventBus,
             @GlobalConfig final AggregateConfigProvider globalConfig,
-            final ServerManager serverManager,
+            final ConnectionManager connectionManager,
             final StatusBarManager statusBarManager) {
-        return new URLHandler(eventBus, globalConfig, serverManager, statusBarManager);
+        return new URLHandler(eventBus, globalConfig, connectionManager, statusBarManager);
     }
 
     @Provides