X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FJobStateSummary.java;h=cf625ad273ee37ac1ee09cf8ba96efca14b45d46;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=9d9d61a59d8011a446403a358c5523f1081f41e0;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git

diff --git a/src/jalview/ws/JobStateSummary.java b/src/jalview/ws/JobStateSummary.java
index 9d9d61a..cf625ad 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.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * Copyright (C) 2014 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,9 +119,7 @@ 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())
       {
@@ -121,14 +129,27 @@ public class JobStateSummary
         wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_STOPPED_ERROR);
       }
       // and pass on any sub-job messages to the user
-      wsInfo.setProgressText(j.jobnum, OutputHeader);
-      wsInfo.appendProgressText(j.jobnum, progheader);
+      StringBuffer output = new StringBuffer();
+      if (OutputHeader != null)
+      {
+
+        output.append(OutputHeader);
+      }
+      if (progheader != null)
+      {
+        output.append(progheader);
+      }
       if (j.hasStatus())
       {
-        // Could try to squash OOMs here, but it usually doesn't help - there probably won't be
+        // Could try to squash OOMs here, but it usually doesn't help - there
+        // probably won't be
         // enough memory to handle the results later on anyway.
         // try {
-        wsInfo.appendProgressText(j.jobnum, j.getStatus());
+        String stat = j.getStatus();
+        if (stat != null)
+        {
+          output.append(stat);
+        }
         // } catch (OutOfMemoryError e)
         // {
         // System.err.println("Out of memory when displaying status. Squashing error.");
@@ -136,6 +157,7 @@ public class JobStateSummary
         // "..\n(Out of memory when displaying status)\n");
         // }
       }
+      wsInfo.setProgressText(j.jobnum, output.toString());
     }
     else
     {