svn commit: r945918 - /wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java

[ivaynberg]

Author: ivaynberg
Date: Tue May 18 22:01:12 2010
New Revision: 945918

URL: http://svn.apache.org/viewvc?rev=945918&view=rev
Log:
WICKET-2869 RangeValidator should use getMinimum and getMaximum
Issue: WICKET-2869

Modified:
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java?rev=945918&r1=945917&r2=945918&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
 Tue May 18 22:01:12 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);
                }
        }