X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FJobStateSummary.java;h=dd68f93e1012127c39cfc08f72eadf31c86000b9;hb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;hp=ab3fc66b165909ec9b26e58a2827109a2119c32f;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git

diff --git a/src/jalview/ws/JobStateSummary.java b/src/jalview/ws/JobStateSummary.java
index ab3fc66..dd68f93 100644
--- a/src/jalview/ws/JobStateSummary.java
+++ b/src/jalview/ws/JobStateSummary.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -14,6 +14,7 @@
  * 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;
 
@@ -74,6 +75,13 @@ public class JobStateSummary
   public void updateJobPanelState(WebserviceInfo wsInfo,
           String OutputHeader, AWsJob j)
   {
+    if (j.cancelled)
+    {
+        cancelled++;
+        j.subjobComplete=true;
+        wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_CANCELLED_OK);
+        return;
+    } 
     if (j.submitted)
     {
       String progheader = "";