seade 2003/09/25 17:35:38
Modified: src/java/org/apache/turbine/services/intake/model Tag:
TURBINE_2_3_BRANCH Field.java
Log:
Patch from Colin Chalmers to enable a required rule with a value of false to be
applied later using field.setRequired().
Thanks Colin.
Revision Changes Path
No revision
No revision
1.15.2.1 +5 -4
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/Field.java
Index: Field.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/Field.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- Field.java 18 Jul 2003 09:09:23 -0000 1.15
+++ Field.java 26 Sep 2003 00:35:38 -0000 1.15.2.1
@@ -124,7 +124,7 @@
protected final Method setter;
/** Error message set on the field if required and not set by parser */
- protected final String ifRequiredMessage;
+ protected String ifRequiredMessage;
/** Does this field accept multiple values? */
protected final boolean isMultiValued;
@@ -290,6 +290,7 @@
if (reqRule != null)
{
alwaysRequired = new Boolean(reqRule.getValue()).booleanValue();
+ ifRequiredMessage = reqRule.getMessage();
}
Rule maxLengthRule = (Rule) field.getRuleMap().get("maxLength");
@@ -333,7 +334,6 @@
}
getter = tmpGetter;
setter = tmpSetter;
- ifRequiredMessage = field.getIfRequiredMessage();
valArray = new Object[1];
}
@@ -371,7 +371,8 @@
}
}
- if (pp.containsKey(getKey()))
+ if (pp.containsKey(getKey())
+ && StringUtils.isNotEmpty(pp.getString(getKey())))
{
if (isDebugEnabled)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
