Merge remote-tracking branch 'origin/merge/Jalview-JS/develop_feature/JAL-3690_callba...

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

diff --git a/src/jalview/ws/jws2/JabaWsParamTest.java b/src/jalview/ws/jws2/JabaWsParamTest.java
index 8c57529..bef7e29 100644 (file)
--- a/src/jalview/ws/jws2/JabaWsParamTest.java
+++ b/src/jalview/ws/jws2/JabaWsParamTest.java
@@ -2,6 +2,7 @@ package jalview.ws.jws2;
 
 import jalview.gui.WsJobParameters;
 import jalview.util.MessageManager;
+import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
 
 import java.awt.BorderLayout;
@@ -30,13 +31,13 @@ public class JabaWsParamTest
   public static void main(String[] args)
   {
     jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
-            .getDiscoverer();
+            .getInstance();
     int p = 0;
     if (args.length > 0)
     {
       Vector<String> services = new Vector<>();
       services.addElement(args[p++]);
-      Jws2Discoverer.getDiscoverer().setServiceUrls(services);
+      Jws2Discoverer.getInstance().setServiceUrls(services);
     }
     try
     {
@@ -48,9 +49,10 @@ public class JabaWsParamTest
       return;
     }
     Jws2Instance lastserv = null;
-    for (Jws2Instance service : disc.getServices())
+    for (ServiceWithParameters service : disc.getServices())
     {
-      lastserv = service;
+      // this will fail for non-JABAWS services !
+      lastserv = (Jws2Instance) service;
       if (p >= args.length || service.getName().equalsIgnoreCase(args[p]))
       {
         if (lastserv != null)