X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectActionClientString.java;h=3005cee56b5ab7cbe24a0f3056c6498731ab3e95;hb=d46b7b96f94e88a776bcd2dfd756549ffb300cc9;hp=35a01d8233bfa0e189f094514298134a73e0d604;hpb=8468bb79f0fc9c88fa21355509731625732eb10e;p=fanfix.git

diff --git a/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java b/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java
index 35a01d8..3005cee 100644
--- a/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java
@@ -16,9 +16,7 @@ import be.nikiroo.utils.Version;
  */
 public class ConnectActionClientString extends ConnectActionClient {
 	/**
-	 * Create a new {@link ConnectActionClientString} with the current
-	 * application version (see {@link Version#getCurrentVersion()}) as the
-	 * client version.
+	 * Create a new {@link ConnectActionClientString}.
 	 * 
 	 * @param s
 	 *            the socket to bind to
@@ -31,9 +29,22 @@ public class ConnectActionClientString extends ConnectActionClient {
 	}
 
 	/**
-	 * Create a new {@link ConnectActionClientString} with the current
-	 * application version (see {@link Version#getCurrentVersion()}) as the
-	 * client version.
+	 * Create a new {@link ConnectActionClientString}.
+	 * 
+	 * @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)
+	 * @param clientVersion
+	 *            the version of this client
+	 */
+	public ConnectActionClientString(Socket s, String key, Version clientVersion) {
+		super(s, key, clientVersion);
+	}
+
+	/**
+	 * Create a new {@link ConnectActionClientString}.
 	 * 
 	 * @param host
 	 *            the host to bind to
@@ -66,8 +77,8 @@ public class ConnectActionClientString extends ConnectActionClient {
 	 * @param key
 	 *            an optional key to encrypt all the communications (if NULL,
 	 *            everything will be sent in clear text)
-	 * @param version
-	 *            the client version
+	 * @param clientVersion
+	 *            the version of this client
 	 * 
 	 * @throws IOException
 	 *             in case of I/O error
@@ -78,23 +89,8 @@ public class ConnectActionClientString extends ConnectActionClient {
 	 *             port values, which is between 0 and 65535, inclusive
 	 */
 	public ConnectActionClientString(String host, int port, String key,
-			Version version) throws IOException {
-		super(host, port, key, version);
-	}
-
-	/**
-	 * Create a new {@link ConnectActionClientString}.
-	 * 
-	 * @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)
-	 * @param version
-	 *            the client version
-	 */
-	public ConnectActionClientString(Socket s, String key, Version version) {
-		super(s, key, version);
+			Version clientVersion) throws IOException {
+		super(host, port, key, clientVersion);
 	}
 
 	/**
@@ -111,4 +107,59 @@ public class ConnectActionClientString extends ConnectActionClient {
 	public String send(String data) throws IOException {
 		return action.sendString(data);
 	}
+
+	// Deprecated //
+
+	/**
+	 * @deprecated SSL support has been replaced by key-based encryption.
+	 *             <p>
+	 *             Please use the version with key encryption (this deprecated
+	 *             version uses an empty key when <tt>ssl</tt> is TRUE and no
+	 *             key (NULL) when <tt>ssl</tt> is FALSE).
+	 */
+	@Deprecated
+	public ConnectActionClientString(String host, int port, boolean ssl)
+			throws IOException {
+		this(host, port, ssl ? "" : null);
+	}
+
+	/**
+	 * @deprecated SSL support has been replaced by key-based encryption.
+	 *             <p>
+	 *             Please use the version with key encryption (this deprecated
+	 *             version uses an empty key when <tt>ssl</tt> is TRUE and no
+	 *             key (NULL) when <tt>ssl</tt> is FALSE).
+	 */
+	@Deprecated
+	public ConnectActionClientString(String host, int port, boolean ssl,
+			Version version) throws IOException {
+		this(host, port, ssl ? "" : null, version);
+	}
+
+	/**
+	 * @deprecated SSL support has been replaced by key-based encryption.
+	 *             <p>
+	 *             Please use the version with key encryption (this deprecated
+	 *             version uses an empty key when <tt>ssl</tt> is TRUE and no
+	 *             key (NULL) when <tt>ssl</tt> is FALSE).
+	 */
+	@SuppressWarnings("unused")
+	@Deprecated
+	public ConnectActionClientString(Socket s, boolean ssl) throws IOException {
+		this(s, ssl ? "" : null);
+	}
+
+	/**
+	 * @deprecated SSL support has been replaced by key-based encryption.
+	 *             <p>
+	 *             Please use the version with key encryption (this deprecated
+	 *             version uses an empty key when <tt>ssl</tt> is TRUE and no
+	 *             key (NULL) when <tt>ssl</tt> is FALSE).
+	 */
+	@SuppressWarnings("unused")
+	@Deprecated
+	public ConnectActionClientString(Socket s, boolean ssl, Version version)
+			throws IOException {
+		this(s, ssl ? "" : null, version);
+	}
 }
\ No newline at end of file