X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectActionClientObject.java;h=791f850b085819e1ac24480a2226358d708d194a;hb=5cb2cda79c16dc88ba3f2eca1e5cfaad092a4785;hp=e9673ac299730c521aa9c1c7d0fff0165f1c7063;hpb=79ce1a4973eba079ba819ba841d906de42f38e40;p=fanfix.git

diff --git a/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java b/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java
index e9673ac..791f850 100644
--- a/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java
@@ -2,8 +2,7 @@ package be.nikiroo.utils.serial.server;
 
 import java.io.IOException;
 import java.net.Socket;
-
-import be.nikiroo.utils.Version;
+import java.net.UnknownHostException;
 
 /**
  * Class used for the client basic handling.
@@ -15,35 +14,16 @@ import be.nikiroo.utils.Version;
  */
 public class ConnectActionClientObject extends ConnectActionClient {
 	/**
-	 * Create a new {@link ConnectActionClientObject} with the current
-	 * application version (see {@link Version#getCurrentVersion()}) as the
-	 * client version.
+	 * Create a new {@link ConnectActionClientObject} .
 	 * 
 	 * @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);
-	}
-
-	/**
-	 * Create a new {@link ConnectActionClientObject} with the current
-	 * application version (see {@link Version#getCurrentVersion()}) as the
-	 * client version.
-	 * 
-	 * @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
-	 * 
-	 * @throws IOException
-	 *             in case of I/O error when creating the socket
-	 */
-	public ConnectActionClientObject(String host, int port, boolean ssl)
-			throws IOException {
-		super(host, port, ssl);
+	public ConnectActionClientObject(Socket s, String key) {
+		super(s, key);
 	}
 
 	/**
@@ -53,29 +33,21 @@ 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 version
-	 *            the client version
+	 * @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
-	 */
-	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
+	 *             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(Socket s, Version version) {
-		super(s, version);
+	public ConnectActionClientObject(String host, int port, String key)
+			throws IOException {
+		super(host, port, key);
 	}
 
 	/**