From 1a4b77f5614636b009e9a4cf2924ad00f4e8cb79 Mon Sep 17 00:00:00 2001 From: jprocter Date: Thu, 14 Jun 2012 14:59:31 +0100 Subject: [PATCH] JAL-975 JAL-1002 ensure custom parameters are actually passed to service --- src/jalview/ws/jws2/JabawsAlignCalcWorker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jalview/ws/jws2/JabawsAlignCalcWorker.java b/src/jalview/ws/jws2/JabawsAlignCalcWorker.java index d84f365..9a1557c 100644 --- a/src/jalview/ws/jws2/JabawsAlignCalcWorker.java +++ b/src/jalview/ws/jws2/JabawsAlignCalcWorker.java @@ -162,7 +162,7 @@ public abstract class JabawsAlignCalcWorker extends AlignCalcWorker guiProgress.setProgressBar("JABA " + getServiceActionText(), progressId = System.currentTimeMillis()); } - if (preset == null) + if (preset == null && arguments==null) { rslt = aaservice.analize(seqs); } @@ -300,7 +300,7 @@ public abstract class JabawsAlignCalcWorker extends AlignCalcWorker if (ap != null) { calcMan.workerComplete(this); - if (guiProgress != null) + if (guiProgress != null && progressId!=-1) { guiProgress.setProgressBar("", progressId); } -- 1.7.10.2