X-Git-Url: https://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectActionClientString.java;h=366070c6acc4cd5788d4811069eec6b48eb1e4bf;hb=08f80ac5fa60738d3ad74c4b5390a0b79ae313d4;hp=f9402cbeb9a0d5a14cf4e6083c3bdefb2f725248;hpb=79ce1a4973eba079ba819ba841d906de42f38e40;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java b/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java
index f9402cb..366070c 100644
--- a/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java
@@ -2,6 +2,7 @@ package be.nikiroo.utils.serial.server;
 
 import java.io.IOException;
 import java.net.Socket;
+import java.net.UnknownHostException;
 
 import be.nikiroo.utils.Version;
 
@@ -21,9 +22,12 @@ public class ConnectActionClientString 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 ConnectActionClientString(Socket s) {
-		super(s);
+	public ConnectActionClientString(Socket s, String key) {
+		super(s, key);
 	}
 
 	/**
@@ -35,47 +39,21 @@ public class ConnectActionClientString 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 when creating the socket
+	 *             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 ConnectActionClientString(String host, int port, boolean ssl)
+	public ConnectActionClientString(String host, int port, String key)
 			throws IOException {
-		super(host, port, ssl);
-	}
-
-	/**
-	 * Create a new {@link ConnectActionClientString}.
-	 * 
-	 * @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 when creating the socket
-	 */
-	public ConnectActionClientString(String host, int port, boolean ssl,
-			Version version) throws IOException {
-		super(host, port, ssl, version);
-	}
-
-	/**
-	 * Create a new {@link ConnectActionClientString}.
-	 * 
-	 * @param s
-	 *            the socket to bind to
-	 * @param version
-	 *            the client version
-	 */
-	public ConnectActionClientString(Socket s, Version version) {
-		super(s, version);
+		super(host, port, key);
 	}
 
 	/**