X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fjws2%2Fdm%2FAAConSettings.java;h=5cc8f661bcb5b212a4298157840b2e9f2aede4cd;hb=b3eead416d4a16141910b7dae1eda4eaf2272b6a;hp=285b7552312c8a15ea76387ac2adacf43e1963bb;hpb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;p=jalview.git

diff --git a/src/jalview/ws/jws2/dm/AAConSettings.java b/src/jalview/ws/jws2/dm/AAConSettings.java
index 285b755..5cc8f66 100644
--- a/src/jalview/ws/jws2/dm/AAConSettings.java
+++ b/src/jalview/ws/jws2/dm/AAConSettings.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -76,7 +76,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())
@@ -93,25 +94,25 @@ public class AAConSettings extends jalview.ws.params.AutoCalcSetting
         return;
       }
       // Try even harder to migrate arguments.
-      throw new Error(
-              MessageManager
-                      .getString("error.parameter_migration_not_implemented_yet"));
+      throw new Error(MessageManager
+              .getString("error.parameter_migration_not_implemented_yet"));
     }
   }
 
   public List<Argument> getJobArgset()
   {
-    return jobArgset == null ? null : JabaParamStore
-            .getJabafromJwsArgs(jobArgset);
+    return jobArgset == null ? null
+            : JabaParamStore.getJabafromJwsArgs(jobArgset);
   }
 
   public void setJobArgset(List<Argument> jobArgset)
   {
     // TODO: test if parameters valid for service
-    this.jobArgset = jobArgset == null ? null : JabaParamStore
-            .getJwsArgsfromJaba(jobArgset);
+    this.jobArgset = jobArgset == null ? null
+            : JabaParamStore.getJwsArgsfromJaba(jobArgset);
   }
 
+  @Override
   public String getWsParamFile()
   {
     List<Option> opts = null;
@@ -142,7 +143,7 @@ public class AAConSettings extends jalview.ws.params.AutoCalcSetting
   @Override
   public String getServiceURI()
   {
-    return service.getServiceTypeURI();
+    return service.getNameURI();
   }
 
   @Override