JAL-1239 cancelled flag should be checked and counted

diff --git a/src/jalview/ws/JobStateSummary.java b/src/jalview/ws/JobStateSummary.java
index 13c70d3..35fb0fc 100644 (file)
--- a/src/jalview/ws/JobStateSummary.java
+++ b/src/jalview/ws/JobStateSummary.java
@@ -75,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 = "";