JAL-3878 Wire web services logic to UI elements.

[jalview.git] / src / jalview / ws2 / slivka / SlivkaWebService.java

diff --git a/src/jalview/ws2/slivka/SlivkaWebService.java b/src/jalview/ws2/slivka/SlivkaWebService.java
index c2ac7b3..3f0f5b0 100644 (file)
--- 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