ensure presets and parameters are discovered when service is discovered

[jalview.git] / src / jalview / ws / jws2 / Jws2Discoverer.java

diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java
index d39b6b1..fdbb740 100644 (file)
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -164,8 +164,10 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
             + srv.toString());
     Jws2Instance service = new Jws2Instance(jwsservers, srv.toString(), service2);
 
-    services.add(service);
-    service.getParamStore();
+    services.add(service); 
+    // retrieve the presets and parameter set and cache now
+    service.getParamStore().getPresets();
+    service.hasParameters();
   }
 
   public class Jws2Instance
@@ -280,7 +282,24 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     public String getUri()
     {
       // this is only valid for Jaba 1.0 - this formula might have to change!
-      return hosturl+"/"+serviceType;
+      return hosturl+(hosturl.lastIndexOf("/")==(hosturl.length()-1) ? "/" : "") +serviceType;
+    }
+    private boolean hasParams=false,lookedForParams=false;
+
+    public boolean hasParameters()
+    {
+      if (!lookedForParams)
+      {
+        lookedForParams=true;
+      try
+      {
+        hasParams = (getRunnerConfig().getArguments().size() > 0);
+      } catch (Exception e)
+      {
+
+      }
+      }
+      return hasParams;
     }
   };
 
@@ -388,7 +407,8 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
           atpoint.setToolTipText(service.getActionText());
         }
       }
-      if (!byhost && !hostLabels.contains(host + service.getActionText()))
+      if (!byhost && !hostLabels.contains(host + service.serviceType+service.getActionText()))
+              //!hostLabels.contains(host + (bytype ? service.serviceType+service.getActionText() : "")))
       {
         // add a marker indicating where this service is hosted
         // relies on services from the same host being listed in a contiguous
@@ -399,8 +419,10 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
         {
           atpoint.add(hitm = new JMenuItem(host));
           hitm.setForeground(Color.blue);
+          lasthost = host;
         }
-        hostLabels.addElement(lasthost=host);
+        hostLabels.addElement(host + service.serviceType+service.getActionText() );
+        // hostLabels.addElement(host + (bytype ? service.serviceType+service.getActionText() : ""));
       }
       msacl.attachWSMenuEntry(atpoint, service, alignFrame);
       /*