Merge branch 'develop' into features/JAL-2446NCList

[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 fb6ffc4..c24ea05 100644 (file)
--- a/src/jalview/ws/jws2/AADisorderClient.java
+++ b/src/jalview/ws/jws2/AADisorderClient.java
@@ -20,7 +20,6 @@
  */
 package jalview.ws.jws2;
 
-import jalview.api.AlignCalcWorkerI;
 import jalview.api.FeatureColourI;
 import jalview.bin.Cache;
 import jalview.datamodel.AlignmentAnnotation;
@@ -63,9 +62,9 @@ public class AADisorderClient extends JabawsCalcWorker
   AlignFrame af;
 
   public AADisorderClient(Jws2Instance sh, AlignFrame alignFrame,
-          WsParamSetI preset, List<Argument> paramset)
+          WsParamSetI thePreset, List<Argument> paramset)
   {
-    super(sh, alignFrame, preset, paramset);
+    super(sh, alignFrame, thePreset, paramset);
     af = alignFrame;
     typeName = sh.action;
     methodName = sh.serviceType;
@@ -239,13 +238,13 @@ public class AADisorderClient extends JabawsCalcWorker
                 }
                 if (vals.hasNext())
                 {
-                  sf = new SequenceFeature(type[0], type[1], base + rn.from,
-                          base + rn.to, val = vals.next().floatValue(),
-                          methodName);
+                  val = vals.next().floatValue();
+                  sf = new SequenceFeature(type[0], type[1],
+                          base + rn.from, base + rn.to, val, methodName);
                 }
                 else
                 {
-                  sf = new SequenceFeature(type[0], type[1], null,
+                  sf = new SequenceFeature(type[0], type[1],
                           base + rn.from, base + rn.to, methodName);
                 }
                 dseq.addSequenceFeature(sf);