Include missing job states.
authorMMWarowny <mmzwarowny@dundee.ac.uk>
Mon, 4 Nov 2019 16:03:06 +0000 (16:03 +0000)
committerMMWarowny <mmzwarowny@dundee.ac.uk>
Mon, 4 Nov 2019 16:03:06 +0000 (16:03 +0000)
j11lib/slivka-client.jar
src/jalview/ws/slivkaws/SlivkaWSInstance.java

index 47c47c8..e724731 100644 (file)
Binary files a/j11lib/slivka-client.jar and b/j11lib/slivka-client.jar differ
index f86725b..8a42982 100644 (file)
@@ -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);