From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Fri, 6 Jul 2012 17:32:04 +0000 (+0100)
Subject: JAL-976 test if the sliders have been modified from the service default (where no... 
X-Git-Tag: Jalview_2_9~427
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=658606a8c0c3e66da2d59262ed65040b2279882d;p=jalview.git

JAL-976 test if the sliders have been modified from the service default (where no preset is selected and no sliders changed)
---

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index b9bd873..689534c 100644
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -1071,6 +1071,10 @@ public class WsJobParameters extends JPanel implements ItemListener,
     }
   }
 
+  public boolean isServiceDefaults()
+  {
+    return (!isModified() && (lastParmSet != null && lastParmSet.equals(SVC_DEF)));
+  }
   public List<ArgumentI> getJobParams()
   {
     return opanp.getCurrentSettings();
diff --git a/src/jalview/ws/jws2/Jws2Client.java b/src/jalview/ws/jws2/Jws2Client.java
index 2c8c581..cb80863 100644
--- a/src/jalview/ws/jws2/Jws2Client.java
+++ b/src/jalview/ws/jws2/Jws2Client.java
@@ -103,7 +103,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient
       WsParamSetI prset = jobParams.getPreset();
       if (prset == null)
       {
-        paramset = JabaParamStore.getJabafromJwsArgs(jobParams
+        paramset = jobParams.isServiceDefaults() ? null : JabaParamStore.getJabafromJwsArgs(jobParams
                 .getJobParams());
       }
       else