apply version 2.7 copyright

[jalview.git] / src / jalview / ws / JobStateSummary.java

diff --git a/src/jalview/ws/JobStateSummary.java b/src/jalview/ws/JobStateSummary.java
index 62f172d..c117e4b 100644 (file)
--- 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.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -119,15 +119,25 @@ 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
         // 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.");
@@ -135,6 +145,7 @@ public class JobStateSummary
         // "..\n(Out of memory when displaying status)\n");
         // }
       }
+      wsInfo.setProgressText(j.jobnum,output.toString());
     }
     else
     {