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

diff --git a/src/jalview/ws/jws2/dm/AAConSettings.java b/src/jalview/ws/jws2/dm/AAConSettings.java
index f226ce1..997913e 100644
--- a/src/jalview/ws/jws2/dm/AAConSettings.java
+++ b/src/jalview/ws/jws2/dm/AAConSettings.java
@@ -1,38 +1,58 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.ws.jws2.dm;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import compbio.metadata.Argument;
-import compbio.metadata.Option;
-import compbio.metadata.Preset;
-
+import jalview.util.MessageManager;
+import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.jws2.JabaParamStore;
 import jalview.ws.jws2.JabaPreset;
 import jalview.ws.jws2.ParameterUtils;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.params.ArgumentI;
-import jalview.ws.params.ParamManager;
 import jalview.ws.params.WsParamSetI;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import compbio.metadata.Argument;
+import compbio.metadata.Option;
+
 /**
  * preferences for running AACon service
  * 
  * @author jprocter TODO: refactor to a generic 'last job and service run'
  *         container ?
  */
-public class AAConSettings extends jalview.ws.params.AutoCalcSetting 
+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;
   }
@@ -57,7 +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())
@@ -74,41 +95,48 @@ public class AAConSettings extends jalview.ws.params.AutoCalcSetting
         return;
       }
       // Try even harder to migrate arguments.
-      throw new 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;
-    if (jobArgset!=null)
+    List<Option> opts = null;
+    if (jobArgset != null)
     {
       opts = JabaParamStore.getJabafromJwsArgs(jobArgset);
-    } else {
-      if (preset!=null)
+    }
+    else
+    {
+      if (preset != null)
       {
         opts = JabaParamStore.getJabafromJwsArgs(preset.getArguments());
       }
     }
-    if (opts==null  || opts.size()==0)
+    if (opts == null || opts.size() == 0)
     {
       return "";
     }
-    StringBuffer pset=new StringBuffer();
-    for (String ps:ParameterUtils.writeParameterSet(opts, " "))
+    StringBuffer pset = new StringBuffer();
+    for (String ps : ParameterUtils.writeParameterSet(opts, " "))
     {
-      pset.append(ps); pset.append("\n");
+      pset.append(ps);
+      pset.append("\n");
     }
     return pset.toString();
   }
@@ -116,8 +144,9 @@ public class AAConSettings extends jalview.ws.params.AutoCalcSetting
   @Override
   public String getServiceURI()
   {
-    return service.getServiceTypeURI();
+    return service.getNameURI();
   }
+
   @Override
   public String[] getServiceURLs()
   {