X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsJobParameters.java;h=b70b9854acea2647dfdc643326792796ba79189b;hb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;hp=2529de9136202a0897360fb15a576424612ee5b0;hpb=127ce9ebd4add01b194a86fcf8446edea4ec3706;p=jalview.git

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index 2529de9..b70b985 100644
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -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;