git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges
[jalview.git]
/
src
/
jalview
/
ws
/
rest
/
RestClient.java
diff --git
a/src/jalview/ws/rest/RestClient.java
b/src/jalview/ws/rest/RestClient.java
index
2d39db5
..
0394fea
100644
(file)
--- a/
src/jalview/ws/rest/RestClient.java
+++ b/
src/jalview/ws/rest/RestClient.java
@@
-52,7
+52,6
@@
import javax.swing.event.MenuListener;
public class RestClient extends WSClient
implements WSClientI, WSMenuEntryProviderI, ApplicationSingletonI
{
public class RestClient extends WSClient
implements WSClientI, WSMenuEntryProviderI, ApplicationSingletonI
{
-
@SuppressWarnings("unused")
private RestClient()
{
@SuppressWarnings("unused")
private RestClient()
{
@@
-69,8
+68,6
@@
public static final String RSBS_SERVICES = "RSBS_SERVICES";
protected Vector<String> services = null;
protected Vector<String> services = null;
-
-
RestServiceDescription service;
public RestClient(RestServiceDescription rsd)
RestServiceDescription service;
public RestClient(RestServiceDescription rsd)
@@
-359,6
+356,7
@@
public static final String RSBS_SERVICES = "RSBS_SERVICES";
}
}
}
}
+
public AlignmentPanel recoverAlignPanelForView()
{
AlignmentPanel[] aps = Desktop
public AlignmentPanel recoverAlignPanelForView()
{
AlignmentPanel[] aps = Desktop
@@
-379,6
+377,7
@@
public static final String RSBS_SERVICES = "RSBS_SERVICES";
return true;
}
return true;
}
+
public static RestClient[] getRestClients()
{
return getInstance().getClients();
public static RestClient[] getRestClients()
{
return getInstance().getClients();
@@
-392,7
+391,7
@@
public static final String RSBS_SERVICES = "RSBS_SERVICES";
try
{
for (RestServiceDescription descr : RestServiceDescription
try
{
for (RestServiceDescription descr : RestServiceDescription
- .parseDescriptions(jalview.bin.Cache.getDefault(
+ .parseDescriptions(Cache.getDefault(
RSBS_SERVICES,
ShmrRestClient.makeShmmrRestClient().service.toString())))
{
RSBS_SERVICES,
ShmrRestClient.makeShmmrRestClient().service.toString())))
{