X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectActionClientObject.java;h=da13be5b1bcebb3ddfe191e2f155ca4124096961;hb=08f80ac5fa60738d3ad74c4b5390a0b79ae313d4;hp=dd6f917ee03cf373ffe025a26fe83518e364f457;hpb=f4053377fa15da2f11e82955bfab86e673fa371c;p=fanfix.git

diff --git a/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java b/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java
index dd6f917..da13be5 100644
--- a/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java
@@ -22,9 +22,12 @@ public class ConnectActionClientObject extends ConnectActionClient {
 	 * 
 	 * @param s
 	 *            the socket to bind to
+	 * @param key
+	 *            an optional key to encrypt all the communications (if NULL,
+	 *            everything will be sent in clear text)
 	 */
-	public ConnectActionClientObject(Socket s) {
-		super(s);
+	public ConnectActionClientObject(Socket s, String key) {
+		super(s, key);
 	}
 
 	/**
@@ -36,8 +39,9 @@ public class ConnectActionClientObject extends ConnectActionClient {
 	 *            the host to bind to
 	 * @param port
 	 *            the port to bind to
-	 * @param ssl
-	 *            TRUE for an SSL connection, FALSE for plain text
+	 * @param key
+	 *            an optional key to encrypt all the communications (if NULL,
+	 *            everything will be sent in clear text)
 	 * 
 	 * @throws IOException
 	 *             in case of I/O error
@@ -47,46 +51,9 @@ public class ConnectActionClientObject extends ConnectActionClient {
 	 *             if the port parameter is outside the specified range of valid
 	 *             port values, which is between 0 and 65535, inclusive
 	 */
-	public ConnectActionClientObject(String host, int port, boolean ssl)
+	public ConnectActionClientObject(String host, int port, String key)
 			throws IOException {
-		super(host, port, ssl);
-	}
-
-	/**
-	 * Create a new {@link ConnectActionClientObject}.
-	 * 
-	 * @param host
-	 *            the host to bind to
-	 * @param port
-	 *            the port to bind to
-	 * @param ssl
-	 *            TRUE for an SSL connection, FALSE for plain text
-	 * @param version
-	 *            the client version
-	 * 
-	 * @throws IOException
-	 *             in case of I/O error
-	 * @throws UnknownHostException
-	 *             if the IP address of the host could not be determined
-	 * @throws IllegalArgumentException
-	 *             if the port parameter is outside the specified range of valid
-	 *             port values, which is between 0 and 65535, inclusive
-	 */
-	public ConnectActionClientObject(String host, int port, boolean ssl,
-			Version version) throws IOException {
-		super(host, port, ssl, version);
-	}
-
-	/**
-	 * Create a new {@link ConnectActionClientObject}.
-	 * 
-	 * @param s
-	 *            the socket to bind to
-	 * @param version
-	 *            the client version
-	 */
-	public ConnectActionClientObject(Socket s, Version version) {
-		super(s, version);
+		super(host, port, key);
 	}
 
 	/**