Merge branch 'tasks/JAL-3070_wsinterfaces' into alpha/JAL-3362_Jalview_212_alpha

[jalview.git] / test / jalview / ws / gui / Jws2ParamView.java

diff --git a/test/jalview/ws/gui/Jws2ParamView.java b/test/jalview/ws/gui/Jws2ParamView.java
index 134fbd1..428f263 100644 (file)
--- a/test/jalview/ws/gui/Jws2ParamView.java
+++ b/test/jalview/ws/gui/Jws2ParamView.java
@@ -28,6 +28,7 @@ import jalview.ws.jabaws.JalviewJabawsTestUtils;
 import jalview.ws.jws2.JabaPreset;
 import jalview.ws.jws2.Jws2Discoverer;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.params.ArgumentI;
 import jalview.ws.params.ParamDatastoreI;
 
 import java.awt.BorderLayout;
@@ -43,7 +44,6 @@ import javax.swing.JPanel;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import compbio.metadata.Argument;
 import compbio.metadata.Preset;
 import compbio.metadata.PresetManager;
 
@@ -93,7 +93,7 @@ public class Jws2ParamView
     for (Jws2Instance service : disc.getServices())
     {
       if (serviceTests.size() == 0
-              || serviceTests.contains(service.serviceType.toLowerCase()))
+              || serviceTests.contains(service.getName().toLowerCase()))
       {
         List<Preset> prl = null;
         Preset pr = null;
@@ -131,7 +131,7 @@ public class Jws2ParamView
           }
           WsJobParameters pgui = new WsJobParameters((ParamDatastoreI) null,
                   service, new JabaPreset(service, pr),
-                  (List<Argument>) null);
+                  (List<ArgumentI>) null);
           JFrame jf = new JFrame(MessageManager
                   .formatMessage("label.ws_parameters_for", new String[]
                   { service.getActionText() }));