Update nikiroo-utils, remove Instance.syserr/trace

[nikiroo-utils.git] / src / be / nikiroo / fanfix / library / RemoteLibraryServer.java

diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 5bbe4cdd1f33b77bb67e609b91b7770aa886a35e..583629382662294b9e6fb7e1279cd6001c35dc02 100644 (file)
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -8,8 +8,8 @@ import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.Version;
-import be.nikiroo.utils.serial.ConnectActionServer;
-import be.nikiroo.utils.serial.Server;
+import be.nikiroo.utils.serial.server.ConnectActionServerObject;
+import be.nikiroo.utils.serial.server.ServerObject;
 
 /**
  * Create a new remote server that will listen for order on the given port.
@@ -32,7 +32,7 @@ import be.nikiroo.utils.serial.Server;
  * 
  * @author niki
  */
-public class RemoteLibraryServer extends Server {
+public class RemoteLibraryServer extends ServerObject {
        private final String key;
 
        /**
@@ -53,9 +53,8 @@ public class RemoteLibraryServer extends Server {
        }
 
        @Override
-       protected Object onRequest(ConnectActionServer action,
+       protected Object onRequest(ConnectActionServerObject action,
                        Version clientVersion, Object data) throws Exception {
-
                String key = "";
                String command = "";
                Object[] args = new Object[0];
@@ -64,7 +63,7 @@ public class RemoteLibraryServer extends Server {
                        if (dataArray.length >= 2) {
                                args = new Object[dataArray.length - 2];
                                for (int i = 2; i < dataArray.length; i++) {
-                                       args[i] = dataArray[i];
+                                       args[i - 2] = dataArray[i];
                                }
 
                                key = "" + dataArray[0];