/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with Jalview. If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.ws.jws2;
protected List<Argument> paramset;
- public Jws2Client(AlignFrame _alignFrame,
- WsParamSetI preset, List<Argument> arguments)
+ public Jws2Client(AlignFrame _alignFrame, WsParamSetI preset,
+ List<Argument> arguments)
{
alignFrame = _alignFrame;
this.preset = preset;
{
return processParams(sh, editParams, false);
}
+
protected boolean processParams(Jws2Instance sh, boolean editParams,
boolean adjustingExisting)
{
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");
WsParamSetI prset = jobParams.getPreset();
if (prset == null)
{
- paramset = JabaParamStore.getJabafromJwsArgs(jobParams
- .getJobParams());
+ paramset = jobParams.isServiceDefaults() ? null : JabaParamStore
+ .getJabafromJwsArgs(jobParams.getJobParams());
+ this.preset = null;
}
else
{