JAL-591 OptionBox FlowLayout, tweaks to wrapping of options and params

[jalview.git] / src / jalview / ws / params / simple / DoubleParameter.java

diff --git a/src/jalview/ws/params/simple/DoubleParameter.java b/src/jalview/ws/params/simple/DoubleParameter.java
index d6ccf46..6b76170 100644 (file)
--- a/src/jalview/ws/params/simple/DoubleParameter.java
+++ b/src/jalview/ws/params/simple/DoubleParameter.java
@@ -10,16 +10,17 @@ import jalview.ws.params.ValueConstrainI;
  */
 public class DoubleParameter extends Option implements ParameterI
 {
-  Double defval;
+  double defval;
 
-  Double min, max;
+  double min;
+
+  double max;
 
   @Override
   public ValueConstrainI getValidValue()
   {
     return new ValueConstrainI()
     {
-
       @Override
       public ValueType getType()
       {
@@ -29,27 +30,13 @@ public class DoubleParameter extends Option implements ParameterI
       @Override
       public Number getMin()
       {
-        if (min < max)
-        {
-          return min;
-        }
-        else
-        {
-          return null;
-        }
+        return min < max ? min : null;
       }
 
       @Override
       public Number getMax()
       {
-        if (min < max)
-        {
-          return max;
-        }
-        else
-        {
-          return null;
-        }
+        return min < max ? max : null;
       }
     };
   }
@@ -62,7 +49,7 @@ public class DoubleParameter extends Option implements ParameterI
   }
 
   public DoubleParameter(String name, String description, boolean required,
-          Double defValue, Double min, Double max)
+          Double defValue, double min, double max)
   {
     super(name, description, required, String.valueOf(defValue), null, null,
             null);
@@ -72,7 +59,7 @@ public class DoubleParameter extends Option implements ParameterI
   }
 
   public DoubleParameter(String name, String description, boolean required,
-          Double defValue, Double value, Double min, Double max)
+          Double defValue, Double value, double min, double max)
   {
     super(name, description, required, String.valueOf(defValue),
             String.valueOf(value), null, null);