From: jprocter <Jim Procter>
Date: Fri, 3 Sep 2010 08:19:39 +0000 (+0000)
Subject: distinguish between userdefined parameter set job and preset job
X-Git-Tag: Release_2_6~71
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b26ca522d2067ef5a4078c99458e7aeb4b44a268;p=jalview.git

distinguish between userdefined parameter set job and preset job
---

diff --git a/src/jalview/ws/jws2/MsaWSClient.java b/src/jalview/ws/jws2/MsaWSClient.java
index 1d9a89c..820dfb4 100644
--- a/src/jalview/ws/jws2/MsaWSClient.java
+++ b/src/jalview/ws/jws2/MsaWSClient.java
@@ -117,8 +117,12 @@ public class MsaWSClient extends Jws2Client
       {
         return;
       }
-      preset = null;
-      paramset = jobParams.getJobParams();
+      if ((this.preset = jobParams.getPreset())==null)
+      {
+        paramset = jobParams.getJobParams();
+      } else {
+        paramset = null; // no user supplied parameters.
+      }
     }
 
     if ((wsInfo = setWebService(sh, false)) == null)