Author: ivaynberg
Date: Tue May 18 22:01:35 2010
New Revision: 945919
URL: http://svn.apache.org/viewvc?rev=945919&view=rev
Log:
WICKET-2869 RangeValidator should use getMinimum and getMaximum
Issue: WICKET-2869
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java?rev=945919&r1=945918&r2=945919&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
Tue May 18 22:01:35 2010
@@ -71,12 +71,14 @@ public class RangeValidator<Z extends Co
public void validate(IValidatable<Z> validatable)
{
Z value = validatable.getValue();
- if (value.compareTo(minimum) < 0 || value.compareTo(maximum) >
0)
+ final Z min = getMinimum();
+ final Z max = getMaximum();
+ if (value.compareTo(min) < 0 || value.compareTo(max) > 0)
{
ValidationError error = new ValidationError();
error.addMessageKey("RangeValidator");
- error.setVariable("minimum", minimum);
- error.setVariable("maximum", maximum);
+ error.setVariable("minimum", min);
+ error.setVariable("maximum", max);
validatable.error(error);
}
}