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
JAL-3515 Extract core WSDiscoverer methods to a separate interface
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
e66b8d1
..
9647e0f
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-102,6
+102,7
@@
import jalview.viewmodel.AlignmentViewport;
import jalview.viewmodel.ViewportRanges;
import jalview.ws.DBRefFetcher;
import jalview.ws.DBRefFetcher.FetchFinishedListenerI;
import jalview.viewmodel.ViewportRanges;
import jalview.ws.DBRefFetcher;
import jalview.ws.DBRefFetcher.FetchFinishedListenerI;
+import jalview.ws.WSDiscovererI;
import jalview.ws.api.ServiceWithParameters;
import jalview.ws.jws1.Discoverer;
import jalview.ws.jws2.Jws2Discoverer;
import jalview.ws.api.ServiceWithParameters;
import jalview.ws.jws1.Discoverer;
import jalview.ws.jws2.Jws2Discoverer;
@@
-4414,9
+4415,10
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
// TODO: move into separate menu builder class.
boolean new_sspred = false;
}
// TODO: move into separate menu builder class.
boolean new_sspred = false;
+
if (Cache.getDefault("SHOW_JWS2_SERVICES", true))
{
if (Cache.getDefault("SHOW_JWS2_SERVICES", true))
{
- Jws2Discoverer jws2servs = Jws2Discoverer.getDiscoverer();
+ WSDiscovererI jws2servs = Jws2Discoverer.getDiscoverer();
if (jws2servs != null)
{
if (jws2servs.hasServices())
if (jws2servs != null)
{
if (jws2servs.hasServices())
@@
-4443,30
+4445,28
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
}
}
}
}
}
- build_urlServiceMenu(me.webService);
-
-
- // TODO Mateusz - follow pattern for adding web service
- // JMenuItems for slivka-based services
- SlivkaWSDiscoverer slivkaDiscoverer = SlivkaWSDiscoverer.getInstance();
- if (slivkaDiscoverer.hasServices())
+ if (Cache.getDefault("SHOW_SLIVKA_SERVICES", true))
{
{
- slivkaDiscoverer.attachWSMenuEntry(webService, me);
- } else {
- if (slivkaDiscoverer.isRunning())
+ WSDiscovererI discoverer = SlivkaWSDiscoverer
+ .getInstance();
+ if (discoverer != null)
{
{
+ if (discoverer.hasServices())
+ {
+ discoverer.attachWSMenuEntry(webService, me);
+ }
+ if (discoverer.isRunning())
{
JMenuItem tm = new JMenuItem(
"Still discovering Slivka Services");
tm.setEnabled(false);
webService.add(tm);
}
{
JMenuItem tm = new JMenuItem(
"Still discovering Slivka Services");
tm.setEnabled(false);
webService.add(tm);
}
-
}
}
}
}
-
+ build_urlServiceMenu(me.webService);
build_fetchdbmenu(webService);
for (JMenu item : wsmenu)
{
build_fetchdbmenu(webService);
for (JMenu item : wsmenu)
{