From 673873c0c6b3ae7b003e7f7004e236380fccdfa3 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Thu, 3 Jan 2013 11:13:36 +0000
Subject: [PATCH] Moves parse(String, Class) to parent class to allow use it in
 all subclasess

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1428281 13f79535-47bb-0310-9956-ffa450edef68
---
 .../xwork2/validator/validators/RegexFieldValidator.java  | 8 --------
 .../xwork2/validator/validators/ValidatorSupport.java     | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

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 <code>true</code>.
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 <code>name</code> from <code>object</code>,
      * <code>object</code> should have the appropriate getter/setter.