[cvs] expresso commit by ppilgrim: `ActionError' IS deprecated and
should be
JCorporate Ltd
jcorp at jcorporate.com
Fri Jan 14 19:31:12 UTC 2005
Log Message:
-----------
`ActionError' IS deprecated and should be replaced by
`ActionMessage'. ActionErrors IS NOT deprecated. For more info surf
to `http://wiki.apache.org/struts/StrutsUpgradeNotes11to124 '
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/validation:
ExpressoFieldChecks.java
Revision Data
-------------
Index: ExpressoFieldChecks.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/validation/ExpressoFieldChecks.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/validation/ExpressoFieldChecks.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/validation/ExpressoFieldChecks.java -u -r1.6 -r1.7
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/validation/ExpressoFieldChecks.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/validation/ExpressoFieldChecks.java
@@ -134,7 +134,7 @@
}
if (GenericValidator.isBlankOrNull(value)) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
return false;
} else {
return true;
@@ -164,8 +164,9 @@
Validator validator,
HttpServletRequest request) {
- Object form = validator.getResource(org.apache.commons.validator.Validator.
- BEAN_KEY);
+ Object form = validator.getParameterValue(org.apache.commons.validator.Validator.BEAN_PARAM);
+ // Replace DEPRECATED code:
+ // Object form = validator.getResource(org.apache.commons.validator.Validator.BEAN_KEY);
String value = null;
boolean required = false;
@@ -238,7 +239,7 @@
if (required) {
if (GenericValidator.isBlankOrNull(value)) {
errors.add(field.getKey(),
- Resources.getActionError(request, va, field));
+ Resources.getActionMessage(request, va, field));
return false;
@@ -280,7 +281,7 @@
&& !GenericValidator.matchRegexp(value, mask)) {
errors.add(field.getKey(),
- Resources.getActionError(request, va, field));
+ Resources.getActionMessage(request, va, field));
return false;
} else {
@@ -321,7 +322,7 @@
result = GenericTypeValidator.formatByte(value);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
}
}
@@ -356,7 +357,7 @@
result = GenericTypeValidator.formatShort(value);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
}
}
@@ -391,7 +392,7 @@
result = GenericTypeValidator.formatInt(value);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
}
}
@@ -426,7 +427,7 @@
result = GenericTypeValidator.formatLong(value);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
}
}
@@ -461,7 +462,7 @@
result = GenericTypeValidator.formatFloat(value);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
}
}
@@ -496,7 +497,7 @@
result = GenericTypeValidator.formatDouble(value);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
}
}
@@ -551,7 +552,7 @@
}
if (result == null) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
}
}
@@ -612,12 +613,12 @@
if (!GenericValidator.isInRange(intValue, min, max)) {
errors.add(field.getKey(),
- Resources.getActionError(request, va, field));
+ Resources.getActionMessage(request, va, field));
return false;
}
} catch (Exception e) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
return false;
}
}
@@ -658,12 +659,12 @@
if (!GenericValidator.isInRange(doubleValue, min, max)) {
errors.add(field.getKey(),
- Resources.getActionError(request, va, field));
+ Resources.getActionMessage(request, va, field));
return false;
}
} catch (Exception e) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
return false;
}
}
@@ -704,12 +705,12 @@
if (!GenericValidator.isInRange(floatValue, min, max)) {
errors.add(field.getKey(),
- Resources.getActionError(request, va, field));
+ Resources.getActionMessage(request, va, field));
return false;
}
} catch (Exception e) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
return false;
}
}
@@ -746,7 +747,7 @@
result = GenericTypeValidator.formatCreditCard(value);
if (result == null) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
}
}
@@ -779,7 +780,7 @@
if (!GenericValidator.isBlankOrNull(value) &&
!GenericValidator.isEmail(value)) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
return false;
} else {
return true;
@@ -817,12 +818,12 @@
if (!GenericValidator.maxLength(value, max)) {
errors.add(field.getKey(),
- Resources.getActionError(request, va, field));
+ Resources.getActionMessage(request, va, field));
return false;
}
} catch (Exception e) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
return false;
}
}
@@ -861,12 +862,12 @@
if (!GenericValidator.minLength(value, min)) {
errors.add(field.getKey(),
- Resources.getActionError(request, va, field));
+ Resources.getActionMessage(request, va, field));
return false;
}
} catch (Exception e) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
return false;
}
}
@@ -902,7 +903,7 @@
}
if (!GenericValidator.isBlankOrNull(value) && !isURL(value)) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
return false;
} else {
return true;
More information about the cvs
mailing list