Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7961CD76A for ; Wed, 2 Jan 2013 21:40:44 +0000 (UTC) Received: (qmail 89832 invoked by uid 500); 2 Jan 2013 21:40:44 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 89786 invoked by uid 500); 2 Jan 2013 21:40:44 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 89778 invoked by uid 99); 2 Jan 2013 21:40:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2013 21:40:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2013 21:40:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B20722388993; Wed, 2 Jan 2013 21:40:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1428071 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/AbstractRangeValidator.java Date: Wed, 02 Jan 2013 21:40:21 -0000 To: commits@struts.apache.org From: lukaszlenart@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130102214021.B20722388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lukaszlenart Date: Wed Jan 2 21:40:21 2013 New Revision: 1428071 URL: http://svn.apache.org/viewvc?rev=1428071&view=rev Log: WW-2923 adds better support for generics Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/AbstractRangeValidator.java Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/AbstractRangeValidator.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/AbstractRangeValidator.java?rev=1428071&r1=1428070&r2=1428071&view=diff ============================================================================== --- struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/AbstractRangeValidator.java (original) +++ struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/validators/AbstractRangeValidator.java Wed Jan 2 21:40:21 2013 @@ -15,6 +15,7 @@ */ package com.opensymphony.xwork2.validator.validators; +import com.opensymphony.xwork2.util.TextParseUtil; import com.opensymphony.xwork2.validator.ValidationException; @@ -26,6 +27,12 @@ import com.opensymphony.xwork2.validator */ public abstract class AbstractRangeValidator extends FieldValidatorSupport { + private final Class type; + + protected AbstractRangeValidator(Class type) { + this.type = type; + } + public void validate(Object object) throws ValidationException { Object obj = getFieldValue(getFieldName(), object); Comparable value = (Comparable) obj; @@ -49,16 +56,15 @@ public abstract class AbstractRangeValid } } + protected T parse(String expression) { + if (expression == null) { + return null; + } + return (T) TextParseUtil.translateVariables('$', expression, stack, type); + } + protected abstract T getMaxComparatorValue(); protected abstract T getMinComparatorValue(); - protected String safeConditionalParse(String expression) { - Object value = conditionalParse(expression); - if (value != null) { - return value.toString(); - } else { - return null; - } - } }