Merge branch 'master' into subtree

[nikiroo-utils.git] / library / RemoteLibrary.java

diff --git a/library/RemoteLibrary.java b/library/RemoteLibrary.java
index 3a60e02c9ed6fc845193574f897c3bd9b0ecc60a..3e0e192d1806abb2e7d4bd270f0e808821c20991 100644 (file)
--- a/library/RemoteLibrary.java
+++ b/library/RemoteLibrary.java
@@ -446,7 +446,7 @@ public class RemoteLibrary extends BasicLibrary {
         * @throws SSLException
         *             when the key was not accepted
         */
-       public void exit() throws IOException, SSLException {
+       public void stop() throws IOException, SSLException {
                connectRemoteAction(new RemoteAction() {
                        @Override
                        public void action(ConnectActionClientObject action)
@@ -485,7 +485,7 @@ public class RemoteLibrary extends BasicLibrary {
        // The following methods are only used by Save and Delete in BasicLibrary:
 
        @Override
-       protected int getNextId() {
+       protected String getNextId() {
                throw new java.lang.InternalError("Should not have been called");
        }