X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectAction.java;fp=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2FConnectAction.java;h=8f57c628fb18e861c9805174468f5ccb0ce0fba1;hp=dfc1a2bb422138ea8acbf930a831d0c6d7a7a0da;hb=79ce1a4973eba079ba819ba841d906de42f38e40;hpb=d463d2663337bb11aaeab48a06d2b3091c3b7830

diff --git a/src/be/nikiroo/utils/serial/ConnectAction.java b/src/be/nikiroo/utils/serial/server/ConnectAction.java
similarity index 95%
rename from src/be/nikiroo/utils/serial/ConnectAction.java
rename to src/be/nikiroo/utils/serial/server/ConnectAction.java
index dfc1a2b..8f57c62 100644
--- a/src/be/nikiroo/utils/serial/ConnectAction.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectAction.java
@@ -1,4 +1,4 @@
-package be.nikiroo.utils.serial;
+package be.nikiroo.utils.serial.server;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -7,6 +7,8 @@ import java.io.OutputStreamWriter;
 import java.net.Socket;
 
 import be.nikiroo.utils.Version;
+import be.nikiroo.utils.serial.Exporter;
+import be.nikiroo.utils.serial.Importer;
 
 /**
  * Base class used for the client/server basic handling.
@@ -154,7 +156,7 @@ abstract class ConnectAction {
 	 * @throws ClassNotFoundException
 	 *             if a class described in the serialised data cannot be found
 	 */
-	protected Object send(Object data) throws IOException,
+	protected Object sendObject(Object data) throws IOException,
 			NoSuchFieldException, NoSuchMethodException, ClassNotFoundException {
 		synchronized (lock) {
 			String rep = sendString(new Exporter().append(data).toString(true));
@@ -190,10 +192,10 @@ abstract class ConnectAction {
 	 * @throws java.lang.NullPointerException
 	 *             if the counter part has no data to send
 	 */
-	protected Object rec() throws IOException, NoSuchFieldException,
+	protected Object recObject() throws IOException, NoSuchFieldException,
 			NoSuchMethodException, ClassNotFoundException,
 			java.lang.NullPointerException {
-		String str = flushString();
+		String str = recString();
 		if (str == null) {
 			throw new NullPointerException("No more data available");
 		}
@@ -225,7 +227,7 @@ abstract class ConnectAction {
 			}
 
 			contentToSend = true;
-			return flushString();
+			return recString();
 		}
 	}
 
@@ -243,7 +245,7 @@ abstract class ConnectAction {
 	 * @throws IOException
 	 *             in case of I/O error
 	 */
-	protected String flushString() throws IOException {
+	protected String recString() throws IOException {
 		synchronized (lock) {
 			if (server || contentToSend) {
 				if (contentToSend) {