Use Connection in preference to Server.

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

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

@@ -23,7 +23,6 @@
 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;
@@ -41,8 +40,8 @@ public class DebugWindow extends FrameContainer {
     protected final DebugInfoListener listener;
     /** The parser this window is debugging. */
     protected Parser parser;
-    /** The server we're operating on. */
-    protected final Server server;
+    /** The connection we're operating on. */
+    protected final Connection connection;
 
     /**
      * Creates a new instance of DebugWindow.
@@ -50,20 +49,20 @@ public class DebugWindow extends FrameContainer {
      * @param listener   The debug listener for this window
      * @param title      The title of this window
      * @param parser     The parser this plugin is debugging
-     * @param server     The Server window this is a child of
+     * @param connection The connection this window is associated with.
      * @param urlBuilder The URL builder to use when finding icons.
      */
     public DebugWindow(
             final DebugInfoListener listener,
             final String title,
             final Parser parser,
-            final Server server,
+            final Connection connection,
             final URLBuilder urlBuilder) {
-        super("raw", "Parser Debug", title, server.getConfigManager(), urlBuilder,
-                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
+        super("raw", "Parser Debug", title, connection.getWindowModel().getConfigManager(),
+                urlBuilder, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.listener = listener;
         this.parser = parser;
-        this.server = server;
+        this.connection = connection;
     }
 
     /**
@@ -73,7 +72,7 @@ public class DebugWindow extends FrameContainer {
      */
     @Override
     public Connection getConnection() {
-        return server;
+        return connection;
     }
 
     /**

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

@@ -23,7 +23,6 @@
 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;
@@ -89,7 +88,7 @@ public final class ParserDebugCommand extends Command {
                 sendLine(origin, isSilent, FORMAT_ERROR, "Removing callback failed");
             }
         } else {
-            if (parserDebugManager.addParser(parser, (Server) origin.getConnection())) {
+            if (parserDebugManager.addParser(parser, origin.getConnection())) {
                 sendLine(origin, isSilent, FORMAT_OUTPUT, "Adding callback ok");
             } else {
                 sendLine(origin, isSilent, FORMAT_ERROR, "Adding callback failed");

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.parserdebug;
 
-import com.dmdirc.Server;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
@@ -90,16 +89,16 @@ public class ParserDebugManager implements ActionListener, DebugInfoListener {
      * Adds a parser to this manager, adding any required call backs.
      *
      * @param parser Parser to add
-     * @param server The server associated with the parser
+     * @param connection The connection associated with the parser
      *
      * @return Whether we added the parser without error
      */
-    public boolean addParser(final Parser parser, final Server server) {
+    public boolean addParser(final Parser parser, final Connection connection) {
         try {
             parser.getCallbackManager().addCallback(DebugInfoListener.class, this);
             final DebugWindow window = new DebugWindow(this, "Parser Debug", parser,
-                    server, urlBuilder);
-            windowManager.addWindow(server, window);
+                    connection, urlBuilder);
+            windowManager.addWindow(connection.getWindowModel(), window);
             registeredParsers.put(parser, window);
             window.addLine("======================", true);
             window.addLine("Started Monitoring: " + parser, true);

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

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.components.frames.ChannelFrameFactory;
 import com.dmdirc.addons.ui_swing.components.frames.CustomFrameFactory;
 import com.dmdirc.addons.ui_swing.components.frames.CustomInputFrameFactory;
@@ -114,7 +113,7 @@ public class SwingWindowFactory implements FrameListener {
                 new WindowProvider() {
                     @Override
                     public TextFrame getWindow(final FrameContainer container) {
-                        return serverFrameFactory.getServerFrame((Server) container);
+                        return serverFrameFactory.getServerFrame(container.getConnection());
                     }
                 });
         registerImplementation(

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.commands;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.commandparser.BaseCommandInfo;
@@ -35,6 +34,7 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import javax.inject.Inject;
@@ -49,7 +49,7 @@ public class ServerSettings extends Command implements IntelligentCommand {
     public static final CommandInfo INFO = new BaseCommandInfo("serversettings",
             "serversettings - opens the server settings window", CommandType.TYPE_SERVER);
     /** The dialog provider used to show the settings dialog. */
-    private final KeyedDialogProvider<Server, ServerSettingsDialog> dialogProvider;
+    private final KeyedDialogProvider<Connection, ServerSettingsDialog> dialogProvider;
 
     /**
      * Creates a new instance of the {@link ServerSettings} command.
@@ -60,7 +60,7 @@ public class ServerSettings extends Command implements IntelligentCommand {
     @Inject
     public ServerSettings(
             final CommandController commandController,
-            final KeyedDialogProvider<Server, ServerSettingsDialog> dialogProvider) {
+            final KeyedDialogProvider<Connection, ServerSettingsDialog> dialogProvider) {
         super(commandController);
         this.dialogProvider = dialogProvider;
     }
@@ -68,7 +68,7 @@ public class ServerSettings extends Command implements IntelligentCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        dialogProvider.displayOrRequestFocus((Server) context.getSource().getConnection());
+        dialogProvider.displayOrRequestFocus(context.getSource().getConnection());
     }
 
     @Override

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
@@ -65,13 +64,13 @@ public final class ServerFrame extends InputTextFrame implements
     /** Icon manager. */
     private final IconManager iconManager;
     /** Dialog provider to close SSD. */
-    private final KeyedDialogProvider<Server, ServerSettingsDialog> dialogProvider;
+    private final KeyedDialogProvider<Connection, ServerSettingsDialog> dialogProvider;
     /** popup menu item. */
     private JMenuItem settingsMI;
     /** The SSL certificate dialog we're displaying for this server, if any. */
     private SSLCertificateDialog sslDialog = null;
     /** Server instance. */
-    private final Server server;
+    private final Connection connection;
 
     /**
      * Creates a new ServerFrame.
@@ -84,13 +83,13 @@ public final class ServerFrame extends InputTextFrame implements
     public ServerFrame(
             final TextFrameDependencies deps,
             final Provider<SwingInputField> inputFieldProvider,
-            final KeyedDialogProvider<Server, ServerSettingsDialog> dialogProvider,
-            @Unbound final Server owner) {
-        super(deps, inputFieldProvider, owner);
+            final KeyedDialogProvider<Connection, ServerSettingsDialog> dialogProvider,
+            @Unbound final Connection owner) {
+        super(deps, inputFieldProvider, owner.getWindowModel());
         this.mainFrame = deps.mainFrame;
         this.iconManager = deps.iconManager;
         this.dialogProvider = dialogProvider;
-        this.server = owner;
+        this.connection = owner;
         initComponents();
 
         owner.addCertificateProblemListener(this);
@@ -117,7 +116,7 @@ public final class ServerFrame extends InputTextFrame implements
     @Override
     public void actionPerformed(final ActionEvent actionEvent) {
         if (actionEvent.getSource() == settingsMI) {
-            dialogProvider.displayOrRequestFocus(server);
+            dialogProvider.displayOrRequestFocus(connection);
         }
     }
 
@@ -174,7 +173,7 @@ public final class ServerFrame extends InputTextFrame implements
 
     @Override
     public void windowClosing(final FrameContainer window) {
-        dialogProvider.dispose(server);
+        dialogProvider.dispose(connection);
         super.windowClosing(window);
     }
 

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

@@ -23,7 +23,6 @@
 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.components.frames.TextFrame;
@@ -32,6 +31,7 @@ import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.LifecycleController;
 
 import java.awt.event.ActionEvent;
@@ -63,7 +63,7 @@ public class ServerMenu extends JMenu implements ActionListener,
     /** Provider to use to retrieve NSD instances. */
     private final DialogProvider<NewServerDialog> newServerProvider;
     /** Provider for server settings dialogs. */
-    private final KeyedDialogProvider<Server, ServerSettingsDialog> ssdProvider;
+    private final KeyedDialogProvider<Connection, ServerSettingsDialog> ssdProvider;
 
     /**
      * Creates a new Server menu.
@@ -78,7 +78,7 @@ public class ServerMenu extends JMenu implements ActionListener,
             final ActiveFrameManager activeFrameManager,
             final LifecycleController lifecycleController,
             final DialogProvider<NewServerDialog> newServerProvider,
-            final KeyedDialogProvider<Server, ServerSettingsDialog> ssdProvider) {
+            final KeyedDialogProvider<Connection, ServerSettingsDialog> ssdProvider) {
         super("Server");
         this.activeFrameManager = activeFrameManager;
         this.lifecycleController = lifecycleController;
@@ -137,7 +137,7 @@ public class ServerMenu extends JMenu implements ActionListener,
                 break;
             case "ServerSettings":
                 ssdProvider.displayOrRequestFocus(
-                        (Server) activeFrameManager.getActiveFrame().getContainer().getConnection());
+                        activeFrameManager.getActiveFrame().getContainer().getConnection());
                 break;
             case "Disconnect":
                 activeFrameManager.getActiveFrame().getContainer().getConnection().disconnect();

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.modes;
 
-import com.dmdirc.Server;
+import com.dmdirc.interfaces.Connection;
 
 /** User mode panel. */
 public final class UserModesPane extends ModesPane {
@@ -30,29 +30,30 @@ public final class UserModesPane extends ModesPane {
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** Parent server. */
-    private final Server server;
+    private final Connection connection;
 
     /**
      * Creates a new instance of UserModesPane.
      *
-     * @param server Parent server
+     * @param connection Parent server
      */
-    public UserModesPane(final Server server) {
-        super(server.getConfigManager(), server.getIconManager());
+    public UserModesPane(final Connection connection) {
+        super(connection.getWindowModel().getConfigManager(),
+                connection.getWindowModel().getIconManager());
 
-        this.server = server;
+        this.connection = connection;
         initModesPanel();
     }
 
     @Override
     public boolean hasModeValue(final String mode) {
-        return server.getConfigManager().hasOptionString("server",
+        return connection.getWindowModel().getConfigManager().hasOptionString("server",
                 "umode" + mode);
     }
 
     @Override
     public String getModeValue(final String mode) {
-        return server.getConfigManager().getOption("server", "umode" + mode);
+        return connection.getWindowModel().getConfigManager().getOption("server", "umode" + mode);
     }
 
     @Override
@@ -67,12 +68,12 @@ public final class UserModesPane extends ModesPane {
 
     @Override
     public String getAvailableBooleanModes() {
-        return server.getParser().getUserModes();
+        return connection.getParser().getUserModes();
     }
 
     @Override
     public String getOurBooleanModes() {
-        return server.getParser().getLocalClient().getModes();
+        return connection.getParser().getLocalClient().getModes();
     }
 
     @Override
@@ -88,12 +89,12 @@ public final class UserModesPane extends ModesPane {
     @Override
     public void alterMode(final boolean add, final String mode,
             final String parameter) {
-        server.getParser().getLocalClient().alterMode(add, mode.toCharArray()[0]);
+        connection.getParser().getLocalClient().alterMode(add, mode.toCharArray()[0]);
     }
 
     @Override
     public void flushModes() {
-        server.getParser().getLocalClient().flushModes();
+        connection.getParser().getLocalClient().flushModes();
     }
 
 }

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

@@ -67,8 +67,8 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
     private final JMenuItem accept;
     /** Main frame. */
     private final MainFrame mainFrame;
-    /** Active server. */
-    private Server activeServer;
+    /** Active connection. */
+    private Connection activeConnection;
 
     /**
      * Instantiates a new invite label.
@@ -97,8 +97,8 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
         accept.setActionCommand("acceptAll");
         accept.addActionListener(this);
 
-        for (final Server server : serverManager.getServers()) {
-            server.addInviteListener(this);
+        for (final Connection connection : serverManager.getServers()) {
+            connection.addInviteListener(this);
         }
 
         mainFrame.addSelectionListener(this);
@@ -114,7 +114,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
 
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new InvitePopup(this, activeServer, mainFrame);
+        return new InvitePopup(this, activeConnection, mainFrame);
     }
 
     /**
@@ -123,7 +123,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
     private void popuplateMenu() {
         menu.removeAll();
 
-        final Collection<Invite> invites = activeServer.getInvites();
+        final Collection<Invite> invites = activeConnection.getInvites();
         for (final Invite invite : invites) {
             menu.add(new JMenuItem(new InviteAction(invite)));
         }
@@ -140,7 +140,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
 
             @Override
             public void run() {
-                if (activeServer == null || activeServer.getInvites().isEmpty()) {
+                if (activeConnection == null || activeConnection.getInvites().isEmpty()) {
                     setVisible(false);
                     closeDialog();
                 } else {
@@ -198,17 +198,17 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
     public void actionPerformed(final ActionEvent e) {
         switch (e.getActionCommand()) {
             case "acceptAll":
-                activeServer.acceptInvites();
+                activeConnection.acceptInvites();
                 break;
             case "dismissAll":
-                activeServer.removeInvites();
+                activeConnection.removeInvites();
                 break;
         }
     }
 
     @Override
     public void selectionChanged(final TextFrame window) {
-        activeServer = window == null ? null : (Server) window.getContainer().getConnection();
+        activeConnection = window == null ? null : window.getContainer().getConnection();
         update();
     }
 

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.dialogs;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
@@ -32,6 +31,7 @@ import com.dmdirc.addons.ui_swing.components.SendWorker;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.ClientInfo;
 
@@ -200,27 +200,25 @@ public class FeedbackDialog extends StandardDialog implements ActionListener, Do
         final StringBuilder serverInfo = new StringBuilder();
         final StringBuilder dmdircInfo = new StringBuilder();
         if (serverCheckbox.isSelected()) {
-            for (Server server : serverManager.getServers()) {
-                if (server.getState().isDisconnected()) {
+            for (Connection connection : serverManager.getServers()) {
+                if (connection.getState().isDisconnected()) {
                     continue;
                 }
-                serverInfo.append("Server name: ").append(server.getName())
-                        .append("\n");
-                serverInfo.append("Actual name: ").append(server.getParser()
+                serverInfo.append("Actual name: ").append(connection.getParser()
                         .getServerName()).append("\n");
-                serverInfo.append("Network: ").append(server.getNetwork())
+                serverInfo.append("Network: ").append(connection.getNetwork())
                         .append("\n");
-                serverInfo.append("IRCd: ").append(server.getParser()
+                serverInfo.append("IRCd: ").append(connection.getParser()
                         .getServerSoftware()).append(" - ");
-                serverInfo.append(server.getParser().getServerSoftwareType())
+                serverInfo.append(connection.getParser().getServerSoftwareType())
                         .append("\n");
-                serverInfo.append("Modes: ").append(server.getParser()
+                serverInfo.append("Modes: ").append(connection.getParser()
                         .getBooleanChannelModes()).append(" ");
-                serverInfo.append(server.getParser().getListChannelModes())
+                serverInfo.append(connection.getParser().getListChannelModes())
                         .append(" ");
-                serverInfo.append(server.getParser().getParameterChannelModes())
+                serverInfo.append(connection.getParser().getParameterChannelModes())
                         .append(" ");
-                serverInfo.append(server.getParser().
+                serverInfo.append(connection.getParser().
                         getDoubleParameterChannelModes());
             }
         }

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.channellist;
 
-import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
@@ -53,8 +52,8 @@ public class ChannelListDialog extends StandardDialog implements ActionListener
         super(mainFrame, ModalityType.MODELESS);
         setTitle("Channel List");
         total = new JLabel("No results.");
-        list = new ChannelListPanel((Server) activeFrameManager.getActiveFrame().getContainer()
-                .getConnection(), total);
+        list = new ChannelListPanel(
+                activeFrameManager.getActiveFrame().getContainer().getConnection(), total);
         layoutComponents();
         getCancelButton().setText("Close");
         getCancelButton().addActionListener(this);

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.channellist;
 
-import com.dmdirc.Server;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.lists.GroupListManager;
 
 import javax.swing.JLabel;
@@ -47,11 +47,11 @@ public class ChannelListPanel extends JPanel {
     /**
      * Creates a new panel to perform a group list search on a server.
      *
-     * @param server Server on which to perform search
+     * @param connection Server on which to perform search
      * @param total  Label to update with total
      */
-    public ChannelListPanel(final Server server, final JLabel total) {
-        manager = new GroupListManager(server);
+    public ChannelListPanel(final Connection connection, final JLabel total) {
+        manager = new GroupListManager(connection);
         searchTerms = new SearchTermsPanel(manager);
         results = new ResultsPanel(manager, total);
         layoutComponents();

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.serversetting;
 
-import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.addons.ui_swing.MainFrame;
@@ -33,6 +32,7 @@ import com.dmdirc.addons.ui_swing.components.modes.UserModesPane;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 
@@ -52,8 +52,8 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
 
     /** Serial version UID. */
     private static final long serialVersionUID = 2;
-    /** Parent server. */
-    private final Server server;
+    /** Parent connection. */
+    private final Connection connection;
     /** Perform wrapper for the perform panel. */
     private final PerformWrapper performWrapper;
     /** Preferences manager to retrieve settings from. */
@@ -75,24 +75,24 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
      * @param preferencesManager Preferences manager to retrieve settings from
      * @param compFactory    Preferences setting component factory
      * @param performWrapper Wrapper for the perform tab.
-     * @param server         The server object that we're editing settings for
+     * @param connection         The server object that we're editing settings for
      * @param parentWindow   Parent window
      */
     public ServerSettingsDialog(
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
             final PerformWrapper performWrapper,
-            final Server server,
+            final Connection connection,
             final MainFrame parentWindow) {
         super(parentWindow, ModalityType.MODELESS);
-        this.server = server;
+        this.connection = connection;
         this.performWrapper = performWrapper;
         this.preferencesManager = preferencesManager;
 
         setTitle("Server settings");
         setResizable(false);
 
-        initComponents(parentWindow, server.getConfigManager(), compFactory);
+        initComponents(parentWindow, connection.getWindowModel().getConfigManager(), compFactory);
         initListeners();
     }
 
@@ -111,13 +111,15 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
 
         tabbedPane = new JTabbedPane();
 
-        modesPanel = new UserModesPane(server);
+        modesPanel = new UserModesPane(connection);
 
-        ignoreList = new IgnoreListPanel(server.getIconManager(), server, parentWindow);
+        ignoreList = new IgnoreListPanel(connection.getWindowModel().getIconManager(),
+                connection, parentWindow);
 
-        performPanel = new PerformTab(server.getIconManager(), config, performWrapper, server);
+        performPanel = new PerformTab(connection.getWindowModel().getIconManager(), config,
+                performWrapper, connection);
 
-        settingsPanel = new SettingsPanel(server.getIconManager(), compFactory,
+        settingsPanel = new SettingsPanel(connection.getWindowModel().getIconManager(), compFactory,
                 "These settings are specific to this network, any settings specified here will "
                 + "overwrite global settings");
 
@@ -144,14 +146,15 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
         add(getLeftButton(), "split 2, right");
         add(getRightButton(), "right");
 
-        tabbedPane.setSelectedIndex(server.getConfigManager().
+        tabbedPane.setSelectedIndex(connection.getWindowModel().getConfigManager().
                 getOptionInt("dialogstate", "serversettingsdialog"));
     }
 
     /** Adds the settings to the panel. */
     private void addSettings() {
-        settingsPanel.addOption(preferencesManager.getServerSettings(server.getConfigManager(),
-                server.getServerIdentity()));
+        settingsPanel.addOption(preferencesManager.getServerSettings(
+                connection.getWindowModel().getConfigManager(),
+                connection.getServerIdentity()));
     }
 
     /** Initialises listeners for this dialog. */
@@ -162,7 +165,7 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
 
     /** Saves the settings from this dialog. */
     public void saveSettings() {
-        if (server.getState() != ServerState.CONNECTED) {
+        if (connection.getState() != ServerState.CONNECTED) {
             new StandardQuestionDialog(getOwner(),
                     ModalityType.MODELESS,
                     "Server has been disconnected.", "Any changes you have "
@@ -192,7 +195,7 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
         performPanel.savePerforms();
         ignoreList.saveList();
 
-        final ConfigProvider identity = server.getNetworkIdentity();
+        final ConfigProvider identity = connection.getNetworkIdentity();
         identity.setOption("dialogstate", "serversettingsdialog",
                 String.valueOf(tabbedPane.getSelectedIndex()));
 

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

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.injection;
 
 import com.dmdirc.Channel;
 import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.Server;
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
@@ -44,6 +43,7 @@ import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
@@ -129,14 +129,14 @@ public class DialogModule {
 
     @Provides
     @Singleton
-    public KeyedDialogProvider<Server, ServerSettingsDialog> getServerSettingsDialogProvider(
+    public KeyedDialogProvider<Connection, ServerSettingsDialog> getServerSettingsDialogProvider(
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
             final PerformWrapper performWrapper,
             final MainFrame parentWindow) {
-        return new KeyedDialogProvider<Server, ServerSettingsDialog>() {
+        return new KeyedDialogProvider<Connection, ServerSettingsDialog>() {
             @Override
-            protected ServerSettingsDialog getInstance(final Server key) {
+            protected ServerSettingsDialog getInstance(final Connection key) {
                 return new ServerSettingsDialog(preferencesManager, compFactory, performWrapper,
                         key, parentWindow);
             }

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

@@ -44,7 +44,6 @@ import static org.mockito.Mockito.when;
 public class IdentClientTest {
 
     @Mock private AggregateConfigProvider acp;
-    @Mock private IdentdPlugin plugin;
     @Mock private ServerManager sm;
     @Mock private Server server;
     @Mock private IRCParser parser;