git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Main so we can use it on UI projects
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
library
/
RemoteLibrary.java
diff --git
a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index 69dc377c7ef64e29e818d9c009ddfaa14d652125..a4f00ceff53546eaf1849e526c656add37fa6d17 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/
src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@
-124,9
+124,9
@@
public class RemoteLibrary extends BasicLibrary {
@Override
public Status getStatus() {
@Override
public Status getStatus() {
- Instance.getTraceHandler().trace("Getting remote lib status...");
+ Instance.get
Instance().get
TraceHandler().trace("Getting remote lib status...");
Status status = getStatusDo();
Status status = getStatusDo();
- Instance.getTraceHandler().trace("Remote lib status: " + status);
+ Instance.get
Instance().get
TraceHandler().trace("Remote lib status: " + status);
return status;
}
return status;
}
@@
-426,7
+426,7
@@
public class RemoteLibrary extends BasicLibrary {
}
@Override
}
@Override
- public
synchronized
File getFile(final String luid, Progress pg) {
+ public File getFile(final String luid, Progress pg) {
throw new java.lang.InternalError(
"Operation not supportorted on remote Libraries");
}
throw new java.lang.InternalError(
"Operation not supportorted on remote Libraries");
}
@@
-435,9
+435,11
@@
public class RemoteLibrary extends BasicLibrary {
* Stop the server.
*
* @throws IOException
* Stop the server.
*
* @throws IOException
- * in case of I/O error (including bad key)
+ * in case of I/O errors
+ * @throws SSLException
+ * when the key was not accepted
*/
*/
- public void exit() throws IOException {
+ public void exit() throws IOException
, SSLException
{
connectRemoteAction(new RemoteAction() {
@Override
public void action(ConnectActionClientObject action)
connectRemoteAction(new RemoteAction() {
@Override
public void action(ConnectActionClientObject action)
@@
-449,7
+451,7
@@
public class RemoteLibrary extends BasicLibrary {
}
@Override
}
@Override
- public
synchronized
MetaData getInfo(String luid) throws IOException {
+ public MetaData getInfo(String luid) throws IOException {
List<MetaData> metas = getMetasList(luid, null);
if (!metas.isEmpty()) {
return metas.get(0);
List<MetaData> metas = getMetasList(luid, null);
if (!metas.isEmpty()) {
return metas.get(0);
@@
-560,7
+562,7
@@
public class RemoteLibrary extends BasicLibrary {
@Override
protected void onError(Exception e) {
if (!(e instanceof IOException)) {
@Override
protected void onError(Exception e) {
if (!(e instanceof IOException)) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
return;
}
return;
}