From b26ca522d2067ef5a4078c99458e7aeb4b44a268 Mon Sep 17 00:00:00 2001
From: jprocter <Jim Procter>
Date: Fri, 3 Sep 2010 08:19:39 +0000
Subject: [PATCH] distinguish between userdefined parameter set job and preset
 job

---
 src/jalview/ws/jws2/MsaWSClient.java |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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)
-- 
1.7.10.2