From: MMWarowny <mmzwarowny@dundee.ac.uk>
Date: Mon, 4 Nov 2019 16:03:06 +0000 (+0000)
Subject: Include missing job states.
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=cea9d3d3b042e8363342bdd2f4eff2db53177492;p=jalview.git

Include missing job states.
---

diff --git a/j11lib/slivka-client.jar b/j11lib/slivka-client.jar
index 47c47c8..e724731 100644
Binary files a/j11lib/slivka-client.jar and b/j11lib/slivka-client.jar differ
diff --git a/src/jalview/ws/slivkaws/SlivkaWSInstance.java b/src/jalview/ws/slivkaws/SlivkaWSInstance.java
index f86725b..8a42982 100644
--- a/src/jalview/ws/slivkaws/SlivkaWSInstance.java
+++ b/src/jalview/ws/slivkaws/SlivkaWSInstance.java
@@ -46,9 +46,13 @@ public abstract class SlivkaWSInstance extends ServiceWithParameters
   protected static final EnumMap<JobState, WsJob.JobState> stateMap = new EnumMap<>(JobState.class);
   {
     stateMap.put(JobState.PENDING, WsJob.JobState.QUEUED);
+    stateMap.put(JobState.REJECTED, WsJob.JobState.INVALID);
+    stateMap.put(JobState.ACCEPTED, WsJob.JobState.QUEUED);
     stateMap.put(JobState.QUEUED, WsJob.JobState.QUEUED);
     stateMap.put(JobState.RUNNING, WsJob.JobState.RUNNING);
     stateMap.put(JobState.COMPLETED, WsJob.JobState.FINISHED);
+    stateMap.put(JobState.INTERRUPED, WsJob.JobState.CANCELLED);
+    stateMap.put(JobState.DELETED, WsJob.JobState.CANCELLED);
     stateMap.put(JobState.FAILED, WsJob.JobState.FAILED);
     stateMap.put(JobState.ERROR, WsJob.JobState.SERVERERROR);
     stateMap.put(JobState.UNKNOWN, WsJob.JobState.UNKNOWN);