Jalview 2.6 source licence

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

diff --git a/src/jalview/ws/JobStateSummary.java b/src/jalview/ws/JobStateSummary.java
index 0983dc0..9d9d61a 100644 (file)
--- a/src/jalview/ws/JobStateSummary.java
+++ b/src/jalview/ws/JobStateSummary.java
@@ -1,3 +1,20 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * 
+ * 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.
+ * 
+ * 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/>.
+ */
 package jalview.ws;
 
 import jalview.gui.WebserviceInfo;
@@ -54,8 +71,8 @@ public class JobStateSummary
    * @param OutputHeader
    * @param j
    */
-  public void updateJobPanelState(WebserviceInfo wsInfo, String OutputHeader,
-          AWsJob j)
+  public void updateJobPanelState(WebserviceInfo wsInfo,
+          String OutputHeader, AWsJob j)
   {
     if (j.submitted)
     {
@@ -108,7 +125,16 @@ public class JobStateSummary
       wsInfo.appendProgressText(j.jobnum, 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());
+        // } catch (OutOfMemoryError e)
+        // {
+        // System.err.println("Out of memory when displaying status. Squashing error.");
+        // wsInfo.appendProgressText(j.jobnum,
+        // "..\n(Out of memory when displaying status)\n");
+        // }
       }
     }
     else