X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fws%2FJobStateSummary.java;h=478472b85fb182e125a6c395b5d70a3d169d8bb9;hb=ab58313e7bb31264ddb2715a1c548cdc789d7fa6;hp=b41519ea606723188fa137b935c4efe246fb8740;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/jalview/ws/JobStateSummary.java b/src/jalview/ws/JobStateSummary.java
index b41519e..478472b 100644
--- a/src/jalview/ws/JobStateSummary.java
+++ b/src/jalview/ws/JobStateSummary.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * 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;
@@ -24,6 +26,9 @@ import jalview.gui.WebserviceInfo;
* bookkeeper class for the WebServiceInfo GUI, maintaining records of web
* service jobs handled by the window and reflecting any status updates.
*
+ * TODO: separate from the GUI cleanly since it also holds logic for
+ * interpreting failure states
+ *
* @author JimP
*
*/
@@ -77,11 +82,11 @@ public class JobStateSummary
{
if (j.cancelled)
{
- cancelled++;
- j.subjobComplete=true;
- wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_CANCELLED_OK);
- return;
- }
+ cancelled++;
+ j.subjobComplete = true;
+ wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_CANCELLED_OK);
+ return;
+ }
if (j.submitted)
{
String progheader = "";
@@ -117,7 +122,8 @@ 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())
{
@@ -150,7 +156,8 @@ public class JobStateSummary
}
// } catch (OutOfMemoryError e)
// {
- // System.err.println("Out of memory when displaying status. Squashing error.");
+ // System.err.println("Out of memory when displaying status. Squashing
+ // error.");
// wsInfo.appendProgressText(j.jobnum,
// "..\n(Out of memory when displaying status)\n");
// }