git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3680 merged description of individual cursor key actions
[jalview.git]
/
src
/
jalview
/
ws
/
JobStateSummary.java
diff --git
a/src/jalview/ws/JobStateSummary.java
b/src/jalview/ws/JobStateSummary.java
index
34d99b6
..
6b86775
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.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.
*
*
* This file is part of Jalview.
*
@@
-79,11
+79,11
@@
public class JobStateSummary
{
if (j.cancelled)
{
{
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 = "";
if (j.submitted)
{
String progheader = "";
@@
-119,7
+119,8
@@
public class JobStateSummary
{
serror++;
j.subjobComplete = true;
{
serror++;
j.subjobComplete = true;
- wsInfo.setStatus(j.jobnum, WebserviceInfo.STATE_STOPPED_SERVERERROR);
+ wsInfo.setStatus(j.jobnum,
+ WebserviceInfo.STATE_STOPPED_SERVERERROR);
}
else if (j.isBroken())
{
}
else if (j.isBroken())
{
@@
-152,7
+153,8
@@
public class JobStateSummary
}
// } catch (OutOfMemoryError e)
// {
}
// } 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");
// }
// wsInfo.appendProgressText(j.jobnum,
// "..\n(Out of memory when displaying status)\n");
// }