X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fparams%2Fsimple%2FLogarithmicParameter.java;h=af8018125757ee7f8e07053cc3614457eac5b03c;hb=c41398473f1493a06f28da53be50630a0f6e6f6d;hp=4944d6b8728ecbb407b5d48f0306e59cd5241aaa;hpb=d59d262069ac37d288e72f6caba4a45e1a3ebb07;p=jalview.git diff --git a/src/jalview/ws/params/simple/LogarithmicParameter.java b/src/jalview/ws/params/simple/LogarithmicParameter.java index 4944d6b..af80181 100644 --- 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; - } }