You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/09/12 02:21:37 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator BigDecimalValidator.java BooleanValidator.java DateStringValidator.java DoubleValidator.java FloatValidator.java IntegerValidator.java LongValidator.java ShortValidator.java StringValidator.java
henning 2003/09/11 17:21:37
Modified: src/java/org/apache/turbine/services/intake/validator Tag:
TURBINE_2_3_BRANCH BigDecimalValidator.java
BooleanValidator.java DateStringValidator.java
DoubleValidator.java FloatValidator.java
IntegerValidator.java LongValidator.java
ShortValidator.java StringValidator.java
Log:
Use StringUtils everywhere in the Validator to check for the existence of
the testValue.
Revision Changes Path
No revision
No revision
1.2.2.2 +5 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/BigDecimalValidator.java
Index: BigDecimalValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/BigDecimalValidator.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- BigDecimalValidator.java 11 Sep 2003 07:23:05 -0000 1.2.2.1
+++ BigDecimalValidator.java 12 Sep 2003 00:21:37 -0000 1.2.2.2
@@ -55,8 +55,11 @@
*/
import java.math.BigDecimal;
+
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
+
/**
* Validates BigDecimals with the following constraints in addition to those
* listed in NumberValidator and DefaultValidator.
@@ -143,7 +146,7 @@
{
super.assertValidity(testValue);
- if ((required) || ((testValue != null) && (testValue.length() > 0)))
+ if (required || StringUtils.isNotEmpty(testValue))
{
BigDecimal bd = null;
try
1.8.2.2 +5 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java
Index: BooleanValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- BooleanValidator.java 11 Sep 2003 07:23:05 -0000 1.8.2.1
+++ BooleanValidator.java 12 Sep 2003 00:21:37 -0000 1.8.2.2
@@ -55,8 +55,11 @@
*/
import java.text.ParseException;
+
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
+
/**
* Validator for boolean field types.<br><br>
*
@@ -127,7 +130,7 @@
{
super.assertValidity(testValue);
- if ((required) || ((testValue != null) && (testValue.length() > 0)))
+ if (required || StringUtils.isNotEmpty(testValue))
{
try
{
1.7.2.2 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/DateStringValidator.java
Index: DateStringValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/DateStringValidator.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- DateStringValidator.java 11 Sep 2003 07:23:05 -0000 1.7.2.1
+++ DateStringValidator.java 12 Sep 2003 00:21:37 -0000 1.7.2.2
@@ -194,7 +194,7 @@
{
super.assertValidity(testValue);
- if ((required) || ((testValue != null) && (testValue.length() > 0)))
+ if (required || StringUtils.isNotEmpty(testValue))
{
try
{
1.2.2.3 +4 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/DoubleValidator.java
Index: DoubleValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/DoubleValidator.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- DoubleValidator.java 11 Sep 2003 07:23:05 -0000 1.2.2.2
+++ DoubleValidator.java 12 Sep 2003 00:21:37 -0000 1.2.2.3
@@ -56,6 +56,8 @@
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
+
/**
* Validates Doubles with the following constraints in addition to those
* listed in NumberValidator and DefaultValidator.
@@ -147,7 +149,7 @@
double d = 0.0D;
- if ((required) || ((testValue != null) && (testValue.length() > 0)))
+ if (required || StringUtils.isNotEmpty(testValue))
{
try
{
1.2.2.3 +4 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/FloatValidator.java
Index: FloatValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/FloatValidator.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- FloatValidator.java 11 Sep 2003 07:23:05 -0000 1.2.2.2
+++ FloatValidator.java 12 Sep 2003 00:21:37 -0000 1.2.2.3
@@ -56,6 +56,8 @@
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
+
/**
* Validates Floats with the following constraints in addition to those
* listed in NumberValidator and DefaultValidator.
@@ -145,7 +147,7 @@
{
super.assertValidity(testValue);
- if ((required) || ((testValue != null) && (testValue.length() > 0)))
+ if (required || StringUtils.isNotEmpty(testValue))
{
float f = 0.0f;
try
1.8.2.2 +4 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/IntegerValidator.java
Index: IntegerValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/IntegerValidator.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- IntegerValidator.java 11 Sep 2003 07:23:05 -0000 1.8.2.1
+++ IntegerValidator.java 12 Sep 2003 00:21:37 -0000 1.8.2.2
@@ -56,6 +56,8 @@
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
+
/**
* Validates Integers with the following constraints in addition to those
* listed in NumberValidator and DefaultValidator.
@@ -145,7 +147,7 @@
{
super.assertValidity(testValue);
- if ((required) || ((testValue != null) && (testValue.length() > 0)))
+ if (required || StringUtils.isNotEmpty(testValue))
{
int i = 0;
try
1.2.2.2 +4 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/LongValidator.java
Index: LongValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/LongValidator.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- LongValidator.java 11 Sep 2003 07:23:05 -0000 1.2.2.1
+++ LongValidator.java 12 Sep 2003 00:21:37 -0000 1.2.2.2
@@ -56,6 +56,8 @@
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
+
/**
* Validates Longs with the following constraints in addition to those
* listed in NumberValidator and DefaultValidator.
@@ -145,7 +147,7 @@
{
super.assertValidity(testValue);
- if ((required) || ((testValue != null) && (testValue.length() > 0)))
+ if (required || StringUtils.isNotEmpty(testValue))
{
long l = 0L;
try
1.2.2.2 +4 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/ShortValidator.java
Index: ShortValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/ShortValidator.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- ShortValidator.java 11 Sep 2003 07:23:05 -0000 1.2.2.1
+++ ShortValidator.java 12 Sep 2003 00:21:37 -0000 1.2.2.2
@@ -56,6 +56,8 @@
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
+
/**
* Validates Shorts with the following constraints in addition to those
* listed in NumberValidator and DefaultValidator.
@@ -145,7 +147,7 @@
{
super.assertValidity(testValue);
- if ((required) || ((testValue != null) && (testValue.length() > 0)))
+ if (required || StringUtils.isNotEmpty(testValue))
{
short s = 0;
try
1.2.2.2 +4 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/StringValidator.java
Index: StringValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/StringValidator.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- StringValidator.java 11 Sep 2003 07:23:05 -0000 1.2.2.1
+++ StringValidator.java 12 Sep 2003 00:21:37 -0000 1.2.2.2
@@ -56,6 +56,8 @@
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
+
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.Perl5Compiler;
@@ -172,7 +174,7 @@
{
super.assertValidity(testValue);
- if ((required) || ((testValue != null) && (testValue.length() > 0)))
+ if (required || StringUtils.isNotEmpty(testValue))
{
if (maskPattern != null)
{