Update plugins after core Server changes.

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

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

@@ -22,9 +22,8 @@
 
 package com.dmdirc.addons.serverlists;
 
-import com.dmdirc.Server;
-
 import com.dmdirc.ServerManager;
+
 import java.net.URI;
 
 /**
@@ -97,8 +96,7 @@ public class ServerEntry extends ServerGroupItemBase {
     /** {@inheritDoc} */
     @Override
     public void connect() {
-        final Server server = new Server(serverManager, address, getProfileIdentity());
-        server.connect();
+        serverManager.connectToAddress(address, getProfileIdentity());
     }
 
     /** {@inheritDoc} */

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs;
 
 import com.dmdirc.Server;
+import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
@@ -68,6 +69,8 @@ public final class NewServerDialog extends StandardDialog implements
     private static final long serialVersionUID = 8;
     /** Identity Manager. */
     private final IdentityManager identityManager;
+    /** Server manager. */
+    private final ServerManager serverManager;
     /** checkbox. */
     private JCheckBox newServerWindowCheck;
     /** checkbox. */
@@ -93,6 +96,7 @@ public final class NewServerDialog extends StandardDialog implements
     public NewServerDialog(final SwingController controller) {
         super(controller, controller.getMainFrame(), ModalityType.MODELESS);
         identityManager = controller.getIdentityManager();
+        serverManager = controller.getMain().getServerManager();
 
         initComponents();
         layoutComponents();
@@ -125,7 +129,7 @@ public final class NewServerDialog extends StandardDialog implements
 
         serverField.requestFocusInWindow();
 
-        if (getController().getMain().getServerManager().numServers() == 0 ||
+        if (serverManager.numServers() == 0 ||
                 getController().getMainFrame().getActiveFrame() == null) {
             newServerWindowCheck.setSelected(true);
             newServerWindowCheck.setEnabled(false);
@@ -247,14 +251,13 @@ public final class NewServerDialog extends StandardDialog implements
 
             // Open in a new window?
             if (newServerWindowCheck.isSelected()
-                    || getController().getMain().getServerManager().numServers() == 0
+                    || serverManager.numServers() == 0
                     || getController().getMainFrame().getActiveFrame() == null) {
 
                 new LoggingSwingWorker<Void, Void>() {
                     @Override
                     protected Void doInBackground() {
-                        final Server server = new Server(getController().getMain().getServerManager(), address, profile);
-                        server.connect();
+                        serverManager.connectToAddress(address, profile);
                         return null;
                     }
                 }.executeInExecutor();
@@ -268,8 +271,7 @@ public final class NewServerDialog extends StandardDialog implements
                     @Override
                     protected Void doInBackground() {
                         if (server == null) {
-                            final Server newServer = new Server(getController().getMain().getServerManager(), address, profile);
-                            newServer.connect();
+                            serverManager.connectToAddress(address, profile);
                         } else {
                             server.connect(address, profile);
                         }

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_web;
 
 import com.dmdirc.Channel;
-import com.dmdirc.Server;
 import com.dmdirc.addons.ui_web.uicomponents.WebInputHandler;
 import com.dmdirc.addons.ui_web.uicomponents.WebInputWindow;
 import com.dmdirc.addons.ui_web.uicomponents.WebWindow;
@@ -278,11 +277,11 @@ public class DynamicRequestHandler extends AbstractHandler {
     private void doNewServer(final HttpServletRequest request)
             throws IOException {
         try {
-            new Server(controller.getMain().getServerManager(),
+            controller.getMain().getServerManager().connectToAddress(
                     new URI("irc://" + request.getParameter("password") + "@"
-                    + request.getParameter("server") + ":"
-                    + request.getParameter("port")),
-                    findProfile(request.getParameter("profile"))).connect();
+                        + request.getParameter("server") + ":"
+                        + request.getParameter("port")),
+                    findProfile(request.getParameter("profile")));
         } catch (URISyntaxException ex) {
             // Ugh.
         }