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

diff --git a/src/jalview/ws/JobStateSummary.java b/src/jalview/ws/JobStateSummary.java
index ab3fc66..6b86775 100644
--- a/src/jalview/ws/JobStateSummary.java
+++ b/src/jalview/ws/JobStateSummary.java
@@ -1,19 +1,22 @@
 /*
- * 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-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.
+ * 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/>.
+ * 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 +77,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 = "";
@@ -109,7 +119,8 @@ public class JobStateSummary
       {
         serror++;
         j.subjobComplete = true;
-        wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_STOPPED_SERVERERROR);
+        wsInfo.setStatus(j.jobnum,
+                WebserviceInfo.STATE_STOPPED_SERVERERROR);
       }
       else if (j.isBroken())
       {
@@ -142,7 +153,8 @@ public class JobStateSummary
         }
         // } catch (OutOfMemoryError e)
         // {
-        // System.err.println("Out of memory when displaying status. Squashing error.");
+        // System.err.println("Out of memory when displaying status. Squashing
+        // error.");
         // wsInfo.appendProgressText(j.jobnum,
         // "..\n(Out of memory when displaying status)\n");
         // }