X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws2%2Factions%2FAbstractPollableTask.java;fp=src%2Fjalview%2Fws2%2Factions%2FAbstractPollableTask.java;h=bf58b132e1f363d239caf75d24bb765e9adb7d8c;hb=5521e2b5b17013a7f5544835c68005cee471ddf0;hp=6ff5749046bfea2fa37bd48205a142ff1589f42a;hpb=93cf8baeea8bf6cd233ce6b673bcdcf451c0c6d6;p=jalview.git diff --git a/src/jalview/ws2/actions/AbstractPollableTask.java b/src/jalview/ws2/actions/AbstractPollableTask.java index 6ff5749..bf58b13 100644 --- a/src/jalview/ws2/actions/AbstractPollableTask.java +++ b/src/jalview/ws2/actions/AbstractPollableTask.java @@ -219,35 +219,16 @@ public abstract class AbstractPollableTask implements Task for (BaseJob job : jobs) { JobStatus status = job.getStatus(); - int jobPrecedence = ArrayUtils.indexOf(statusPrecedence, status); + int jobPrecedence = ArrayUtils.indexOf(JobStatus.statusPrecedence, status); if (precedence < jobPrecedence) precedence = jobPrecedence; } if (precedence >= 0) { - setStatus(statusPrecedence[precedence]); + setStatus(JobStatus.statusPrecedence[precedence]); } } - /** - * A precedence order of job statuses used to compute the overall task status. - */ - private static JobStatus[] statusPrecedence = { - JobStatus.INVALID, // all must be invalid for task to be invalid - JobStatus.COMPLETED, // all but invalid must be completed for task to be - // completed - JobStatus.UNKNOWN, // unknown prevents successful completion but not - // running or failure - JobStatus.READY, - JobStatus.SUBMITTED, - JobStatus.QUEUED, - JobStatus.RUNNING, - JobStatus.CANCELLED, // if any is terminated unsuccessfully, the task is - // failed - JobStatus.FAILED, - JobStatus.SERVER_ERROR - }; - @Override public void cancel() {