X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws2%2Fslivka%2FSlivkaWebService.java;h=3f0f5b01dad198de5f7379b1c3f71d71a93eadbc;hb=a37132f229f72190ca1141a08dd716d303387685;hp=c2ac7b3278ea0ffc694beea7b3abfff97de353b6;hpb=5bf1c135198cafbfa48e3a641b3c8b6b7b0cc33a;p=jalview.git

diff --git a/src/jalview/ws2/slivka/SlivkaWebService.java b/src/jalview/ws2/slivka/SlivkaWebService.java
index c2ac7b3..3f0f5b0 100644
--- a/src/jalview/ws2/slivka/SlivkaWebService.java
+++ b/src/jalview/ws2/slivka/SlivkaWebService.java
@@ -47,27 +47,22 @@ public class SlivkaWebService implements WebServiceI
 
   protected int typeFlags = 0;
 
-  protected static final EnumMap<Job.Status, WsJob.JobState> stateMap = new EnumMap<>(
+  protected static final EnumMap<Job.Status, WSJobStatus> statusMap = new EnumMap<>(
           Job.Status.class);
   {
-    stateMap.put(Job.Status.PENDING, WsJob.JobState.QUEUED);
-    stateMap.put(Job.Status.REJECTED, WsJob.JobState.INVALID);
-    stateMap.put(Job.Status.ACCEPTED, WsJob.JobState.QUEUED);
-    stateMap.put(Job.Status.QUEUED, WsJob.JobState.QUEUED);
-    stateMap.put(Job.Status.RUNNING, WsJob.JobState.RUNNING);
-    stateMap.put(Job.Status.COMPLETED, WsJob.JobState.FINISHED);
-    stateMap.put(Job.Status.INTERRUPTED, WsJob.JobState.CANCELLED);
-    stateMap.put(Job.Status.DELETED, WsJob.JobState.CANCELLED);
-    stateMap.put(Job.Status.FAILED, WsJob.JobState.FAILED);
-    stateMap.put(Job.Status.ERROR, WsJob.JobState.SERVERERROR);
-    stateMap.put(Job.Status.UNKNOWN, WsJob.JobState.UNKNOWN);
+    statusMap.put(Job.Status.PENDING, WSJobStatus.SUBMITTED);
+    statusMap.put(Job.Status.REJECTED, WSJobStatus.INVALID);
+    statusMap.put(Job.Status.ACCEPTED, WSJobStatus.QUEUED);
+    statusMap.put(Job.Status.QUEUED, WSJobStatus.QUEUED);
+    statusMap.put(Job.Status.RUNNING, WSJobStatus.RUNNING);
+    statusMap.put(Job.Status.COMPLETED, WSJobStatus.FINISHED);
+    statusMap.put(Job.Status.INTERRUPTED, WSJobStatus.CANCELLED);
+    statusMap.put(Job.Status.DELETED, WSJobStatus.CANCELLED);
+    statusMap.put(Job.Status.FAILED, WSJobStatus.FAILED);
+    statusMap.put(Job.Status.ERROR, WSJobStatus.SERVER_ERROR);
+    statusMap.put(Job.Status.UNKNOWN, WSJobStatus.UNKNOWN);
   }
 
-  protected final Set<WsJob.JobState> failedStates = new HashSet<>(
-          Arrays.asList(WsJob.JobState.INVALID, WsJob.JobState.BROKEN,
-                  WsJob.JobState.FAILED, WsJob.JobState.SERVERERROR,
-                  WsJob.JobState.CANCELLED));
-
   public SlivkaWebService(SlivkaClient client, SlivkaService service)
   {
     this.client = client;
@@ -192,8 +187,8 @@ public class SlivkaWebService implements WebServiceI
   @Override
   public void updateProgress(WSJob job) throws IOException
   {
-    // TODO Auto-generated method stub
-
+    var slivkaJob = client.getJob(job.getJobId());
+    job.setStatus(statusMap.get(slivkaJob.getStatus()));
   }
 
   @Override