JAL-3070 slivka service discovery as a background thread - still need to unify Jabaws...

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 5a5df3b..e66b8d1 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -102,9 +102,9 @@ import jalview.viewmodel.AlignmentViewport;
 import jalview.viewmodel.ViewportRanges;
 import jalview.ws.DBRefFetcher;
 import jalview.ws.DBRefFetcher.FetchFinishedListenerI;
+import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.jws1.Discoverer;
 import jalview.ws.jws2.Jws2Discoverer;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.params.ArgumentI;
 import jalview.ws.params.ParamDatastoreI;
 import jalview.ws.params.WsParamSetI;
@@ -4422,7 +4422,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
                     if (jws2servs.hasServices())
                     {
                       jws2servs.attachWSMenuEntry(webService, me);
-                      for (Jws2Instance sv : jws2servs.getServices())
+                      for (ServiceWithParameters sv : jws2servs.getServices())
                       {
                         if (sv.getName().toLowerCase().contains("jpred"))
                         {
@@ -4450,8 +4450,22 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
                 // JMenuItems for slivka-based services
 
                 SlivkaWSDiscoverer slivkaDiscoverer = SlivkaWSDiscoverer.getInstance();
+                if (slivkaDiscoverer.hasServices())
+                {
                 slivkaDiscoverer.attachWSMenuEntry(webService, me);
+                } else {
+                  if (slivkaDiscoverer.isRunning())
+                  {
+                    {
+                      JMenuItem tm = new JMenuItem(
+                              "Still discovering Slivka Services");
+                      tm.setEnabled(false);
+                      webService.add(tm);
+                    }
 
+                  }
+                }
+              
 
                 build_fetchdbmenu(webService);
                 for (JMenu item : wsmenu)