Merge branch 'tasks/JAL-3070_wsinterfaces' into alpha/JAL-3362_Jalview_212_alpha

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

diff --git a/src/jalview/ws/jws2/AADisorderClient.java b/src/jalview/ws/jws2/AADisorderClient.java
index a1b8e7a..91db7c3 100644 (file)
--- a/src/jalview/ws/jws2/AADisorderClient.java
+++ b/src/jalview/ws/jws2/AADisorderClient.java
@@ -30,6 +30,7 @@ import jalview.gui.AlignFrame;
 import jalview.schemes.FeatureColour;
 import jalview.util.ColorUtils;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.params.ArgumentI;
 import jalview.ws.params.WsParamSetI;
 
 import java.awt.Color;
@@ -44,7 +45,6 @@ import compbio.data.sequence.FastaSequence;
 import compbio.data.sequence.Range;
 import compbio.data.sequence.Score;
 import compbio.data.sequence.ScoreManager.ScoreHolder;
-import compbio.metadata.Argument;
 
 public class AADisorderClient extends JabawsCalcWorker
 {
@@ -62,12 +62,12 @@ public class AADisorderClient extends JabawsCalcWorker
   AlignFrame af;
 
   public AADisorderClient(Jws2Instance sh, AlignFrame alignFrame,
-          WsParamSetI thePreset, List<Argument> paramset)
+          WsParamSetI thePreset, List<ArgumentI> paramset)
   {
     super(sh, alignFrame, thePreset, paramset);
     af = alignFrame;
-    typeName = sh.action;
-    methodName = sh.serviceType;
+    typeName = sh.getAction();
+    methodName = sh.getName();
 
     submitGaps = false;
     alignedSeqs = false;
@@ -169,9 +169,9 @@ public class AADisorderClient extends JabawsCalcWorker
     if (immediate || !calcMan.isWorking(this) && scoremanager != null)
     {
       Map<String, String[]> featureTypeMap = featureMap
-              .get(service.serviceType);
+              .get(service.getName());
       Map<String, Map<String, Object>> annotTypeMap = annotMap
-              .get(service.serviceType);
+              .get(service.getName());
       boolean dispFeatures = false;
       Map<String, Object> fc = new Hashtable<>();
       List<AlignmentAnnotation> ourAnnot = new ArrayList<>();
@@ -265,9 +265,9 @@ public class AADisorderClient extends JabawsCalcWorker
               String typename, calcName;
               AlignmentAnnotation annot = createAnnotationRowsForScores(
                       ourAnnot,
-                      typename = service.serviceType + " ("
+                      typename = service.getName() + " ("
                               + scr.getMethod() + ")",
-                      calcName = service.getServiceTypeURI() + "/"
+                      calcName = service.getNameURI() + "/"
                               + scr.getMethod(),
                       aseq, base + 1, scr);
               annot.graph = AlignmentAnnotation.LINE_GRAPH;