JAL-3070 use ArgumentI in all public constructors, convert to service specific argume...

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

diff --git a/src/jalview/ws/jws2/MsaWSThread.java b/src/jalview/ws/jws2/MsaWSThread.java
index c4fc66b..a0cd0f4 100644 (file)
--- a/src/jalview/ws/jws2/MsaWSThread.java
+++ b/src/jalview/ws/jws2/MsaWSThread.java
@@ -38,6 +38,7 @@ import jalview.ws.AWsJob;
 import jalview.ws.JobStateSummary;
 import jalview.ws.WSClientI;
 import jalview.ws.jws2.dm.JabaWsParamSet;
+import jalview.ws.params.ArgumentI;
 import jalview.ws.params.WsParamSetI;
 
 import java.util.ArrayList;
@@ -70,7 +71,7 @@ class MsaWSThread extends AWS2Thread implements WSClientI
 
     WsParamSetI preset = null;
 
-    List<Argument> arguments = null;
+    List<ArgumentI> arguments = null;
 
     /**
      * input
@@ -385,7 +386,7 @@ class MsaWSThread extends AWS2Thread implements WSClientI
       }
       if (arguments != null && arguments.size() > 0)
       {
-        newargs.addAll(arguments);
+        newargs.addAll(JabaParamStore.getJabafromJwsArgs(arguments));
       }
       return newargs;
     }
@@ -402,7 +403,7 @@ class MsaWSThread extends AWS2Thread implements WSClientI
                 + "Preset: " + preset.getName());
         if (preset instanceof JabaWsParamSet)
         {
-          for (Argument opt : ((JabaWsParamSet) preset).getjabaArguments())
+          for (Argument opt : getJabaArguments())
           {
             jobProgress.append(
                     opt.getName() + " " + opt.getDefaultValue() + "\n");
@@ -413,7 +414,7 @@ class MsaWSThread extends AWS2Thread implements WSClientI
       {
         jobProgress.append("With custom parameters : \n");
         // merge arguments with preset's own arguments.
-        for (Argument opt : arguments)
+        for (Argument opt : getJabaArguments())
         {
           jobProgress.append(
                   opt.getName() + " " + opt.getDefaultValue() + "\n");
@@ -474,7 +475,7 @@ class MsaWSThread extends AWS2Thread implements WSClientI
    * @param seqset
    *          Alignment
    */
-  MsaWSThread(MsaWS server2, WsParamSetI preset, List<Argument> paramset,
+  MsaWSThread(MsaWS server2, WsParamSetI preset, List<ArgumentI> paramset,
           String wsUrl, WebserviceInfo wsinfo,
           jalview.gui.AlignFrame alFrame, String wsname, String title,
           AlignmentView _msa, boolean subgaps, boolean presorder,