X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fjws2%2FJabaParamStore.java;h=0257a76d85039d8b5359b7e8725dfa9531241bb5;hb=refs%2Fheads%2Ftasks%2FJAL-3070_wsinterfaces;hp=34b8a72da3568002ae63c873e513feda56d33423;hpb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;p=jalview.git

diff --git a/src/jalview/ws/jws2/JabaParamStore.java b/src/jalview/ws/jws2/JabaParamStore.java
index 34b8a72..0257a76 100644
--- a/src/jalview/ws/jws2/JabaParamStore.java
+++ b/src/jalview/ws/jws2/JabaParamStore.java
@@ -47,7 +47,7 @@ import compbio.metadata.RunnerConfig;
 public class JabaParamStore implements ParamDatastoreI
 {
 
-  Hashtable<String, JabaWsParamSet> editedParams = new Hashtable<String, JabaWsParamSet>();
+  Hashtable<String, JabaWsParamSet> editedParams = new Hashtable<>();
 
   private Jws2Instance service;
 
@@ -84,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());
@@ -101,7 +101,7 @@ public class JabaParamStore implements ParamDatastoreI
     List<WsParamSetI> prefs = new ArrayList();
     if (servicePresets == null)
     {
-      servicePresets = new Hashtable<String, JabaPreset>();
+      servicePresets = new Hashtable<>();
       PresetManager prman;
       if ((prman = service.getPresets()) != null)
       {
@@ -148,8 +148,8 @@ public class JabaParamStore implements ParamDatastoreI
   public static List<ArgumentI> getJwsArgsfromJaba(List jabargs,
           boolean sortByOpt)
   {
-    List<ArgumentI> rgs = new ArrayList<ArgumentI>();
-    List<String> rgnames = new ArrayList<String>();
+    List<ArgumentI> rgs = new ArrayList<>();
+    List<String> rgnames = new ArrayList<>();
     for (Object rg : jabargs)
     {
       ArgumentI narg = null;
@@ -168,7 +168,8 @@ public class JabaParamStore implements ParamDatastoreI
       {
         throw new Error(MessageManager.formatMessage(
                 "error.implementation_error_cannot_handle_jaba_param",
-                new String[] { rg.getClass().toString() }));
+                new String[]
+                { rg.getClass().toString() }));
       }
       else
       {
@@ -199,13 +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() }));
+                new String[]
+                { rg.getClass().toString() }));
       }
       else
       {
@@ -224,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
@@ -243,9 +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"));
     }
   }
 
@@ -266,15 +268,15 @@ 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);
@@ -307,7 +309,7 @@ public class JabaParamStore implements ParamDatastoreI
     boolean found = false;
     for (String url : urls)
     {
-      if (service.getServiceTypeURI().equals(url)
+      if (service.getNameURI().equals(url)
               || service.getUri().equalsIgnoreCase(url))
       {
         found = true;
@@ -323,9 +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();
@@ -333,14 +334,14 @@ public class JabaParamStore implements ParamDatastoreI
     wsp.setDescription(descr);
     wsp.setApplicableUrls(urls.clone());
 
-    List<String> lines = new ArrayList<String>();
+    List<String> lines = new ArrayList<>();
     StringTokenizer st = new StringTokenizer(parameterfile, "\n");
     while (st.hasMoreTokens())
     {
       lines.add(st.nextToken());
     }
-    wsp.setjabaArguments(ParameterUtils.processParameters(lines,
-            serviceOptions, " "));
+    wsp.setjabaArguments(
+            ParameterUtils.processParameters(lines, serviceOptions, " "));
     return wsp;
   }
 
@@ -350,17 +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();