From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Tue, 19 Jun 2012 16:33:18 +0000 (+0100)
Subject: JAL-976 JAL-975 JAL-1119 - pass on any existing parameters to initialise the service... 
X-Git-Tag: Jalview_2_9~446
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=54b98888f691a29c2bdeedcfc120036e921e73d6;p=jalview.git

JAL-976 JAL-975 JAL-1119 - pass on any existing parameters to initialise the service parameters dialog box
---

diff --git a/src/jalview/ws/jws2/Jws2Client.java b/src/jalview/ws/jws2/Jws2Client.java
index e6b4cf5..2c8c581 100644
--- a/src/jalview/ws/jws2/Jws2Client.java
+++ b/src/jalview/ws/jws2/Jws2Client.java
@@ -89,7 +89,9 @@ public abstract class Jws2Client extends jalview.ws.WSClient
         sh.paramStore = new JabaParamStore(sh,
                 Desktop.getUserParameterStore());
       }
-      WsJobParameters jobParams = new WsJobParameters(sh, preset);
+      WsJobParameters jobParams = (preset==null && paramset!=null && paramset.size()>0) 
+              ?  new WsJobParameters(null, sh, null, paramset) 
+        : new WsJobParameters(sh, preset);
       if (adjustingExisting)
       {
         jobParams.setName("Adjusting parameters for existing Calculation");