Servers no longer autoconnect.

Fixes issue 2227; fixes issue 2807 (dev error)

src/com/dmdirc/Server.java

@@ -176,6 +176,7 @@ public class Server extends WritableFrameContainer implements Serializable {
                 new ConfigManager("", "", url.getServer()));
 
         this.address = url;
+        this.profile = profile;
 
         window = Main.getUI().getServer(this);
 
@@ -209,14 +210,21 @@ public class Server extends WritableFrameContainer implements Serializable {
         if (getConfigManager().getOptionBool(DOMAIN_GENERAL, "showrawwindow")) {
             addRaw();
         }
-
-        connect(url, profile);
     }
 
     // </editor-fold>
 
     // <editor-fold defaultstate="collapsed" desc="Connection, disconnection & reconnection">
 
+    /**
+     * Connects to a new server with the previously supplied address and profile.
+     *
+     * @since 0.6.3m2
+     */
+    public void connect() {
+        connect(address, profile);
+    }
+
     /**
      * Connects to a new server with the specified details.
      *

src/com/dmdirc/ServerManager.java

@@ -222,8 +222,9 @@ public final class ServerManager {
 
         if (connectedServer == null) {
             try {
-                new Server("irc://irc.quakenet.org/DMDirc",
+                final Server server = new Server("irc://irc.quakenet.org/DMDirc",
                         IdentityManager.getProfiles().get(0));
+                server.connect();
             } catch (InvalidAddressException ex) {
                 Logger.appError(ErrorLevel.MEDIUM, "Unable to construct new server", ex);
             }

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

@@ -282,7 +282,8 @@ public final class NewServerDialog extends StandardDialog implements ActionListe
             new LoggingSwingWorker() {
                 @Override
                 protected Object doInBackground() throws Exception {
-                    new Server(address, profile);
+                    final Server server = new Server(address, profile);
+                    server.connect();
                     return null;
                 }
             }.execute();
@@ -295,7 +296,8 @@ public final class NewServerDialog extends StandardDialog implements ActionListe
                 @Override
                 protected Object doInBackground() throws Exception {
                     if (server == null) {
-                        new Server(address, profile);
+                        final Server newServer = new Server(address, profile);
+                        newServer.connect();
                     } else {
                         server.connect(address, profile);
                     }

src/com/dmdirc/commandparser/commands/global/NewServer.java

@@ -103,7 +103,9 @@ public final class NewServer extends GlobalCommand {
             pass = args.getArgumentsAsString(offset);
         }
         
-        new Server(new IrcAddress(host, port, pass, ssl), IdentityManager.getProfiles().get(0));
+        final Server server = new Server(new IrcAddress(host, port, pass, ssl),
+                IdentityManager.getProfiles().get(0));
+        server.connect();
     }
     
     

src/com/dmdirc/util/IrcAddress.java

@@ -256,7 +256,8 @@ public class IrcAddress implements Serializable {
         final List<Server> servers = ServerManager.getServerManager().
                 getServersByAddress(getServer());
         if (servers.isEmpty()) {
-            new Server(this, profile);
+            final Server newServer = new Server(this, profile);
+            newServer.connect();
         } else {
             final Server thisServer = servers.get(0);
             for (String channel : new ArrayList<String>(getChannels())) {

test/com/dmdirc/InviteTest.java

@@ -43,6 +43,8 @@ public class InviteTest {
         IdentityManager.load();
         
         server = new Server("irc-test://255.255.255.255", IdentityManager.getProfiles().get(0));
+        server.connect();
+        
         test = new Invite(server, "#channel", "nick!ident@host");
         server.addInvite(test);
         ts = new Date().getTime();

test/com/dmdirc/ServerManagerTest.java

@@ -106,6 +106,8 @@ public class ServerManagerTest {
                 IdentityManager.getProfiles().get(0));
         final Server serverB = new Server("irc-test://255.255.255.254",
                 IdentityManager.getProfiles().get(0));
+        serverA.connect();
+        serverB.connect();
         
         final ServerManager sm = ServerManager.getServerManager();
         

test/com/dmdirc/ServerTest.java

@@ -39,6 +39,7 @@ public class ServerTest {
         IdentityManager.load();
         server = new Server("irc-test://255.255.255.255",
                 IdentityManager.getProfiles().get(0));
+        server.connect();
     }
 
     @Test

test/com/dmdirc/addons/logging/LoggingPluginTest.java

@@ -53,6 +53,8 @@ public class LoggingPluginTest {
         IdentityManager.load();
         server = new Server("irc-test://255.255.255.255",
                 IdentityManager.getProfiles().get(0));
+        server.connect();
+        
         channel = new Channel(server, new IRCChannelInfo((IRCParser) server.getParser(), "#test"));
         query = new Query(server, "foo!bar@baz");