dgraham 2003/08/22 16:49:12
Modified: src/share/org/apache/struts/validator FieldChecks.java
Log:
Replaced calls to Resources.getActionError() Resources.getActionMessage().
Revision Changes Path
1.12 +25 -25
jakarta-struts/src/share/org/apache/struts/validator/FieldChecks.java
Index: FieldChecks.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/validator/FieldChecks.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FieldChecks.java 26 Jul 2003 00:40:29 -0000 1.11
+++ FieldChecks.java 22 Aug 2003 23:49:12 -0000 1.12
@@ -129,7 +129,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;
@@ -232,7 +232,7 @@
if (GenericValidator.isBlankOrNull(value)) {
errors.add(
field.getKey(),
- Resources.getActionError(request, va, field));
+ Resources.getActionMessage(request, va,
field));
return false;
@@ -275,7 +275,7 @@
errors.add(
field.getKey(),
- Resources.getActionError(request, va, field));
+ Resources.getActionMessage(request, va, field));
return false;
} else {
@@ -317,7 +317,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));
}
}
@@ -353,7 +353,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));
}
}
@@ -389,7 +389,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));
}
}
@@ -425,7 +425,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 +461,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));
}
}
@@ -497,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));
}
}
@@ -553,7 +553,7 @@
}
if (result == null) {
- errors.add(field.getKey(), Resources.getActionError(request, va,
field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va,
field));
}
}
@@ -613,12 +613,12 @@
int max = Integer.parseInt(field.getVarValue("max"));
if (!GenericValidator.isInRange(intValue, min, max)) {
- errors.add(field.getKey(), Resources.getActionError(request,
va, field));
+ errors.add(field.getKey(), 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 +658,12 @@
double max = Double.parseDouble(field.getVarValue("max"));
if (!GenericValidator.isInRange(doubleValue, min, max)) {
- errors.add(field.getKey(), Resources.getActionError(request,
va, field));
+ errors.add(field.getKey(), 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;
}
}
@@ -703,12 +703,12 @@
float max = Float.parseFloat(field.getVarValue("max"));
if (!GenericValidator.isInRange(floatValue, min, max)) {
- errors.add(field.getKey(), Resources.getActionError(request,
va, field));
+ errors.add(field.getKey(), 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 +746,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 +779,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 +817,12 @@
int max = Integer.parseInt(field.getVarValue("maxlength"));
if (!GenericValidator.maxLength(value, max)) {
- errors.add(field.getKey(), Resources.getActionError(request,
va, field));
+ errors.add(field.getKey(), 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 +861,12 @@
int min = Integer.parseInt(field.getVarValue("minlength"));
if (!GenericValidator.minLength(value, min)) {
- errors.add(field.getKey(), Resources.getActionError(request,
va, field));
+ errors.add(field.getKey(), 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;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
