diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java index 366d17ef5..31ea69062 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java @@ -16,7 +16,6 @@ package com.opensymphony.xwork2.validator.validators; -import com.opensymphony.xwork2.util.TextParseUtil; import com.opensymphony.xwork2.validator.ValidationException; import java.util.regex.Matcher; @@ -124,13 +123,6 @@ public class RegexFieldValidator extends FieldValidatorSupport { } } - protected Object parse(String expression, Class type) { - if (expression == null) { - return null; - } - return TextParseUtil.translateVariables('$', expression, stack, type); - } - /** * @return Returns whether the expression should be matched against in * a case-sensitive way. Default is true. diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java index e017d2f40..a6b20cff0 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java @@ -180,6 +180,13 @@ public abstract class ValidatorSupport implements Validator, ShortCircuitableVal return expression; } + protected Object parse(String expression, Class type) { + if (expression == null) { + return null; + } + return TextParseUtil.translateVariables('$', expression, stack, type); + } + /** * Return the field value named name from object, * object should have the appropriate getter/setter.