abstracted GUI to use jalview.ws.params objects (JAL-591, JAL-633). User defined...

[jalview.git] / src / jalview / ws / jws2 / MsaWSThread.java

diff --git a/src/jalview/ws/jws2/MsaWSThread.java b/src/jalview/ws/jws2/MsaWSThread.java
index 686f516..dabe368 100644 (file)
--- a/src/jalview/ws/jws2/MsaWSThread.java
+++ b/src/jalview/ws/jws2/MsaWSThread.java
@@ -456,9 +456,11 @@ class MsaWSThread extends AWS2Thread implements WSClientI
           {
             boolean cancelledJob = server
                     .cancelJob(jobs[job].getJobId());
-            if (cancelledJob)
+            if (cancelledJob || true)
             {
               // CANCELLED_JOB
+              // if the Jaba server indicates the job can't be cancelled, its because its running on the server's local execution engine
+              // so we just close the window anyway.
               cancelledMessage = "Job cancelled.";
               ((MsaWSJob) jobs[job]).cancel(); // TODO: refactor to avoid this ugliness - 
               wsInfo.setStatus(jobs[job].getJobnum(),