X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJws2Client.java;h=7d661a45254c466e92798695de11a2ad8b7852ac;hb=ff6e13326784845c9de552a7acd4b8dcd9a68952;hp=60e25b08421b0e8158829953af56b7dd20fefe6a;hpb=499fbdac5e7260dcfd51456e0b7eb1dd7ff613b5;p=jalview.git diff --git a/src/jalview/ws/jws2/Jws2Client.java b/src/jalview/ws/jws2/Jws2Client.java index 60e25b0..7d661a4 100644 --- a/src/jalview/ws/jws2/Jws2Client.java +++ b/src/jalview/ws/jws2/Jws2Client.java @@ -31,6 +31,7 @@ import jalview.util.MessageManager; import jalview.ws.jws2.dm.AAConSettings; import jalview.ws.jws2.dm.JabaWsParamSet; import jalview.ws.jws2.jabaws2.Jws2Instance; +import jalview.ws.params.ParamDatastoreI; import jalview.ws.params.WsParamSetI; import jalview.ws.uimodel.AlignAnalysisUIText; @@ -108,8 +109,12 @@ public abstract class Jws2Client extends jalview.ws.WSClient } WsJobParameters jobParams = (preset == null && paramset != null && paramset.size() > 0) - ? new WsJobParameters(sh, null, paramset) - : new WsJobParameters(sh, preset); + ? new WsJobParameters((ParamDatastoreI) null, sh, + (WsParamSetI) null, + paramset) + : new WsJobParameters((ParamDatastoreI) null, sh, + preset, + (List) null); if (adjustingExisting) { jobParams.setName(MessageManager @@ -117,8 +122,9 @@ public abstract class Jws2Client extends jalview.ws.WSClient } if (!jobParams.showRunDialog()) { - return false; + return false; // dialog cancelled } + WsParamSetI prset = jobParams.getPreset(); if (prset == null) {