JAL-6386 update slivka client for j2s compatibility

[jalview.git] / src / jalview / ws / slivkaws / SlivkaWSInstance.java

diff --git a/src/jalview/ws/slivkaws/SlivkaWSInstance.java b/src/jalview/ws/slivkaws/SlivkaWSInstance.java
index f86725b..a21354e 100644 (file)
--- 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);
@@ -89,6 +93,8 @@ public abstract class SlivkaWSInstance extends ServiceWithParameters
     {
       for (ArgumentI arg : args)
       {
+        // multiple choice field names are name$number to avoid duplications
+        // the number is stripped here
         String fieldName = arg.getName().split("\\$", 2)[0];
         FormField field = form.getField(fieldName);
         if (field.getType() == FieldType.BOOLEAN)
@@ -100,7 +106,7 @@ public abstract class SlivkaWSInstance extends ServiceWithParameters
         }
         else
         {
-          form.insert(fieldName, field.valueOf(arg.getValue()));
+          form.insert(fieldName, arg.getValue());
         }
       }
     }