java 1.6 compat

[fanfix.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 015fb7bf33c9c2beb79a81173b1f02f180f48db9..0319439c05f012b630bbd422f900232f25a3caa7 100644 (file)
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -2,7 +2,7 @@ package be.nikiroo.fanfix.library;
 
 import java.io.IOException;
 import java.net.URL;
-import java.nio.file.AccessDeniedException;
+import java.rmi.AccessException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -142,9 +142,15 @@ public class RemoteLibraryServer extends ServerObject {
                for (Object arg : args) {
                        trace += arg + " ";
                }
-               System.out.println(trace);
-
-               Object rep = doRequest(action, command, args, rw, whitelist);
+               long now = System.currentTimeMillis();
+               System.out.println(StringUtils.fromTime(now) + ": " + trace);
+
+               Object rep = null;
+               try {
+                       rep = doRequest(action, command, args, rw, whitelist);
+               } catch (IOException e) {
+                       rep = new RemoteLibraryException(e);
+               }
 
                commands.put(id, command);
                wls.put(id, wl);
@@ -175,9 +181,12 @@ public class RemoteLibraryServer extends ServerObject {
 
                String rec = StringUtils.formatNumber(bytesReceived) + "b";
                String sent = StringUtils.formatNumber(bytesSent) + "b";
-               System.out.println(String.format("%s[>%s]: (%s sent, %s rec) in %d ms",
-                               display(whitelist, rw), commands.get(id), sent, rec,
-                               times.get(id)));
+               long now = System.currentTimeMillis();
+               System.out.println(StringUtils.fromTime(now)
+                               + ": "
+                               + String.format("%s[>%s]: (%s sent, %s rec) in %d ms",
+                                               display(whitelist, rw), commands.get(id), sent, rec,
+                                               times.get(id)));
 
                commands.remove(id);
                times.remove(id);
@@ -257,8 +266,8 @@ public class RemoteLibraryServer extends ServerObject {
                        }
                } else if ("SAVE_STORY".equals(command)) {
                        if (!rw) {
-                               throw new AccessDeniedException("" + args[0], null,
-                                               "Read-Only remote library");
+                               throw new AccessException("Read-Only remote library: " 
+                                               + args[0]);
                        }
 
                        List<Object> list = new ArrayList<Object>();
@@ -276,8 +285,8 @@ public class RemoteLibraryServer extends ServerObject {
                        return story.getMeta().getLuid();
                } else if ("IMPORT".equals(command)) {
                        if (!rw) {
-                               throw new AccessDeniedException("" + args[0], null,
-                                               "Read-Only remote library");
+                               throw new AccessException("Read-Only remote library: " 
+                                               + args[0]);
                        }
 
                        Progress pg = createPgForwarder(action);
@@ -287,8 +296,8 @@ public class RemoteLibraryServer extends ServerObject {
                        return story.getMeta().getLuid();
                } else if ("DELETE_STORY".equals(command)) {
                        if (!rw) {
-                               throw new AccessDeniedException("" + args[0], null,
-                                               "Read-Only remote library");
+                               throw new AccessException("Read-Only remote library: " 
+                                               + args[0]);
                        }
 
                        Instance.getLibrary().delete((String) args[0]);
@@ -306,8 +315,8 @@ public class RemoteLibraryServer extends ServerObject {
                        }
                } else if ("SET_COVER".equals(command)) {
                        if (!rw) {
-                               throw new AccessDeniedException("" + args[0], "" + args[1],
-                                               "Read-Only remote library");
+                               throw new AccessException("Read-Only remote library: " 
+                                               + args[0] + ", " + args[1]);
                        }
 
                        if ("SOURCE".equals(args[0])) {
@@ -319,8 +328,8 @@ public class RemoteLibraryServer extends ServerObject {
                        }
                } else if ("CHANGE_STA".equals(command)) {
                        if (!rw) {
-                               throw new AccessDeniedException("" + args[0], "" + args[1],
-                                               "Read-Only remote library");
+                               throw new AccessException("Read-Only remote library: " 
+                                               + args[0] + ", " + args[1]);
                        }
 
                        Progress pg = createPgForwarder(action);
@@ -329,8 +338,8 @@ public class RemoteLibraryServer extends ServerObject {
                        forcePgDoneSent(pg);
                } else if ("EXIT".equals(command)) {
                        if (!rw) {
-                               throw new AccessDeniedException("EXIT", "",
-                                               "Read-Only remote library, cannot close it");
+                               throw new AccessException(
+                                               "Read-Only remote library: EXIT");
                        }
 
                        stop(0, false);
@@ -342,7 +351,9 @@ public class RemoteLibraryServer extends ServerObject {
        @Override
        protected void onError(Exception e) {
                if (e instanceof SSLException) {
-                       System.out.println("[Client connection refused (bad key)]");
+                       long now = System.currentTimeMillis();
+                       System.out.println(StringUtils.fromTime(now) + ": "
+                                       + "[Client connection refused (bad key)]");
                } else {
                        getTraceHandler().error(e);
                }