dwinterfeldt 02/03/16 16:36:43
Modified: contrib/validator/src/share/org/apache/struts/validator/util
StrutsValidator.java
Log:
Passing in the application context to the validation methods is no longer necessary
because the MessageResources are now in request scope to handle multiple applications.
Revision Changes Path
1.3 +31 -45
jakarta-struts/contrib/validator/src/share/org/apache/struts/validator/util/StrutsValidator.java
Index: StrutsValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/src/share/org/apache/struts/validator/util/StrutsValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StrutsValidator.java 26 Feb 2002 05:03:27 -0000 1.2
+++ StrutsValidator.java 17 Mar 2002 00:36:43 -0000 1.3
@@ -93,19 +93,18 @@
* @param errors The <code>ActionErrors</code> object to add
errors to if any
* validation errors occur.
* @param request Current request object.
- * @param application The application's <code>ServletContext</code>.
*/
public static boolean validateRequired(Object bean,
ValidatorAction va, Field field,
ActionErrors errors,
- HttpServletRequest request,
ServletContext application) {
+ HttpServletRequest request) {
String value = null;
if (field.getProperty() != null && field.getProperty().length() > 0)
value = ValidatorUtil.getValueAsString(bean, field.getProperty());
if (GenericValidator.isBlankOrNull(value)) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(), StrutsValidatorUtil.getActionError(request,
va, field));
return false;
} else {
@@ -123,12 +122,11 @@
* @param errors The <code>ActionErrors</code> object to add
errors to if any
* validation errors occur.
* @param request Current request object.
- * @param application The application's <code>ServletContext</code>.
*/
public static boolean validateMask(Object bean,
ValidatorAction va, Field field,
ActionErrors errors,
- HttpServletRequest request, ServletContext
application) {
+ HttpServletRequest request) {
String mask = field.getVarValue("mask");
@@ -137,7 +135,7 @@
try {
if (!GenericValidator.isBlankOrNull(value) &&
!GenericValidator.matchRegexp(value, mask)) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(request, va, field));
return false;
} else {
@@ -164,17 +162,16 @@
* @param errors The <code>ActionErrors</code> object to add
errors to if any
* validation errors occur.
* @param request Current request object.
- * @param application The application's <code>ServletContext</code>.
*/
public static boolean validateByte(Object bean,
ValidatorAction va, Field field,
ActionErrors errors,
- HttpServletRequest request, ServletContext
application) {
+ HttpServletRequest request) {
String value = ValidatorUtil.getValueAsString(bean, field.getProperty());
if (!GenericValidator.isBlankOrNull(value) &&
!GenericValidator.isByte(value)) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(), StrutsValidatorUtil.getActionError(request,
va, field));
return false;
} else {
return true;
@@ -191,16 +188,15 @@
* @param errors The <code>ActionErrors</code> object to add
errors to if any
* validation errors occur.
* @param request Current request object.
- * @param application The application's <code>ServletContext</code>.
*/
public static boolean validateShort(Object bean,
ValidatorAction va, Field field,
ActionErrors errors,
- HttpServletRequest request, ServletContext
application) {
+ HttpServletRequest request) {
String value = ValidatorUtil.getValueAsString(bean, field.getProperty());
if (!GenericValidator.isBlankOrNull(value) &&
!GenericValidator.isShort(value)) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(), StrutsValidatorUtil.getActionError(request,
va, field));
return false;
} else {
return true;
@@ -217,16 +213,15 @@
* @param errors The <code>ActionErrors</code> object to add
errors to if any
* validation errors occur.
* @param request Current request object.
- * @param application The application's <code>ServletContext</code>.
*/
public static boolean validateInteger(Object bean,
ValidatorAction va, Field field,
ActionErrors errors,
- HttpServletRequest request, ServletContext
application) {
+ HttpServletRequest request) {
String value = ValidatorUtil.getValueAsString(bean, field.getProperty());
if (!GenericValidator.isBlankOrNull(value) &&
!GenericValidator.isInt(value)) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(), StrutsValidatorUtil.getActionError(request,
va, field));
return false;
} else {
return true;
@@ -243,16 +238,15 @@
* @param errors The <code>ActionErrors</code> object to add
errors to if any
* validation errors occur.
* @param request Current request object.
- * @param application The application's <code>ServletContext</code>.
*/
public static boolean validateLong(Object bean,
ValidatorAction va, Field field,
ActionErrors errors,
- HttpServletRequest request, ServletContext
application) {
+ HttpServletRequest request) {
String value = ValidatorUtil.getValueAsString(bean, field.getProperty());
if (!GenericValidator.isBlankOrNull(value) &&
!GenericValidator.isLong(value)) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(), StrutsValidatorUtil.getActionError(request,
va, field));
return false;
} else {
return true;
@@ -269,16 +263,15 @@
* @param errors The <code>ActionErrors</code> object to add
errors to if any
* validation errors occur.
* @param request Current request object.
- * @param application The application's <code>ServletContext</code>.
*/
public static boolean validateFloat(Object bean,
ValidatorAction va, Field field,
ActionErrors errors,
- HttpServletRequest request, ServletContext
application) {
+ HttpServletRequest request) {
String value = ValidatorUtil.getValueAsString(bean, field.getProperty());
if (!GenericValidator.isBlankOrNull(value) &&
!GenericValidator.isFloat(value)) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(), StrutsValidatorUtil.getActionError(request,
va, field));
return false;
} else {
return true;
@@ -295,16 +288,15 @@
* @param errors The <code>ActionErrors</code> object to add
errors to if any
* validation errors occur.
* @param request Current request object.
- * @param application The application's <code>ServletContext</code>.
*/
public static boolean validateDouble(Object bean,
ValidatorAction va, Field field,
ActionErrors errors,
- HttpServletRequest request, ServletContext
application) {
+ HttpServletRequest request) {
String value = ValidatorUtil.getValueAsString(bean, field.getProperty());
if (!GenericValidator.isBlankOrNull(value) &&
!GenericValidator.isDouble(value)) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(), StrutsValidatorUtil.getActionError(request,
va, field));
return false;
} else {
return true;
@@ -328,12 +320,11 @@
* @param errors The <code>ActionErrors</code> object to add
errors to if any
* validation errors occur.
* @param request Current request object.
- * @param application The application's <code>ServletContext</code>.
*/
public static boolean validateDate(Object bean,
ValidatorAction va, Field field,
ActionErrors errors,
- HttpServletRequest request, ServletContext
application) {
+ HttpServletRequest request) {
boolean bValid = true;
@@ -357,7 +348,7 @@
}
if (!bValid)
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(), StrutsValidatorUtil.getActionError(request,
va, field));
return bValid;
}
@@ -376,12 +367,11 @@
* @param errors The <code>ActionErrors</code> object to add
errors to if any
* validation errors occur.
* @param request Current request object.
- * @param application The application's <code>ServletContext</code>.
*/
public static boolean validateRange(Object bean,
ValidatorAction va, Field field,
ActionErrors errors,
- HttpServletRequest request, ServletContext
application) {
+ HttpServletRequest request) {
String value = ValidatorUtil.getValueAsString(bean, field.getProperty());
String sMin = field.getVarValue("min");
@@ -394,12 +384,12 @@
int max = Integer.parseInt(sMax);
if (!GenericValidator.isInRange(iValue, min, max)) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(request, va, field));
return false;
}
} catch (Exception e) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(), StrutsValidatorUtil.getActionError(request,
va, field));
return false;
}
}
@@ -419,18 +409,17 @@
* @param errors The <code>ActionErrors</code> object to add
errors to if any
* validation errors occur.
* @param request Current request object.
- * @param application The application's <code>ServletContext</code>.
*/
public static boolean validateCreditCard(Object bean,
ValidatorAction va, Field field,
ActionErrors errors,
- HttpServletRequest request, ServletContext
application) {
+ HttpServletRequest request) {
if (field.getProperty() != null && field.getProperty().length() > 0) {
String value = ValidatorUtil.getValueAsString(bean, field.getProperty());
if (!GenericValidator.isBlankOrNull(value) &&
!GenericValidator.isCreditCard(value)) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(), StrutsValidatorUtil.getActionError(request,
va, field));
return false;
} else {
@@ -453,17 +442,16 @@
* @param errors The <code>ActionErrors</code> object to add
errors to if any
* validation errors occur.
* @param request Current request object.
- * @param application The application's <code>ServletContext</code>.
*/
public static boolean validateEmail(Object bean,
ValidatorAction va, Field field,
ActionErrors errors,
- HttpServletRequest request, ServletContext
application) {
+ HttpServletRequest request) {
String value = ValidatorUtil.getValueAsString(bean, field.getProperty());
if (!GenericValidator.isBlankOrNull(value) &&
!GenericValidator.isEmail(value)) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(), StrutsValidatorUtil.getActionError(request,
va, field));
return false;
} else {
return true;
@@ -481,12 +469,11 @@
* @param errors The <code>ActionErrors</code> object to add
errors to if any
* validation errors occur.
* @param request Current request object.
- * @param application The application's <code>ServletContext</code>.
*/
public static boolean validateMaxLength(Object bean,
ValidatorAction va, Field field,
ActionErrors errors,
- HttpServletRequest request,
ServletContext application) {
+ HttpServletRequest request) {
String value = ValidatorUtil.getValueAsString(bean, field.getProperty());
String sMaxLength = field.getVarValue("maxlength");
@@ -496,12 +483,12 @@
int max = Integer.parseInt(sMaxLength);
if (!GenericValidator.maxLength(value, max)) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(request, va, field));
return false;
}
} catch (Exception e) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(), StrutsValidatorUtil.getActionError(request,
va, field));
return false;
}
}
@@ -521,12 +508,11 @@
* @param errors The <code>ActionErrors</code> object to add
errors to if any
* validation errors occur.
* @param request Current request object.
- * @param application The application's <code>ServletContext</code>.
*/
public static boolean validateMinLength(Object bean,
ValidatorAction va, Field field,
ActionErrors errors,
- HttpServletRequest request,
ServletContext application) {
+ HttpServletRequest request) {
String value = ValidatorUtil.getValueAsString(bean, field.getProperty());
String sMinLength = field.getVarValue("minlength");
@@ -536,12 +522,12 @@
int min = Integer.parseInt(sMinLength);
if (!GenericValidator.minLength(value, min)) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(request, va, field));
return false;
}
} catch (Exception e) {
- errors.add(field.getKey(),
StrutsValidatorUtil.getActionError(application, request, va, field));
+ errors.add(field.getKey(), StrutsValidatorUtil.getActionError(request,
va, field));
return false;
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
