Merge branch 'alpha/JAL-3362_Jalview_212_alpha' into alpha/merge_212_JalviewJS_2112

[jalview.git] / src / jalview / ws / jws2 / ParameterUtils.java

diff --git a/src/jalview/ws/jws2/ParameterUtils.java b/src/jalview/ws/jws2/ParameterUtils.java
index 8916be9..d789dda 100644 (file)
--- a/src/jalview/ws/jws2/ParameterUtils.java
+++ b/src/jalview/ws/jws2/ParameterUtils.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.
  * 
@@ -22,19 +22,22 @@ package jalview.ws.jws2;
 
 import jalview.util.MessageManager;
 
-import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
-import compbio.metadata.*;
+import compbio.metadata.Option;
+import compbio.metadata.Parameter;
+import compbio.metadata.RunnerConfig;
+import compbio.metadata.ValueConstrain;
+import compbio.metadata.WrongParameterException;
 
 public class ParameterUtils
 {
   public static List<String> writeParameterSet(List<Option> optSet,
           String pseparator)
   {
-    List<String> pset = new ArrayList<String>();
+    List<String> pset = new ArrayList<>();
     for (Option o : optSet)
     {
       pset.add(o.toCommand(pseparator));
@@ -61,7 +64,7 @@ public class ParameterUtils
   public static List<Option> processParameters(List<String> params,
           RunnerConfig options, String pseparator)
   {
-    List<Option> chosenOptions = new ArrayList<Option>();
+    List<Option> chosenOptions = new ArrayList<>();
     for (String param : params)
     {
       String oname = null;
@@ -90,12 +93,13 @@ public class ParameterUtils
       {
         try
         {
-          o.setDefaultValue(isParameter(param, pseparator) ? getParamValue(
-                  param, pseparator) : param);
+          o.setDefaultValue(isParameter(param, pseparator)
+                  ? getParamValue(param, pseparator)
+                  : param);
         } catch (WrongParameterException e)
         {
-          System.out.println("Problem setting value for the parameter: "
-                  + param);
+          System.out.println(
+                  "Problem setting value for the parameter: " + param);
           e.printStackTrace();
         }
       }
@@ -146,8 +150,7 @@ public class ParameterUtils
       }
       else
       {
-        copy.addOptionNames(names.toArray(new String[]
-        {}));
+        copy.addOptionNames(names.toArray(new String[] {}));
       }
     }
     try
@@ -183,7 +186,8 @@ public class ParameterUtils
     } catch (Exception e)
     {
       e.printStackTrace();
-      throw new Error(MessageManager.getString("error.implementation_error_couldnt_copy_value_constraint"));
+      throw new Error(MessageManager.getString(
+              "error.implementation_error_couldnt_copy_value_constraint"));
     }
   }
 
@@ -198,8 +202,7 @@ public class ParameterUtils
     List<String> pv = parameter.getPossibleValues();
     if (pv != null)
     {
-      copy.addPossibleValues(pv.toArray(new String[]
-      {}));
+      copy.addPossibleValues(pv.toArray(new String[] {}));
     }
     setOptionFrom(copy, parameter);
     return copy;