Servers now use IrcAddresses in constructors. Issue 2736.

src/com/dmdirc/Server.java

@@ -52,6 +52,8 @@ import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.ServerWindow;
 import com.dmdirc.ui.interfaces.Window;
 
+import com.dmdirc.util.InvalidAddressException;
+import com.dmdirc.util.IrcAddress;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Hashtable;
@@ -152,64 +154,41 @@ public class Server extends WritableFrameContainer implements Serializable {
     // <editor-fold defaultstate="collapsed" desc="Constructors">
 
     /**
-     * Creates a new instance of Server. Does not auto-join any channels, and
-     * uses a default {@link ParserFactory}.
-     *
-     * @param server The hostname/ip of the server to connect to
-     * @param port The port to connect to
-     * @param password The server password
-     * @param ssl Whether to use SSL or not
-     * @param profile The profile to use
-     */
-    public Server(final String server, final int port, final String password,
-            final boolean ssl, final Identity profile) {
-        this(server, port, password, ssl, profile, new ArrayList<String>());
-    }
-
-    /**
-     * Creates a new instance of Server. Uses a default {@link ParserFactory}.
+     * Creates a new instance of Server.
      *
-     * @param server The hostname/ip of the server to connect to
-     * @param port The port to connect to
-     * @param password The server password
-     * @param ssl Whether to use SSL or not
+     * @since 0.6.3m2
+     * @param url The address of the server to connect to
      * @param profile The profile to use
-     * @param autochannels A list of channels to auto-join when we connect
+     * @throws InvalidAddressException If the specified URL is not valid
      */
-    public Server(final String server, final int port, final String password,
-            final boolean ssl, final Identity profile, final List<String> autochannels) {
-        this(server, port, password, ssl, profile, autochannels, new ParserFactory());
+    public Server(final String url, final Identity profile) throws InvalidAddressException {
+        this(new IrcAddress(url), profile);
     }
 
     /**
-     * Creates a new instance of Server.
+     * Creates a new server which will connect to the specified URL with
+     * the specified profile.
      *
-     * @since 0.6
-     * @param server The hostname/ip of the server to connect to
-     * @param port The port to connect to
-     * @param password The server password
-     * @param ssl Whether to use SSL or not
+     * @since 0.6.3m2
+     * @param url The address of the server to connect to
      * @param profile The profile to use
-     * @param autochannels A list of channels to auto-join when we connect
-     * @param factory The {@link ParserFactory} to use to create parsers
      */
-    public Server(final String server, final int port, final String password,
-            final boolean ssl, final Identity profile,
-            final List<String> autochannels, final ParserFactory factory) {
-        super("server-disconnected", server, new ConfigManager("", "", server));
+    public Server(final IrcAddress url, final Identity profile) {
+        super("server-disconnected", url.getServer(),
+                new ConfigManager("", "", url.getServer()));
 
-        serverInfo = new ServerInfo(server, port, password);
-        serverInfo.setSSL(ssl);
+        serverInfo = new ServerInfo(url.getServer(), url.getPort(), url.getPassword());
+        serverInfo.setSSL(url.isSSL());
 
-        this.autochannels = autochannels;
-        this.parserFactory = factory;
+        this.autochannels = url.getChannels();
+        this.parserFactory = new ParserFactory();
 
         window = Main.getUI().getServer(this);
 
         ServerManager.getServerManager().registerServer(this);
         WindowManager.addWindow(window);
 
-        window.setTitle(server + ":" + port);
+        window.setTitle(url.getServer() + ":" + url.getPort());
 
         tabCompleter.addEntries(TabCompletionType.COMMAND,
                 AliasWrapper.getAliasWrapper().getAliases());
@@ -237,7 +216,7 @@ public class Server extends WritableFrameContainer implements Serializable {
             addRaw();
         }
 
-        connect(server, port, password, ssl, profile);
+        connect(url.getServer(), url.getPort(), url.getPassword(), url.isSSL(), profile);
     }
 
     // </editor-fold>

src/com/dmdirc/ServerManager.java

@@ -23,7 +23,10 @@
 package com.dmdirc;
 
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.util.InvalidAddressException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -218,11 +221,12 @@ public final class ServerManager {
         }
 
         if (connectedServer == null) {
-            final List<String> channels = new ArrayList<String>();
-                channels.add("#DMDirc");
-
-                new Server("irc.quakenet.org", 6667, "", false,
-                        IdentityManager.getProfiles().get(0), channels);
+            try {
+                new Server("irc://irc.quakenet.org/DMDirc",
+                        IdentityManager.getProfiles().get(0));
+            } catch (InvalidAddressException ex) {
+                Logger.appError(ErrorLevel.MEDIUM, "Unable to construct new server", ex);
+            }
         } else {
             connectedServer.join("#DMDirc");
         }

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

@@ -33,6 +33,7 @@ import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 
+import com.dmdirc.util.IrcAddress;
 import java.awt.Dialog.ModalityType;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
@@ -280,7 +281,7 @@ public final class NewServerDialog extends StandardDialog implements ActionListe
 
                 @Override
                 protected Object doInBackground() throws Exception {
-                    new Server(host, port, pass, sslCheck.isSelected(), profile);
+                    new Server(new IrcAddress(host, port, pass, sslCheck.isSelected()), profile);
                     return null;
                 }
             }.execute();
@@ -294,7 +295,7 @@ public final class NewServerDialog extends StandardDialog implements ActionListe
                 @Override
                 protected Object doInBackground() throws Exception {
                     if (server == null) {
-                        new Server(host, port, pass, sslCheck.isSelected(),
+                        new Server(new IrcAddress(host, port, pass, sslCheck.isSelected()),
                             profile);
                     } else {
                         server.connect(host, port, pass, sslCheck.isSelected(),

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

@@ -30,6 +30,7 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.util.IrcAddress;
 
 /**
  * The new server command allows users to open a new server window.
@@ -102,7 +103,7 @@ public final class NewServer extends GlobalCommand {
             pass = args.getArgumentsAsString(offset);
         }
         
-        new Server(host, port, pass, ssl, IdentityManager.getProfiles().get(0));
+        new Server(new IrcAddress(host, port, pass, ssl), IdentityManager.getProfiles().get(0));
     }
     
     

src/com/dmdirc/util/IrcAddress.java

@@ -106,6 +106,23 @@ public class IrcAddress implements Serializable {
         }
     }
 
+    /**
+     * Constructs a new IrcAddress object representing the specified details.
+     *
+     * @param host The hostname or IP of the server
+     * @param port The port of the server
+     * @param pass The password to use for the server
+     * @param ssl Whether or not to use SSL
+     * @since 0.6.3m2
+     */
+    public IrcAddress(final String host, final int port, final String pass,
+            final boolean ssl) {
+        this.server = host;
+        this.port = port;
+        this.pass = pass;
+        this.usesSSL = ssl;
+    }
+
     /**
      * Processes the password part of this address.
      *
@@ -214,8 +231,7 @@ public class IrcAddress implements Serializable {
         final List<Server> servers = ServerManager.getServerManager().
                 getServersByAddress(getServer());
         if (servers.isEmpty()) {
-            new Server(getServer(), getPort(), getPassword(), isSSL(), 
-                    profile, getChannels());
+            new Server(this, profile);
         } else {
             final Server thisServer = servers.get(0);
             for (String channel : new ArrayList<String>(getChannels())) {