henning 2003/06/19 09:55:18
Modified: src/java/org/apache/turbine/services/intake/validator
BigDecimalValidator.java DateStringValidator.java
DefaultValidator.java DoubleValidator.java
FloatValidator.java IntegerValidator.java
LongValidator.java NumberKeyValidator.java
NumberValidator.java ShortValidator.java
StringValidator.java Validator.java
Log:
Factor out all the rule name strings and put them into one place
(I wanted to do that for a long time... :-) )
Revision Changes Path
1.2 +3 -3
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BigDecimalValidator.java 19 Jun 2003 15:18:25 -0000 1.1
+++ BigDecimalValidator.java 19 Jun 2003 16:55:17 -0000 1.2
@@ -112,7 +112,7 @@
{
super.init(paramMap);
- Constraint constraint = (Constraint) paramMap.get("minValue");
+ Constraint constraint = (Constraint) paramMap.get(MIN_VALUE_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
@@ -120,7 +120,7 @@
minValueMessage = constraint.getMessage();
}
- constraint = (Constraint) paramMap.get("maxValue");
+ constraint = (Constraint) paramMap.get(MAX_VALUE_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
1.7 +12 -9
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DateStringValidator.java 19 Jun 2003 15:23:43 -0000 1.6
+++ DateStringValidator.java 19 Jun 2003 16:55:17 -0000 1.7
@@ -135,7 +135,7 @@
{
super.init(paramMap);
- Constraint constraint = (Constraint) paramMap.get("format");
+ Constraint constraint = (Constraint) paramMap.get(FORMAT_RULE_NAME);
if (constraint != null)
{
@@ -143,22 +143,25 @@
setDateFormatMessage(constraint.getMessage());
}
- int i = 1;
- constraint = (Constraint) paramMap.get("format" + i);
-
- while (constraint != null)
+ for(int i = 1 ;; i++)
{
+ constraint = (Constraint) paramMap.get(FORMAT_RULE_NAME + i);
+
+ if (constraint == null)
+ {
+ break; // for
+ }
+
dateFormats.add(constraint.getValue());
setDateFormatMessage(constraint.getMessage());
- constraint = (Constraint) paramMap.get("format" + (++i));
- }
+ }
if (StringUtils.isEmpty(dateFormatMessage))
{
dateFormatMessage = DEFAULT_DATE_MESSAGE;
}
- constraint = (Constraint) paramMap.get("flexible");
+ constraint = (Constraint) paramMap.get(FLEXIBLE_RULE_NAME);
if (constraint != null)
{
1.9 +4 -4
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/DefaultValidator.java
Index: DefaultValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/DefaultValidator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultValidator.java 19 Jun 2003 15:14:40 -0000 1.8
+++ DefaultValidator.java 19 Jun 2003 16:55:17 -0000 1.9
@@ -137,7 +137,7 @@
public void init(Map paramMap)
throws InvalidMaskException
{
- Constraint constraint = (Constraint) paramMap.get("required");
+ Constraint constraint = (Constraint) paramMap.get(REQUIRED_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
@@ -145,7 +145,7 @@
requiredMessage = constraint.getMessage();
}
- constraint = (Constraint) paramMap.get("minLength");
+ constraint = (Constraint) paramMap.get(MIN_LENGTH_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
@@ -153,7 +153,7 @@
minLengthMessage = constraint.getMessage();
}
- constraint = (Constraint) paramMap.get("maxLength");
+ constraint = (Constraint) paramMap.get(MAX_LENGTH_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
1.2 +3 -3
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DoubleValidator.java 19 Jun 2003 15:26:05 -0000 1.1
+++ DoubleValidator.java 19 Jun 2003 16:55:17 -0000 1.2
@@ -114,7 +114,7 @@
{
super.init(paramMap);
- Constraint constraint = (Constraint) paramMap.get("minValue");
+ Constraint constraint = (Constraint) paramMap.get(MIN_VALUE_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
@@ -122,7 +122,7 @@
minValueMessage = constraint.getMessage();
}
- constraint = (Constraint) paramMap.get("maxValue");
+ constraint = (Constraint) paramMap.get(MAX_VALUE_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
1.2 +3 -3
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FloatValidator.java 19 Jun 2003 15:18:25 -0000 1.1
+++ FloatValidator.java 19 Jun 2003 16:55:17 -0000 1.2
@@ -114,7 +114,7 @@
{
super.init(paramMap);
- Constraint constraint = (Constraint) paramMap.get("minValue");
+ Constraint constraint = (Constraint) paramMap.get(MIN_VALUE_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
@@ -122,7 +122,7 @@
minValueMessage = constraint.getMessage();
}
- constraint = (Constraint) paramMap.get("maxValue");
+ constraint = (Constraint) paramMap.get(MAX_VALUE_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
1.8 +3 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IntegerValidator.java 19 Jun 2003 15:18:25 -0000 1.7
+++ IntegerValidator.java 19 Jun 2003 16:55:17 -0000 1.8
@@ -114,7 +114,7 @@
{
super.init(paramMap);
- Constraint constraint = (Constraint) paramMap.get("minValue");
+ Constraint constraint = (Constraint) paramMap.get(MIN_VALUE_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
@@ -122,7 +122,7 @@
minValueMessage = constraint.getMessage();
}
- constraint = (Constraint) paramMap.get("maxValue");
+ constraint = (Constraint) paramMap.get(MAX_VALUE_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
1.2 +3 -3
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LongValidator.java 19 Jun 2003 15:18:25 -0000 1.1
+++ LongValidator.java 19 Jun 2003 16:55:17 -0000 1.2
@@ -114,7 +114,7 @@
{
super.init(paramMap);
- Constraint constraint = (Constraint) paramMap.get("minValue");
+ Constraint constraint = (Constraint) paramMap.get(MIN_VALUE_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
@@ -122,7 +122,7 @@
minValueMessage = constraint.getMessage();
}
- constraint = (Constraint) paramMap.get("maxValue");
+ constraint = (Constraint) paramMap.get(MAX_VALUE_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
1.11 +3 -3
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/NumberKeyValidator.java
Index: NumberKeyValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/NumberKeyValidator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NumberKeyValidator.java 19 Jun 2003 15:22:01 -0000 1.10
+++ NumberKeyValidator.java 19 Jun 2003 16:55:17 -0000 1.11
@@ -103,7 +103,7 @@
minValue = null;
maxValue = null;
- Constraint constraint = (Constraint) paramMap.get("minValue");
+ Constraint constraint = (Constraint) paramMap.get(MIN_VALUE_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
@@ -111,7 +111,7 @@
minValueMessage = constraint.getMessage();
}
- constraint = (Constraint) paramMap.get("maxValue");
+ constraint = (Constraint) paramMap.get(MAX_VALUE_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
1.8 +4 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/NumberValidator.java
Index: NumberValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/NumberValidator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NumberValidator.java 19 Jun 2003 15:16:00 -0000 1.7
+++ NumberValidator.java 19 Jun 2003 16:55:17 -0000 1.8
@@ -100,7 +100,9 @@
{
super.init(paramMap);
- Constraint constraint = (Constraint) paramMap.get("invalidNumber");
+ Constraint constraint =
+ (Constraint) paramMap.get(INVALID_NUMBER_RULE_NAME);
+
if (constraint != null)
{
invalidNumberMessage = constraint.getMessage();
1.2 +3 -3
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ShortValidator.java 19 Jun 2003 15:18:25 -0000 1.1
+++ ShortValidator.java 19 Jun 2003 16:55:17 -0000 1.2
@@ -114,7 +114,7 @@
{
super.init(paramMap);
- Constraint constraint = (Constraint) paramMap.get("minValue");
+ Constraint constraint = (Constraint) paramMap.get(MIN_VALUE_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
@@ -122,7 +122,7 @@
minValueMessage = constraint.getMessage();
}
- constraint = (Constraint) paramMap.get("maxValue");
+ constraint = (Constraint) paramMap.get(MAX_VALUE_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
1.2 +2 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringValidator.java 19 Jun 2003 15:25:43 -0000 1.1
+++ StringValidator.java 19 Jun 2003 16:55:17 -0000 1.2
@@ -126,7 +126,7 @@
{
super.init(paramMap);
- Constraint constraint = (Constraint) paramMap.get("mask");
+ Constraint constraint = (Constraint) paramMap.get(MASK_RULE_NAME);
if (constraint != null)
{
String param = constraint.getValue();
1.7 +28 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/Validator.java
Index: Validator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/Validator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Validator.java 9 Mar 2003 03:06:28 -0000 1.6
+++ Validator.java 19 Jun 2003 16:55:17 -0000 1.7
@@ -62,6 +62,33 @@
*/
public interface Validator
{
+ /** "flexible" Rule, used in DateFormat Validator */
+ String FLEXIBLE_RULE_NAME = "flexible";
+
+ /** "format" Rule, used in DateFormat Validator */
+ String FORMAT_RULE_NAME = "format";
+
+ /** "invalidNumber" Rule, used in the various Number Validators */
+ String INVALID_NUMBER_RULE_NAME = "invalidNumber";
+
+ /** "mask" Rule, used in StringValidator */
+ String MASK_RULE_NAME = "mask";
+
+ /** "maxLength" Rule, used in all validators */
+ String MAX_LENGTH_RULE_NAME = "maxLength";
+
+ /** "maxValue" Rule, used in the various Number Validators */
+ String MAX_VALUE_RULE_NAME = "maxValue";
+
+ /** "minLength" Rule, used in all validators */
+ String MIN_LENGTH_RULE_NAME = "minLength";
+
+ /** "minValue" Rule, used in the various Number Validators */
+ String MIN_VALUE_RULE_NAME = "minValue";
+
+ /** "required" Rule, used in all validators */
+ String REQUIRED_RULE_NAME = "required";
+
/**
* Determine whether a testValue meets the criteria specified
* in the constraints defined for this validator
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
