Merge branch 'improvement/JAL-4111_suffixed_DEVELOP_channels' into development/Releas...

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

diff --git a/src/jalview/ws/params/simple/LogarithmicParameter.java b/src/jalview/ws/params/simple/LogarithmicParameter.java
index 4944d6b..af80181 100644 (file)
--- a/src/jalview/ws/params/simple/LogarithmicParameter.java
+++ b/src/jalview/ws/params/simple/LogarithmicParameter.java
@@ -4,17 +4,18 @@ import jalview.ws.params.ParameterI;
 import jalview.ws.params.ValueConstrainI;
 
 /**
+ * A model for a numeric-valued parameter which should be displayed using a
+ * logarithmic scale
  * 
  * @author TZVanaalten
- *
  */
 public class LogarithmicParameter extends Option implements ParameterI
 {
-  Double defval;
+  final double defval;
 
-  Double min, max;
+  final double min;
 
-  Double base;
+  final double max;
 
   @Override
   public ValueConstrainI getValidValue()
@@ -31,27 +32,13 @@ public class LogarithmicParameter 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;
       }
     };
   }
@@ -61,31 +48,28 @@ public class LogarithmicParameter extends Option implements ParameterI
     super(parm);
     max = parm.max;
     min = parm.min;
-    base = parm.base;
+    defval = 0D;
   }
 
   public LogarithmicParameter(String name, String description,
-          boolean required, Double defValue, Double min, Double max,
-          Double base)
+          boolean required, Double defValue, double min, double max)
   {
     super(name, description, required, String.valueOf(defValue), null, null,
             null);
     defval = defValue;
     this.min = min;
     this.max = max;
-    this.base = base;
   }
 
   public LogarithmicParameter(String name, String description,
-          boolean required, Double defValue, Double value, Double min,
-          Double max, Double base)
+          boolean required, Double defValue, double value, double min,
+          double max)
   {
     super(name, description, required, String.valueOf(defValue),
             String.valueOf(value), null, null);
     defval = defValue;
     this.min = min;
     this.max = max;
-    this.base = base;
   }
 
   @Override
@@ -93,9 +77,4 @@ public class LogarithmicParameter extends Option implements ParameterI
   {
     return new LogarithmicParameter(this);
   }
-
-  public Double getBase()
-  {
-    return base;
-  }
 }