JAL-633, JAL-591 - refactored ArgumentI.getValue from jabaws .getDefaultValue

[jalview.git] / src / jalview / gui / WsJobParameters.java

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index 2529de9..ca5e8b1 100644 (file)
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -637,7 +637,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
             // System.out.println("Setting option "
             // + System.identityHashCode(arg) + ":" + arg.getName()
             // + " with " + arg.getDefaultValue());
-            opanp.selectOption((OptionI) arg, arg.getDefaultValue());
+            opanp.selectOption((OptionI) arg, arg.getValue());
           }
         }
 
@@ -1073,26 +1073,7 @@ public class WsJobParameters extends JPanel implements ItemListener,
 
   public List<ArgumentI> getJobParams()
   {
-    List<ArgumentI> argSet = new ArrayList<ArgumentI>();
-    // recover options and parameters from GUI
-    for (OptionBox opts : opanp.getOptSet().values())
-    {
-      OptionI opt = opts.getOptionIfEnabled();
-      if (opt != null)
-      {
-        argSet.add(opt);
-      }
-    }
-    for (ParamBox parambox : opanp.getParamSet().values())
-    {
-      ParameterI parm = parambox.getParameter();
-      if (parm != null)
-      {
-        argSet.add(parm);
-      }
-    }
-
-    return argSet;
+    return opanp.getCurrentSettings();
   }
 
   String lastParmSet = null;