X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJabaParamStore.java;h=5e034cd544c8b3dfdba517c135b39645e1726f24;hb=15d1b4064456f85f3ed602440b10184057460a72;hp=7c0eabd9858aef0a9485c96940fa14b29994fad2;hpb=aced09c4feeaf3406269442c14e54abeeb4cad81;p=jalview.git

diff --git a/src/jalview/ws/jws2/JabaParamStore.java b/src/jalview/ws/jws2/JabaParamStore.java
index 7c0eabd..5e034cd 100644
--- a/src/jalview/ws/jws2/JabaParamStore.java
+++ b/src/jalview/ws/jws2/JabaParamStore.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 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.
  * 
@@ -20,6 +20,16 @@
  */
 package jalview.ws.jws2;
 
+import jalview.util.MessageManager;
+import jalview.ws.jws2.dm.JabaOption;
+import jalview.ws.jws2.dm.JabaParameter;
+import jalview.ws.jws2.dm.JabaWsParamSet;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.params.ArgumentI;
+import jalview.ws.params.ParamDatastoreI;
+import jalview.ws.params.ParamManager;
+import jalview.ws.params.WsParamSetI;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,7 +37,6 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.jmol.util.ArrayUtil;
 import compbio.metadata.Argument;
 import compbio.metadata.Option;
 import compbio.metadata.Parameter;
@@ -35,16 +44,6 @@ import compbio.metadata.Preset;
 import compbio.metadata.PresetManager;
 import compbio.metadata.RunnerConfig;
 
-import jalview.util.MessageManager;
-import jalview.ws.jws2.dm.JabaOption;
-import jalview.ws.jws2.dm.JabaParameter;
-import jalview.ws.jws2.dm.JabaWsParamSet;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
-import jalview.ws.params.ArgumentI;
-import jalview.ws.params.ParamDatastoreI;
-import jalview.ws.params.ParamManager;
-import jalview.ws.params.WsParamSetI;
-
 public class JabaParamStore implements ParamDatastoreI
 {
 
@@ -85,8 +84,8 @@ public class JabaParamStore implements ParamDatastoreI
           }
           else
           {
-            System.err
-                    .println("Warning: Ignoring parameter set instance of type "
+            System.err.println(
+                    "Warning: Ignoring parameter set instance of type "
                             + paramset.getClass()
                             + " : Bound but not applicable for service at "
                             + service.getUri());
@@ -99,7 +98,7 @@ public class JabaParamStore implements ParamDatastoreI
   @Override
   public List<WsParamSetI> getPresets()
   {
-    List<WsParamSetI> prefs = new ArrayList();
+    List<WsParamSetI> prefs = new ArrayList<>();
     if (servicePresets == null)
     {
       servicePresets = new Hashtable<String, JabaPreset>();
@@ -167,7 +166,10 @@ public class JabaParamStore implements ParamDatastoreI
       }
       if (narg == null)
       {
-        throw new Error(MessageManager.formatMessage("error.implementation_error_cannot_handle_jaba_param", new String[]{rg.getClass().toString()}));
+        throw new Error(MessageManager.formatMessage(
+                "error.implementation_error_cannot_handle_jaba_param",
+                new String[]
+                { rg.getClass().toString() }));
       }
       else
       {
@@ -198,11 +200,15 @@ public class JabaParamStore implements ParamDatastoreI
     List rgs = new ArrayList();
     for (ArgumentI rg : jwsargs)
     {
-      Argument narg = (rg instanceof JabaOption) ? ((JabaOption) rg)
-              .getOption() : null;
+      Argument narg = (rg instanceof JabaOption)
+              ? ((JabaOption) rg).getOption()
+              : null;
       if (narg == null)
       {
-          throw new Error(MessageManager.formatMessage("error.implementation_error_cannot_handle_jaba_param", new String[]{rg.getClass().toString()}));
+        throw new Error(MessageManager.formatMessage(
+                "error.implementation_error_cannot_handle_jaba_param",
+                new String[]
+                { rg.getClass().toString() }));
       }
       else
       {
@@ -221,8 +227,8 @@ public class JabaParamStore implements ParamDatastoreI
   @Override
   public boolean presetExists(String name)
   {
-    return (editedParams.containsKey(name) || servicePresets
-            .containsKey(name));
+    return (editedParams.containsKey(name)
+            || servicePresets.containsKey(name));
   }
 
   @Override
@@ -240,7 +246,8 @@ public class JabaParamStore implements ParamDatastoreI
     }
     if (servicePresets.containsKey(name))
     {
-      throw new Error(MessageManager.getString("error.implementation_error_attempt_to_delete_service_preset"));
+      throw new Error(MessageManager.getString(
+              "error.implementation_error_attempt_to_delete_service_preset"));
     }
   }
 
@@ -249,8 +256,7 @@ public class JabaParamStore implements ParamDatastoreI
           List<ArgumentI> jobParams)
   {
     JabaWsParamSet jps = new JabaWsParamSet(presetName, text, jobParams);
-    jps.setApplicableUrls(new String[]
-    { service.getUri() });
+    jps.setApplicableUrls(new String[] { service.getUri() });
     editedParams.put(jps.getName(), jps);
     if (manager != null)
     {
@@ -262,17 +268,20 @@ public class JabaParamStore implements ParamDatastoreI
   public void updatePreset(String oldName, String presetName, String text,
           List<ArgumentI> jobParams)
   {
-    JabaWsParamSet jps = (JabaWsParamSet) ((oldName != null) ? getPreset(oldName)
+    JabaWsParamSet jps = (JabaWsParamSet) ((oldName != null)
+            ? getPreset(oldName)
             : getPreset(presetName));
     if (jps == null)
     {
-      throw new Error(MessageManager.formatMessage("error.implementation_error_cannot_locate_oldname_presetname", new String[]{oldName,presetName}));
+      throw new Error(MessageManager.formatMessage(
+              "error.implementation_error_cannot_locate_oldname_presetname",
+              new String[]
+              { oldName, presetName }));
     }
     jps.setName(presetName);
     jps.setDescription(text);
     jps.setArguments(jobParams);
-    jps.setApplicableUrls(new String[]
-    { service.getUri() });
+    jps.setApplicableUrls(new String[] { service.getUri() });
     if (oldName != null && !oldName.equals(jps.getName()))
     {
       editedParams.remove(oldName);
@@ -316,7 +325,8 @@ public class JabaParamStore implements ParamDatastoreI
   {
     if (!involves(urls))
     {
-      throw new IOException(MessageManager.getString("error.implementation_error_cannot_find_service_url_in_given_set"));
+      throw new IOException(MessageManager.getString(
+              "error.implementation_error_cannot_find_service_url_in_given_set"));
 
     }
     JabaWsParamSet wsp = new JabaWsParamSet();
@@ -330,8 +340,8 @@ public class JabaParamStore implements ParamDatastoreI
     {
       lines.add(st.nextToken());
     }
-    wsp.setjabaArguments(ParameterUtils.processParameters(lines,
-            serviceOptions, " "));
+    wsp.setjabaArguments(
+            ParameterUtils.processParameters(lines, serviceOptions, " "));
     return wsp;
   }
 
@@ -341,11 +351,15 @@ public class JabaParamStore implements ParamDatastoreI
   {
     if (!involves(pset.getApplicableUrls()))
     {
-      throw new IOException(MessageManager.formatMessage("error.implementation_error_cannot_find_service_url_in_given_set_param_store", new String[]{service.getUri()}));
+      throw new IOException(MessageManager.formatMessage(
+              "error.implementation_error_cannot_find_service_url_in_given_set_param_store",
+              new String[]
+              { service.getUri() }));
     }
     if (!(pset instanceof JabaWsParamSet))
     {
-      throw new Error(MessageManager.getString("error.implementation_error_jabaws_param_set_only_handled_by"));
+      throw new Error(MessageManager.getString(
+              "error.implementation_error_jabaws_param_set_only_handled_by"));
     }
 
     StringBuffer rslt = new StringBuffer();