svn commit: r634847 - in /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket: Application.properties Application_nl.properties validation/validator/NumberValidator.java

[jcompagner]

Author: jcompagner
Date: Fri Mar  7 14:27:48 2008
New Revision: 634847

URL: http://svn.apache.org/viewvc?rev=634847&view=rev
Log:
WICKET-1336

Modified:
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.properties
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application_nl.properties
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/NumberValidator.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.properties
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.properties?rev=634847&r1=634846&r2=634847&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.properties
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.properties
 Fri Mar  7 14:27:48 2008
@@ -18,6 +18,8 @@
 NumberValidator.range=${input} is not between ${minimum} and ${maximum}.
 NumberValidator.minimum='${input}' is smaller than the minimum of ${minimum}.
 NumberValidator.maximum='${input}' is larger than the maximum of ${maximum}.
+NumberValidator.positive='${input}' must be positive.
+NumberValidator.negative='${input}' must be negative.
 
 StringValidator.range='${input}' is not between ${minimum} and ${maximum} 
characters long.
 StringValidator.minimum='${input}' is shorter than the minimum of ${minimum} 
characters.

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application_nl.properties
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application_nl.properties?rev=634847&r1=634846&r2=634847&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application_nl.properties
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application_nl.properties
 Fri Mar  7 14:27:48 2008
@@ -18,6 +18,8 @@
 NumberValidator.range=${input} moet tussen ${minimum} en ${maximum} liggen.
 NumberValidator.minimum='${input}' moet groter zijn dan ${minimum}.
 NumberValidator.maximum='${input}' moet kleiner zijn dan ${maximum}.
+NumberValidator.positive='${input}' moet positief zijn.
+NumberValidator.negative='${input}' moet negatief zijn.
 
 StringValidator.range='${input}' moet tussen ${minimum} en ${maximum} 
karakters hebben.
 StringValidator.minimum='${input}' moet minstens ${minimum} karakters hebben.

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/NumberValidator.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/NumberValidator.java?rev=634847&r1=634846&r2=634847&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/NumberValidator.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/NumberValidator.java
 Fri Mar  7 14:27:48 2008
@@ -41,12 +41,28 @@
        /**
         * a validator for ensuring for a positive number value (>0 so not 
including 0)
         */
-       public static final NumberValidator POSITIVE = 
minimum(Double.MIN_VALUE);
+       public static final NumberValidator POSITIVE = new 
DoubleMinimumValidator(Double.MIN_VALUE)
+       {
+               private static final long serialVersionUID = 1L;
+
+               protected String resourceKey()
+               {
+                       return "NumberValidator.positive";
+               }
+       };
 
        /**
         * a validator for ensuring a negative number value (<0 so not 
including 0)
         */
-       public static final NumberValidator NEGATIVE = 
maximum(-Double.MIN_VALUE);
+       public static final NumberValidator NEGATIVE = new 
DoubleMaximumValidator(-Double.MIN_VALUE)
+       {
+               private static final long serialVersionUID = 1L;
+
+               protected String resourceKey()
+               {
+                       return "NumberValidator.negative";
+               }
+       };
 
        /**
         * Gets an Integer range validator for checking if a number falls 
between the minimum and
@@ -495,7 +511,14 @@
                protected Map variablesMap(IValidatable validatable)
                {
                        final Map map = super.variablesMap(validatable);
-                       map.put("minimum", new Double(minimum));
+                       if (Math.abs(minimum) == Double.MIN_VALUE)
+                       {
+                               map.put("minimum", new Integer(0));
+                       }
+                       else
+                       {
+                               map.put("minimum", new Double(minimum));
+                       }
                        return map;
                }
 
@@ -554,7 +577,14 @@
                protected Map variablesMap(IValidatable validatable)
                {
                        final Map map = super.variablesMap(validatable);
-                       map.put("maximum", new Double(maximum));
+                       if (Math.abs(maximum) == Double.MIN_VALUE)
+                       {
+                               map.put("maximum", new Integer(0));
+                       }
+                       else
+                       {
+                               map.put("maximum", new Double(maximum));
+                       }
                        return map;
                }