svn commit: r291237 - in /jakarta/commons/proper/validator/trunk/src: share/org/apache/commons/validator/GenericTypeValidator.java share/org/apache/commons/validator/ValidatorResources.java test/org/apache/commons/validator/LocaleTest.java

[niallp]

Author: niallp
Date: Fri Sep 23 19:39:53 2005
New Revision: 291237

URL: http://svn.apache.org/viewcvs?rev=291237&view=rev
Log:
Enable Validator to compile under JDK 1.3 (removed use of JDK 1.4 features)

Modified:
    
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/GenericTypeValidator.java
    
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/ValidatorResources.java
    
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/LocaleTest.java

Modified: 
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/GenericTypeValidator.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/GenericTypeValidator.java?rev=291237&r1=291236&r2=291237&view=diff
==============================================================================
--- 
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/GenericTypeValidator.java
 (original)
+++ 
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/GenericTypeValidator.java
 Fri Sep 23 19:39:53 2005
@@ -72,10 +72,11 @@
         if (value != null) {
             NumberFormat formatter = null;
             if (locale != null) {
-                formatter = NumberFormat.getIntegerInstance(locale);
+                formatter = NumberFormat.getNumberInstance(locale);
             } else {
-                formatter = 
NumberFormat.getIntegerInstance(Locale.getDefault());
+                formatter = 
NumberFormat.getNumberInstance(Locale.getDefault());
             }
+            formatter.setParseIntegerOnly(true);
             ParsePosition pos = new ParsePosition(0);
             Number num = formatter.parse(value, pos);
 
@@ -124,10 +125,11 @@
         if (value != null) {
             NumberFormat formatter = null;
             if (locale != null) {
-                formatter = NumberFormat.getIntegerInstance(locale);
+                formatter = NumberFormat.getNumberInstance(locale);
             } else {
-                formatter = 
NumberFormat.getIntegerInstance(Locale.getDefault());
+                formatter = 
NumberFormat.getNumberInstance(Locale.getDefault());
             }
+            formatter.setParseIntegerOnly(true);
             ParsePosition pos = new ParsePosition(0);
             Number num = formatter.parse(value, pos);
 
@@ -176,10 +178,11 @@
         if (value != null) {
             NumberFormat formatter = null;
             if (locale != null) {
-                formatter = NumberFormat.getIntegerInstance(locale);
+                formatter = NumberFormat.getNumberInstance(locale);
             } else {
-                formatter = 
NumberFormat.getIntegerInstance(Locale.getDefault());
+                formatter = 
NumberFormat.getNumberInstance(Locale.getDefault());
             }
+            formatter.setParseIntegerOnly(true);
             ParsePosition pos = new ParsePosition(0);
             Number num = formatter.parse(value, pos);
 
@@ -228,10 +231,11 @@
         if (value != null) {
             NumberFormat formatter = null;
             if (locale != null) {
-                formatter = NumberFormat.getIntegerInstance(locale);
+                formatter = NumberFormat.getNumberInstance(locale);
             } else {
-                formatter = 
NumberFormat.getIntegerInstance(Locale.getDefault());
+                formatter = 
NumberFormat.getNumberInstance(Locale.getDefault());
             }
+            formatter.setParseIntegerOnly(true);
             ParsePosition pos = new ParsePosition(0);
             Number num = formatter.parse(value, pos);
 

Modified: 
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/ValidatorResources.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/ValidatorResources.java?rev=291237&r1=291236&r2=291237&view=diff
==============================================================================
--- 
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/ValidatorResources.java
 (original)
+++ 
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/ValidatorResources.java
 Fri Sep 23 19:39:53 2005
@@ -242,7 +242,7 @@
                 }
 
                 // Add the arg to the parent field
-                ((Field)digester.peek(0)).addArg(arg);
+                ((Field)getDigester().peek(0)).addArg(arg);
             }
         };
 

Modified: 
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/LocaleTest.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/LocaleTest.java?rev=291237&r1=291236&r2=291237&view=diff
==============================================================================
--- 
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/LocaleTest.java
 (original)
+++ 
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/LocaleTest.java
 Fri Sep 23 19:39:53 2005
@@ -162,7 +162,7 @@
         name.setFirstName("");
         name.setLastName("");
 
-        valueTest(name, new Locale("en"), false, false, true);
+        valueTest(name, new Locale("en", ""), false, false, true);
     }
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]