X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FJobStateSummary.java;h=4d3db586d49748151bb1a5dbe85074c940f6ea87;hb=e3e5f3e40517d53343859e4878c3032ae892d619;hp=3ac1f73fa580b722cc5534918011a2d64bce4d65;hpb=6b4e904280688f796d54be6e57cac7988d2f0e6a;p=jalview.git
diff --git a/src/jalview/ws/JobStateSummary.java b/src/jalview/ws/JobStateSummary.java
index 3ac1f73..4d3db58 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-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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * 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 = "";
@@ -119,12 +129,13 @@ public class JobStateSummary
wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_STOPPED_ERROR);
}
// and pass on any sub-job messages to the user
- StringBuffer output=new StringBuffer();
- if (OutputHeader!=null) {
-
+ StringBuffer output = new StringBuffer();
+ if (OutputHeader != null)
+ {
+
output.append(OutputHeader);
}
- if (progheader!=null)
+ if (progheader != null)
{
output.append(progheader);
}
@@ -134,8 +145,9 @@ public class JobStateSummary
// probably won't be
// enough memory to handle the results later on anyway.
// try {
- String stat = j.getStatus();
- if (stat!=null) {
+ String stat = j.getStatus();
+ if (stat != null)
+ {
output.append(stat);
}
// } catch (OutOfMemoryError e)
@@ -145,7 +157,7 @@ public class JobStateSummary
// "..\n(Out of memory when displaying status)\n");
// }
}
- wsInfo.setProgressText(j.jobnum,output.toString());
+ wsInfo.setProgressText(j.jobnum, output.toString());
}
else
{