X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2Fdm%2FAAConSettings.java;h=997913e837bf801cedafe3741191e37dceb9dc73;hb=dbf124d82413368d7aba34f8e3d8e7ad25167dea;hp=708787ec2c411670594c9bbc412fdcd8d2186fed;hpb=3d0101179759ef157b088ea135423cd909512d9f;p=jalview.git

diff --git a/src/jalview/ws/jws2/dm/AAConSettings.java b/src/jalview/ws/jws2/dm/AAConSettings.java
index 708787e..997913e 100644
--- a/src/jalview/ws/jws2/dm/AAConSettings.java
+++ b/src/jalview/ws/jws2/dm/AAConSettings.java
@@ -21,6 +21,7 @@
 package jalview.ws.jws2.dm;
 
 import jalview.util.MessageManager;
+import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.jws2.JabaParamStore;
 import jalview.ws.jws2.JabaPreset;
 import jalview.ws.jws2.ParameterUtils;
@@ -42,16 +43,16 @@ import compbio.metadata.Option;
  */
 public class AAConSettings extends jalview.ws.params.AutoCalcSetting
 {
-  Jws2Instance service;
+  ServiceWithParameters service;
 
-  public AAConSettings(boolean autoUpdate, Jws2Instance service,
+  public AAConSettings(boolean autoUpdate, ServiceWithParameters service2,
           WsParamSetI preset, List<ArgumentI> jobArgset)
   {
     super(preset, jobArgset, autoUpdate);
-    this.service = service;
+    this.service = service2;
   }
 
-  public Jws2Instance getService()
+  public ServiceWithParameters getService()
   {
     return service;
   }
@@ -76,8 +77,8 @@ public class AAConSettings extends jalview.ws.params.AutoCalcSetting
         preset = pr;
         return;
       }
-      List<ArgumentI> oldargs = new ArrayList<ArgumentI>(),
-              newargs = new ArrayList<ArgumentI>();
+      List<ArgumentI> oldargs = new ArrayList<>(),
+              newargs = new ArrayList<>();
       oldargs.addAll(preset.getArguments());
       // need to compare parameters
       for (ArgumentI newparg : pr.getArguments())
@@ -112,6 +113,7 @@ public class AAConSettings extends jalview.ws.params.AutoCalcSetting
             : JabaParamStore.getJwsArgsfromJaba(jobArgset);
   }
 
+  @Override
   public String getWsParamFile()
   {
     List<Option> opts = null;
@@ -142,7 +144,7 @@ public class AAConSettings extends jalview.ws.params.AutoCalcSetting
   @Override
   public String getServiceURI()
   {
-    return service.getServiceTypeURI();
+    return service.getNameURI();
   }
 
   @Override