FrameContainers now expose Connections.

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

src/com/dmdirc/addons/contactlist/ContactListListener.java

@@ -27,10 +27,10 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.FrameCloseListener;
 import com.dmdirc.interfaces.NicklistListener;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
 import java.util.Collection;
@@ -88,7 +88,7 @@ public class ContactListListener implements NicklistListener,
     /** {@inheritDoc} */
     @Override
     public void clientAdded(final ChannelClientInfo client) {
-        final Query query = channel.getServer().getQuery(client.getClient().getNickname(), false);
+        final Query query = channel.getConnection().getQuery(client.getClient().getNickname(), false);
 
         query.setIcon("query-" + client.getClient().getAwayState().name().toLowerCase());
     }

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.dcc;
 
-import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleter;
@@ -72,7 +72,7 @@ public abstract class DCCFrameContainer extends WritableFrameContainer {
 
     /** {@inheritDoc} */
     @Override
-    public Server getServer() { //NOPMD - server will always be null
+    public Connection getConnection() { //NOPMD - server will always be null
         return null;
     }
 

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

@@ -23,9 +23,9 @@
 package com.dmdirc.addons.dcc;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.awt.Dialog.ModalityType;
@@ -102,7 +102,7 @@ public class PlaceholderContainer extends FrameContainer {
 
     /** {@inheritDoc} */
     @Override
-    public Server getServer() {
+    public Connection getConnection() {
         return null;
     }
 

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.dcc;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.dcc.actions.DCCActions;
@@ -381,7 +380,7 @@ public class TransferContainer extends FrameContainer implements
 
     /** {@inheritDoc} */
     @Override
-    public Server getServer() {
+    public Connection getConnection() {
         return null;
     }
 

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

@@ -63,25 +63,25 @@ public class ServerInfo extends DebugCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        if (origin.getServer() == null) {
+        if (origin.getConnection() == null) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,
                     "This window isn't connected to a server");
         } else {
-            final Connection server = origin.getServer();
+            final Connection connection = origin.getConnection();
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Server name: "
-                    + server.getAddress());
+                    + connection.getAddress());
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Actual name: "
-                    + server.getParser().getServerName());
+                    + connection.getParser().getServerName());
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Network: "
-                    + server.getNetwork());
+                    + connection.getNetwork());
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "IRCd: "
-                    + server.getParser().getServerSoftware() + " - "
-                    + server.getParser().getServerSoftwareType());
+                    + connection.getParser().getServerSoftware() + " - "
+                    + connection.getParser().getServerSoftwareType());
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Modes: "
-                    + server.getParser().getBooleanChannelModes() + " "
-                    + server.getParser().getListChannelModes() + " "
-                    + server.getParser().getParameterChannelModes() + " "
-                    + server.getParser().getDoubleParameterChannelModes());
+                    + connection.getParser().getBooleanChannelModes() + " "
+                    + connection.getParser().getListChannelModes() + " "
+                    + connection.getParser().getParameterChannelModes() + " "
+                    + connection.getParser().getDoubleParameterChannelModes());
         }
     }
 

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

@@ -63,13 +63,13 @@ public class ServerState extends DebugCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        if (origin.getServer() == null) {
+        if (origin.getConnection() == null) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,
                     "This window isn't connected to a server");
         } else {
-            final Connection server = origin.getServer();
+            final Connection connection = origin.getConnection();
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
-                    server.getStatus().getTransitionHistory());
+                    connection.getStatus().getTransitionHistory());
         }
     }
 

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

@@ -61,11 +61,11 @@ public class ShowRaw extends DebugCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        if (origin == null || origin.getServer() == null) {
+        if (origin == null || origin.getConnection() == null) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,
                     "Cannot show raw window here.");
         } else {
-            origin.getServer().addRaw();
+            origin.getConnection().addRaw();
         }
     }
 

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

@@ -155,12 +155,12 @@ public final class LagDisplayPlugin extends BasePlugin implements
     @Override
     public void selectionChanged(final TextFrame window) {
         final FrameContainer source = window.getContainer();
-        if (source == null || source.getServer() == null) {
+        if (source == null || source.getConnection() == null) {
             panel.getComponent().setText("Unknown");
-        } else if (source.getServer().getState() != ServerState.CONNECTED) {
+        } else if (source.getConnection().getState() != ServerState.CONNECTED) {
             panel.getComponent().setText("Not connected");
         } else {
-            panel.getComponent().setText(getTime(source.getServer()));
+            panel.getComponent().setText(getTime(source.getConnection()));
         }
         panel.refreshDialog();
     }
@@ -185,7 +185,7 @@ public final class LagDisplayPlugin extends BasePlugin implements
                 : activeFrame.getContainer();
         final boolean isActive = active != null
                 && arguments[0] instanceof Connection
-                && ((Connection) arguments[0]).equals(active.getServer());
+                && ((Connection) arguments[0]).equals(active.getConnection());
 
         if (!useAlternate && type.equals(CoreActionType.SERVER_GOTPING)) {
             final String value = formatTime(arguments[1]);

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

@@ -73,7 +73,7 @@ public class PingHistoryPanel extends JPanel {
 
         this.plugin = plugin;
         history = plugin.getHistory(mainFrame.getActiveFrame().getContainer()
-                .getServer());
+                .getConnection());
 
         for (Long value : history.getList()) {
             maximum = Math.max(value, maximum);

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.logging;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.util.io.ReverseFileReader;
 
@@ -69,8 +69,8 @@ public class HistoryWindow extends FrameContainer {
 
     /** {@inheritDoc} */
     @Override
-    public Server getServer() {
-        return getParent() == null ? null : getParent().getServer();
+    public Connection getConnection() {
+        return getParent() == null ? null : getParent().getConnection();
     }
 
 }

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.logging;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
-import com.dmdirc.Server;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
@@ -326,12 +325,12 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
      */
     protected void handleQueryEvent(final CoreActionType type, final StringBuffer format, final Object... arguments) {
         final Query query = (Query) arguments[0];
-        if (query.getServer() == null) {
+        if (query.getConnection() == null) {
             Logger.appError(ErrorLevel.MEDIUM, "Query object has no server (" + type.toString() + ")", new Exception("Query object has no server (" + type.toString() + ")"));
             return;
         }
 
-        final Parser parser = query.getServer().getParser();
+        final Parser parser = query.getConnection().getParser();
         ClientInfo client;
 
         if (parser == null) {
@@ -848,7 +847,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
         if (target instanceof Channel) {
             component = ((Channel) target).getChannelInfo();
         } else if (target instanceof Query) {
-            final Parser parser = ((Query) target).getServer().getParser();
+            final Parser parser = ((Query) target).getConnection().getParser();
             component = parser.getClient(((Query) target).getHost());
         } else if (target instanceof Connection) {
             component = ((Connection) target).getParser();

src/com/dmdirc/addons/nickcolours/NickColourPlugin.java

@@ -86,14 +86,14 @@ public class NickColourPlugin extends BasePlugin implements ActionListener, Conf
         if (type.equals(CoreActionType.CHANNEL_GOTNAMES)) {
             final ChannelInfo chanInfo =
                     ((Channel) arguments[0]).getChannelInfo();
-            final String network = ((Channel) arguments[0]).getServer().
+            final String network = ((Channel) arguments[0]).getConnection().
                     getNetwork();
 
             for (ChannelClientInfo client : chanInfo.getChannelClients()) {
                 colourClient(network, client);
             }
         } else if (type.equals(CoreActionType.CHANNEL_JOIN)) {
-            final String network = ((Channel) arguments[0]).getServer().
+            final String network = ((Channel) arguments[0]).getConnection().
                     getNetwork();
 
             colourClient(network, (ChannelClientInfo) arguments[1]);

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.parserdebug;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.ui.core.components.WindowComponent;
@@ -39,8 +40,8 @@ public class DebugWindow extends FrameContainer {
     protected DebugPlugin plugin;
     /** The parser this window is debugging */
     protected Parser parser;
-    /** The Server window we are a child of */
-    protected Server server;
+    /** The connection we're operating on */
+    protected Connection connection;
 
     /**
      * Creates a new instance of DebugWindow.
@@ -55,7 +56,7 @@ public class DebugWindow extends FrameContainer {
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.plugin = plugin;
         this.parser = parser;
-        this.server = server;
+        this.connection = server;
     }
 
     /**
@@ -64,8 +65,8 @@ public class DebugWindow extends FrameContainer {
      * @return the associated server connection
      */
     @Override
-    public Server getServer() {
-        return server;
+    public Connection getConnection() {
+        return connection;
     }
 
     /**
@@ -99,7 +100,7 @@ public class DebugWindow extends FrameContainer {
     public void windowClosed() {
         // 7: Remove any references to the window and parents
         this.parser = null;
-        this.server = null;
+        this.connection = null;
         this.plugin = null;
     }
 }

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.parserdebug;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
@@ -98,8 +99,8 @@ public final class ParserDebugCommand extends Command {
             try {
                 parser.getCallbackManager().addCallback(DebugInfoListener.class, myPlugin);
                 final DebugWindow window = new DebugWindow(myPlugin,
-                        "Parser Debug", parser, origin.getServer());
-                windowManager.addWindow(origin.getServer(), window);
+                        "Parser Debug", parser, (Server) origin.getConnection());
+                windowManager.addWindow((Server) origin.getConnection(), window);
                 myPlugin.registeredParsers.put(parser, window);
                 sendLine(origin, isSilent, FORMAT_OUTPUT, "Adding callback ok");
                 window.addLine("======================", true);

src/com/dmdirc/addons/redirect/FakeWriteableFrameContainer.java

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.redirect;
 
 import com.dmdirc.MessageTarget;
-import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.messages.Formatter;
@@ -112,8 +112,8 @@ public class FakeWriteableFrameContainer extends WritableFrameContainer {
 
     /** {@inheritDoc} */
     @Override
-    public Server getServer() {
-        return target.getServer();
+    public Connection getConnection() {
+        return target.getConnection();
     }
 
     /** {@inheritDoc} */

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

@@ -142,7 +142,7 @@ public class RelayBotPlugin extends BasePlugin implements ActionListener, Config
             removeHandler((Channel) arguments[0]);
         } else if (type == CoreActionType.CHANNEL_QUIT) {
             final Channel chan = (Channel) arguments[0];
-            final Parser parser = chan.getServer().getParser();
+            final Parser parser = chan.getConnection().getParser();
             final ChannelClientInfo cci = (ChannelClientInfo) arguments[1];
             final String channelName = parser.getStringConverter().toLowerCase(chan.getName());
 
@@ -220,7 +220,7 @@ public class RelayBotPlugin extends BasePlugin implements ActionListener, Config
             if (handlers.containsKey(channel)) {
                 return handlers.get(channel);
             } else {
-                final String channelName = channel.getServer().getParser().getStringConverter().toLowerCase(channel.getName());
+                final String channelName = channel.getConnection().getParser().getStringConverter().toLowerCase(channel.getName());
                 if (identityController.getGlobalConfiguration().hasOptionString(getDomain(), channelName)) {
                     final RelayChannelHandler handler = new RelayChannelHandler(this, identityController, channel);
                     handlers.put(channel, handler);

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

@@ -93,7 +93,7 @@ public class RelayChannelHandler implements ChannelMessageListener {
         coreChannelHandler = ceh;
 
         if (coreChannelHandler != null) {
-            final CallbackManager cbm = myChannel.getServer().getParser()
+            final CallbackManager cbm = myChannel.getConnection().getParser()
                     .getCallbackManager();
             cbm.delCallback(ChannelMessageListener.class, coreChannelHandler);
             cbm.addCallback(ChannelMessageListener.class, this,
@@ -180,7 +180,7 @@ public class RelayChannelHandler implements ChannelMessageListener {
      */
     public void restoreCoreChannelHandler() {
         if (coreChannelHandler != null) {
-            final CallbackManager cbm = myChannel.getServer().getParser()
+            final CallbackManager cbm = myChannel.getConnection().getParser()
                     .getCallbackManager();
 
             // Force adding this callback to the CBM.
@@ -201,7 +201,7 @@ public class RelayChannelHandler implements ChannelMessageListener {
      * Remove channel message handling from this ChannelHandler.
      */
     public void unset() {
-        myChannel.getServer().getParser().getCallbackManager().delCallback(
+        myChannel.getConnection().getParser().getCallbackManager().delCallback(
                 ChannelMessageListener.class, this);
     }
 
@@ -233,7 +233,7 @@ public class RelayChannelHandler implements ChannelMessageListener {
                         new Class<?>[]{String.class, ChannelClientInfo.class});
                 colourClient.setAccessible(true);
                 colourClient.invoke(nickColour.getPlugin(), myChannel
-                        .getServer().getNetwork(), channelClient);
+                        .getConnection().getNetwork(), channelClient);
             } catch (LinkageError | Exception e) {
                 // If it can't colour then oh well.
             }
@@ -397,7 +397,7 @@ public class RelayChannelHandler implements ChannelMessageListener {
      * This will cause all remote clients to vanish from the nicklist.
      */
     public void updateNames() {
-        coreChannelHandler.onChannelGotNames(myChannel.getServer().getParser(),
+        coreChannelHandler.onChannelGotNames(myChannel.getConnection().getParser(),
                 new Date(), myChannel.getChannelInfo());
     }
 }

src/com/dmdirc/addons/swingdebug/SystemStreamContainer.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.swingdebug;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.core.components.WindowComponent;
 
@@ -62,8 +62,8 @@ public class SystemStreamContainer extends FrameContainer {
 
     /** {@inheritDoc} */
     @Override
-    public Server getServer() {
-        return getParent() == null ? null : getParent().getServer();
+    public Connection getConnection() {
+        return getParent() == null ? null : getParent().getConnection();
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/commands/ServerSettings.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.commands;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -71,7 +72,7 @@ public class ServerSettings extends Command implements IntelligentCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        controller.showServerSettingsDialog(context.getSource().getServer());
+        controller.showServerSettingsDialog((Server) context.getSource().getConnection());
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/components/AwayLabel.java

@@ -65,9 +65,9 @@ public class AwayLabel extends JLabel implements ConfigChangeListener,
         useAwayIndicator = container.getConfigManager().getOptionBool("ui",
                 AWAY_INDICATOR);
 
-        if (container.getServer() != null) {
-            setVisible(container.getServer().isAway());
-            container.getServer().addAwayStateListener(this);
+        if (container.getConnection() != null) {
+            setVisible(container.getConnection().isAway());
+            container.getConnection().addAwayStateListener(this);
         }
 
         container.addCloseListener(this);
@@ -123,8 +123,8 @@ public class AwayLabel extends JLabel implements ConfigChangeListener,
     /** {@inheritDoc} */
     @Override
     public void windowClosing(final FrameContainer window) {
-        if (container != null && container.getServer() != null) {
-            container.getServer().removeAwayStateListener(this);
+        if (container != null && container.getConnection() != null) {
+            container.getConnection().removeAwayStateListener(this);
         }
     }
 }

src/com/dmdirc/addons/ui_swing/components/TopicBar.java

@@ -332,12 +332,12 @@ public class TopicBar extends JComponent implements ActionListener,
                 return;
             }
             if (url.charAt(0) == '#') {
-                channel.getServer().join(new ChannelJoinRequest(url));
+                channel.getConnection().join(new ChannelJoinRequest(url));
             } else if (url.contains("://")) {
                 controller.getUrlHandler().launchApp(e.getDescription());
             } else {
                 controller.requestWindowFocus(controller.getWindowFactory()
-                        .getSwingWindow(channel.getServer().getQuery(url)));
+                        .getSwingWindow(channel.getConnection().getQuery(url)));
             }
         }
     }

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

@@ -92,7 +92,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
                 CoreActionType.CLIENT_CLOSING);
 
         identity = controller.getIdentityFactory().createChannelConfig(
-                owner.getServer().getNetwork(), owner.getChannelInfo().getName());
+                owner.getConnection().getNetwork(), owner.getChannelInfo().getName());
     }
 
     /**
@@ -241,7 +241,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     /** {@inheritDoc} */
     @Override
     public void addCustomPopupItems(final JPopupMenu popupMenu) {
-        if (getContainer().getServer().getState().equals(ServerState.CONNECTED)) {
+        if (getContainer().getConnection().getState().equals(ServerState.CONNECTED)) {
             settingsMI.setEnabled(true);
         } else {
             settingsMI.setEnabled(false);

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

@@ -96,7 +96,7 @@ public final class ServerFrame extends InputTextFrame implements
     @Override
     public void actionPerformed(final ActionEvent actionEvent) {
         if (actionEvent.getSource() == settingsMI) {
-            controller.showServerSettingsDialog(getContainer().getServer());
+            controller.showServerSettingsDialog((Server) getContainer().getConnection());
         }
     }
 
@@ -127,7 +127,7 @@ public final class ServerFrame extends InputTextFrame implements
     /** {@inheritDoc} */
     @Override
     public void addCustomPopupItems(final JPopupMenu popupMenu) {
-        if (getContainer().getServer().getState()
+        if (getContainer().getConnection().getState()
                 .equals(ServerState.CONNECTED)) {
             settingsMI.setEnabled(true);
         } else {

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

@@ -335,11 +335,11 @@ public abstract class TextFrame extends JPanel implements Window,
     private void handleLinkClick(final ClickTypeValue clickType) {
         switch (clickType.getType()) {
             case CHANNEL:
-                if (frameParent.getServer() != null && ActionManager
+                if (frameParent.getConnection() != null && ActionManager
                         .getActionManager().triggerEvent(
                         CoreActionType.LINK_CHANNEL_CLICKED, null, this,
                         clickType.getValue())) {
-                    frameParent.getServer().join(
+                    frameParent.getConnection().join(
                             new ChannelJoinRequest(clickType.getValue()));
                 }
                 break;
@@ -351,13 +351,13 @@ public abstract class TextFrame extends JPanel implements Window,
                 }
                 break;
             case NICKNAME:
-                if (frameParent.getServer() != null && ActionManager
+                if (frameParent.getConnection() != null && ActionManager
                         .getActionManager().triggerEvent(
                         CoreActionType.LINK_NICKNAME_CLICKED, null, this,
                         clickType.getValue())) {
                     getController().requestWindowFocus(getController()
                             .getWindowFactory().getSwingWindow(getContainer()
-                            .getServer().getQuery(clickType.getValue())));
+                            .getConnection().getQuery(clickType.getValue())));
                 }
                 break;
             default:

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

@@ -134,14 +134,14 @@ public class ChannelMenu extends JMenu implements ActionListener,
         final FrameContainer activeWindow = activeFrame == null ? null
                 : activeFrame.getContainer();
 
-        join.setEnabled(activeWindow != null && activeWindow.getServer()
-                != null && activeWindow.getServer().getState()
+        join.setEnabled(activeWindow != null && activeWindow.getConnection()
+                != null && activeWindow.getConnection().getState()
                 == ServerState.CONNECTED);
         csd.setEnabled(activeWindow instanceof Channel && activeWindow
-                .getServer() != null && activeWindow.getServer().getState()
+                .getConnection() != null && activeWindow.getConnection().getState()
                 == ServerState.CONNECTED);
-        list.setEnabled(activeWindow != null && activeWindow.getServer() != null
-                && activeWindow.getServer().getState() == ServerState.CONNECTED);
+        list.setEnabled(activeWindow != null && activeWindow.getConnection() != null
+                && activeWindow.getConnection().getState() == ServerState.CONNECTED);
     }
 
     /** {@inheritDoc} */

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.menubar;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.MainFrame;
@@ -126,10 +127,10 @@ public class ServerMenu extends JMenu implements ActionListener,
                 break;
             case "ServerSettings":
                 controller.showServerSettingsDialog(
-                        mainFrame.getActiveFrame().getContainer().getServer());
+                        (Server) mainFrame.getActiveFrame().getContainer().getConnection());
                 break;
             case "Disconnect":
-                mainFrame.getActiveFrame().getContainer().getServer().disconnect();
+                mainFrame.getActiveFrame().getContainer().getConnection().disconnect();
                 break;
         }
     }
@@ -142,10 +143,10 @@ public class ServerMenu extends JMenu implements ActionListener,
                 : activeFrame.getContainer();
 
         ssd.setEnabled(activeWindow != null && activeWindow
-                .getServer() != null && activeWindow.getServer().getState()
+                .getConnection() != null && activeWindow.getConnection().getState()
                 == ServerState.CONNECTED);
         disconnect.setEnabled(activeWindow != null && activeWindow
-                .getServer() != null && activeWindow.getServer().getState()
+                .getConnection() != null && activeWindow.getConnection().getState()
                 == ServerState.CONNECTED);
     }
 

src/com/dmdirc/addons/ui_swing/components/modes/ChannelModesPane.java

@@ -75,14 +75,14 @@ public final class ChannelModesPane extends ModesPane {
     /** {@inheritDoc} */
     @Override
     public boolean isModeSettable(final String mode) {
-        return channel.getServer().getParser().isUserSettable(
+        return channel.getConnection().getParser().isUserSettable(
                 mode.toCharArray()[0]);
     }
 
     /** {@inheritDoc} */
     @Override
     public String getAvailableBooleanModes() {
-        return channel.getServer().getParser().getBooleanChannelModes();
+        return channel.getConnection().getParser().getBooleanChannelModes();
     }
 
     /** {@inheritDoc} */
@@ -94,7 +94,7 @@ public final class ChannelModesPane extends ModesPane {
     /** {@inheritDoc} */
     @Override
     public String getAllParamModes() {
-        final Parser parser = channel.getServer().getParser();
+        final Parser parser = channel.getConnection().getParser();
         return parser.getParameterChannelModes()
                 + parser.getDoubleParameterChannelModes();
     }

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

@@ -215,7 +215,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
     /** {@inheritDoc} */
     @Override
     public void selectionChanged(final TextFrame window) {
-        activeServer = window == null ? null : window.getContainer().getServer();
+        activeServer = window == null ? null : (Server) window.getContainer().getConnection();
         update();
     }
 }

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

@@ -57,7 +57,7 @@ public class ChannelJoinDialog extends StandardInputDialog {
     /** {@inheritDoc} */
     @Override
     public boolean save() {
-        mainFrame.getActiveFrame().getContainer().getServer()
+        mainFrame.getActiveFrame().getContainer().getConnection()
                 .join(new ChannelJoinRequest(getText()));
         return true;
     }

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

@@ -276,7 +276,7 @@ public class NewServerDialog extends StandardDialog implements
                     }
                 }.executeInExecutor();
             } else {
-                final Connection connection = mainFrame.getActiveFrame().getContainer().getServer();
+                final Connection connection = mainFrame.getActiveFrame().getContainer().getConnection();
 
                 new LoggingSwingWorker<Void, Void>() {
 

src/com/dmdirc/addons/ui_swing/dialogs/channellist/ChannelListDialog.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.channellist;
 
+import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 
@@ -49,8 +50,8 @@ public class ChannelListDialog extends StandardDialog implements
         super(controller, ModalityType.MODELESS);
         setTitle("Channel List");
         total = new JLabel("No results.");
-        list = new ChannelListPanel(controller.getMainFrame().getActiveFrame()
-                .getContainer().getServer(), total);
+        list = new ChannelListPanel((Server) controller.getMainFrame().getActiveFrame()
+                .getContainer().getConnection(), total);
         layoutComponents();
         getCancelButton().setText("Close");
         getCancelButton().addActionListener(this);

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java

@@ -126,7 +126,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         }
         listModesPanel = new JScrollPane();
         listModesPanels = new ArrayList<>();
-        listModesArray = channel.getServer().getParser().getListChannelModes().
+        listModesArray = channel.getConnection().getParser().getListChannelModes().
                 toCharArray();
         existingListItems = new MapList<>();
         listModesMenu = new JComboBox(new DefaultComboBoxModel());
@@ -375,7 +375,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
 
         final int selected = listModesMenu.getSelectedIndex();
         final int current = listModesPanels.get(selected).getModel().getSize();
-        final int maxModes = channel.getServer().getParser().
+        final int maxModes = channel.getConnection().getParser().
                 getMaxListModes(listModesArray[selected]);
 
         if (maxModes == -1) {

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -115,7 +115,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
         this.compFactory = compFactory;
 
         channel = newChannel;
-        identity = identityFactory.createChannelConfig(channel.getServer().getNetwork(),
+        identity = identityFactory.createChannelConfig(channel.getConnection().getNetwork(),
                 channel.getChannelInfo().getName());
         this.channelWindow = (InputWindow) windowFactory.getSwingWindow(newChannel);
 

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

@@ -89,7 +89,7 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
 
         this.channel = channel;
         this.parent = parent;
-        topicLengthMax = channel.getServer().getParser().getMaxTopicLength();
+        topicLengthMax = channel.getConnection().getParser().getMaxTopicLength();
         this.channelWindow = channelWindow;
 
         initComponents(iconManager, channel.getConfigManager(), serviceManager);

src/com/dmdirc/addons/ui_web/DynamicRequestHandler.java

@@ -378,7 +378,7 @@ public class DynamicRequestHandler extends AbstractHandler {
             throws IOException {
         final String windowID = request.getParameter("source");
         final WebWindow window = controller.getWindowManager().getWindow(windowID);
-        window.getContainer().getServer().join(new ChannelJoinRequest(request.
+        window.getContainer().getConnection().join(new ChannelJoinRequest(request.
                 getParameter("channel")));
     }
 
@@ -386,7 +386,7 @@ public class DynamicRequestHandler extends AbstractHandler {
             throws IOException {
         final String windowID = request.getParameter("source");
         final WebWindow window = controller.getWindowManager().getWindow(windowID);
-        window.getContainer().getServer().getQuery(request.getParameter(
+        window.getContainer().getConnection().getQuery(request.getParameter(
                 "target"));
     }
 

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

@@ -205,8 +205,8 @@ public final class WindowStatusPlugin extends BasePlugin
             final Query frame = (Query) current;
 
             textString.append(frame.getHost());
-            if (showname && frame.getServer().getParser() != null) {
-                final ClientInfo client = frame.getServer().getParser()
+            if (showname && frame.getConnection().getParser() != null) {
+                final ClientInfo client = frame.getConnection().getParser()
                         .getClient(frame.getHost());
                 final String realname = client.getRealname();
                 if (realname != null && !realname.isEmpty()) {