JAL-3066 JAL-3070 pull up non-jabaws specific service descriptor components for annot...

[jalview.git] / src / jalview / ws / jws2 / SeqAnnotationServiceCalcWorker.java

diff --git a/src/jalview/ws/jws2/SeqAnnotationServiceCalcWorker.java b/src/jalview/ws/jws2/SeqAnnotationServiceCalcWorker.java
index e92a338..6ecc01f 100644 (file)
--- a/src/jalview/ws/jws2/SeqAnnotationServiceCalcWorker.java
+++ b/src/jalview/ws/jws2/SeqAnnotationServiceCalcWorker.java
@@ -38,12 +38,13 @@ import jalview.schemes.ResidueProperties;
 import jalview.util.MessageManager;
 import jalview.workers.AlignCalcWorker;
 import jalview.ws.api.CancellableI;
+import jalview.ws.api.JalviewServiceEndpointProviderI;
 import jalview.ws.api.JobId;
 import jalview.ws.api.SequenceAnnotationServiceI;
+import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.api.WSAnnotationCalcManagerI;
 import jalview.ws.gui.AnnotationWsJob;
 import jalview.ws.jws2.dm.AAConSettings;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.params.ArgumentI;
 import jalview.ws.params.WsParamSetI;
 
@@ -56,7 +57,7 @@ public class SeqAnnotationServiceCalcWorker extends AlignCalcWorker
         implements WSAnnotationCalcManagerI
 {
 
-  protected Jws2Instance service;
+  protected ServiceWithParameters service;
 
   protected WsParamSetI preset;
 
@@ -157,7 +158,8 @@ public class SeqAnnotationServiceCalcWorker extends AlignCalcWorker
     super(alignViewport, alignPanel);
   }
 
-  public SeqAnnotationServiceCalcWorker(Jws2Instance service, AlignFrame alignFrame,
+  public SeqAnnotationServiceCalcWorker(ServiceWithParameters service,
+          AlignFrame alignFrame,
           WsParamSetI preset, List<ArgumentI> paramset)
   {
     this(alignFrame.getCurrentView(), alignFrame.alignPanel);
@@ -169,7 +171,7 @@ public class SeqAnnotationServiceCalcWorker extends AlignCalcWorker
     this.service = service;
     try
     {
-      annotService = (jalview.ws.api.SequenceAnnotationServiceI) service
+      annotService = (jalview.ws.api.SequenceAnnotationServiceI) ((JalviewServiceEndpointProviderI) service)
               .getEndpoint();
     } catch (ClassCastException cce)
     {