git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3005 new argument type FileParameter for file chooser
[jalview.git]
/
src
/
jalview
/
ws
/
params
/
simple
/
IntegerParameter.java
diff --git
a/src/jalview/ws/params/simple/IntegerParameter.java
b/src/jalview/ws/params/simple/IntegerParameter.java
index
88cb488
..
b3a01b2
100644
(file)
--- a/
src/jalview/ws/params/simple/IntegerParameter.java
+++ b/
src/jalview/ws/params/simple/IntegerParameter.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 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.
*
*
* This file is part of Jalview.
*
@@
-31,8
+31,11
@@
public class IntegerParameter extends Option implements ParameterI
{
int defval;
{
int defval;
- int min, max;
+ int min;
+ int max;
+
+ @Override
public ValueConstrainI getValidValue()
{
return new ValueConstrainI()
public ValueConstrainI getValidValue()
{
return new ValueConstrainI()
@@
-47,27
+50,13
@@
public class IntegerParameter extends Option implements ParameterI
@Override
public Number getMin()
{
@Override
public Number getMin()
{
- if (min < max)
- {
- return min;
- }
- else
- {
- return null;
- }
+ return min < max ? min : null;
}
@Override
public Number getMax()
{
}
@Override
public Number getMax()
{
- if (min < max)
- {
- return max;
- }
- else
- {
- return null;
- }
+ return min < max ? max : null;
}
};
}
}
};
}
@@
-79,21
+68,21
@@
public class IntegerParameter extends Option implements ParameterI
min = parm.min;
}
min = parm.min;
}
- public IntegerParameter(String name, String description,
- boolean required, int defValue, int min, int max)
+ public IntegerParameter(String name, String description, boolean required,
+ int defValue, int min, int max)
{
{
- super(name, description, required, String.valueOf(defValue), null,
- null, null);
+ super(name, description, required, String.valueOf(defValue), null, null,
+ null);
defval = defValue;
this.min = min;
this.max = max;
}
defval = defValue;
this.min = min;
this.max = max;
}
- public IntegerParameter(String name, String description,
- boolean required, int defValue, int value, int min, int max)
+ public IntegerParameter(String name, String description, boolean required,
+ int defValue, int value, int min, int max)
{
{
- super(name, description, required, String.valueOf(defValue), String
- .valueOf(value), null, null);
+ super(name, description, required, String.valueOf(defValue),
+ String.valueOf(value), null, null);
defval = defValue;
this.min = min;
this.max = max;
defval = defValue;
this.min = min;
this.max = max;