JAL-3066 JAL-3070 pull up non-jabaws specific service descriptor components for annot...

[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 e4ff459..2a05228 100644 (file)
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -26,6 +26,7 @@ import jalview.gui.Desktop;
 import jalview.gui.JvSwingUtils;
 import jalview.util.MessageManager;
 import jalview.ws.WSMenuEntryProviderI;
+import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.params.ParamDatastoreI;
 
@@ -439,7 +440,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
                 MessageManager.getString("label.switch_server")));
         hitm.setToolTipText(JvSwingUtils.wrapTooltip(false,
                 MessageManager.getString("label.choose_jabaws_server")));
-        for (final Jws2Instance sv : alternates.get(service.getName()))
+        for (final ServiceWithParameters sv : alternates.get(service.getName()))
         {
           JMenuItem itm;
           hitm.add(itm = new JMenuItem(sv.getHostURL()));
@@ -604,7 +605,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
                   System.out.println("Changesupport: There are now "
                           + getDiscoverer().services.size() + " services");
                   int i = 1;
-                  for (Jws2Instance instance : getDiscoverer().services)
+                  for (ServiceWithParameters instance : getDiscoverer().services)
                   {
                     System.out.println("Service " + i++ + " "
                             + instance.getClass() + "@"
@@ -1029,7 +1030,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
   }
 
   public void setPreferredServiceFor(AlignFrame af, String serviceName,
-          String serviceAction, Jws2Instance selectedServer)
+          String serviceAction, ServiceWithParameters selectedServer)
   {
     // TODO: pull out and generalise for the selectedServer's attributes
     String afid = (af == null) ? "" : af.getViewport().getSequenceSetId();
@@ -1048,7 +1049,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
   }
 
   public void setPreferredServiceFor(String serviceType,
-          String serviceAction, Jws2Instance selectedServer)
+          String serviceAction, ServiceWithParameters selectedServer)
   {
     setPreferredServiceFor(null, serviceType, serviceAction,
             selectedServer);