JAL-3070 discoverers return ServiceWithParameter, now containing logic and call code...
[jalview.git] / test / jalview / ws / jabaws / DisorderAnnotExportImport.java
index de72020..025c913 100644 (file)
@@ -32,9 +32,9 @@ import jalview.io.DataSourceType;
 import jalview.io.FileFormat;
 import jalview.io.FormatAdapter;
 import jalview.io.StockholmFileTest;
-import jalview.ws.jws2.SeqAnnotationServiceCalcWorker;
+import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.jws2.Jws2Discoverer;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.jws2.SeqAnnotationServiceCalcWorker;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,7 +63,7 @@ public class DisorderAnnotExportImport
 
   public static Jws2Discoverer disc;
 
-  public static List<Jws2Instance> iupreds;
+  public static List<ServiceWithParameters> iupreds;
 
   jalview.ws.jws2.SeqAnnotationServiceCalcWorker disorderClient;
 
@@ -83,7 +83,7 @@ public class DisorderAnnotExportImport
     }
 
     iupreds = new ArrayList<>();
-    for (Jws2Instance svc : disc.getServices())
+    for (ServiceWithParameters svc : disc.getServices())
     {
       if (svc.getNameURI().toLowerCase().contains("iupredws"))
       {