JAL-976 test if the sliders have been modified from the service default (where no...
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 6 Jul 2012 17:32:04 +0000 (18:32 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 6 Jul 2012 17:34:29 +0000 (18:34 +0100)
src/jalview/gui/WsJobParameters.java
src/jalview/ws/jws2/Jws2Client.java

index b9bd873..689534c 100644 (file)
@@ -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();
index 2c8c581..cb80863 100644 (file)
@@ -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