Allow connection settings (like server, port, password) to be set via…

… a class, making it easier to add new settings.

src/org/jibble/pircbot/ConnectionSettings.java

@@ -0,0 +1,11 @@
+package org.jibble.pircbot;
+
+public class ConnectionSettings {
+    public String server;
+    public int port = 6667;
+    public String password;
+
+    public ConnectionSettings(String server) {
+        this.server = server;
+    }
+}

src/org/jibble/pircbot/PircBot.java

@@ -88,7 +88,8 @@ public PircBot() {}
      * @throws NickAlreadyInUseException if our nick is already in use on the server.
      */
     public final synchronized void connect(String hostname) throws IOException, IrcException, NickAlreadyInUseException {
-        this.connect(hostname, 6667, null);
+        ConnectionSettings cs = new ConnectionSettings(hostname);
+        this.connect(cs);
     }
 
 
@@ -104,7 +105,9 @@ public final synchronized void connect(String hostname) throws IOException, IrcE
      * @throws NickAlreadyInUseException if our nick is already in use on the server.
      */
     public final synchronized void connect(String hostname, int port) throws IOException, IrcException, NickAlreadyInUseException {
-        this.connect(hostname, port, null);
+        ConnectionSettings cs = new ConnectionSettings(hostname);
+        cs.port = port;
+        this.connect(cs);
     }
 
 
@@ -122,10 +125,29 @@ public final synchronized void connect(String hostname, int port) throws IOExcep
      * @throws NickAlreadyInUseException if our nick is already in use on the server.
      */
     public final synchronized void connect(String hostname, int port, String password) throws IOException, IrcException, NickAlreadyInUseException {
+        ConnectionSettings cs = new ConnectionSettings(hostname);
+        cs.port = port;
+        cs.password = password;
+        this.connect(cs);
+    }
+
+
+    /**
+     * Attempt to connect to an IRC server using the supplied
+     * connection settings.
+     * The onConnect method is called upon success.
+     *
+     * @param cs The connection settings to use.
+     *
+     * @throws IOException if it was not possible to connect to the server.
+     * @throws IrcException if the server would not let us join it.
+     * @throws NickAlreadyInUseException if our nick is already in use on the server.
+     */
+    public final synchronized void connect(ConnectionSettings cs) throws IOException, IrcException, NickAlreadyInUseException {
 
-        _server = hostname;
-        _port = port;
-        _password = password;
+        _server = cs.server;
+        _port = cs.port;
+        _password = cs.password;
 
         if (isConnected()) {
             throw new IOException("The PircBot is already connected to an IRC server.  Disconnect first.");
@@ -137,7 +159,7 @@ public final synchronized void connect(String hostname, int port, String passwor
         this.removeAllChannels();
 
         // Connect to the server.
-        Socket socket =  new Socket(hostname, port);
+        Socket socket = new Socket(_server, _port);
         this.log("*** Connected to server.");
 
         _inetAddress = socket.getLocalAddress();
@@ -159,8 +181,8 @@ public final synchronized void connect(String hostname, int port, String passwor
         BufferedWriter bwriter = new BufferedWriter(outputStreamWriter);
 
         // Attempt to join the server.
-        if (password != null && !password.equals("")) {
-            OutputThread.sendRawLine(this, bwriter, "PASS " + password);
+        if (_password != null && !_password.equals("")) {
+            OutputThread.sendRawLine(this, bwriter, "PASS " + _password);
         }
         String nick = this.getName();
         OutputThread.sendRawLine(this, bwriter, "NICK " + nick);