From: <fg...@us...> - 2007-02-17 14:39:27
|
Revision: 269 http://svn.sourceforge.net/openutils/?rev=269&view=rev Author: fgiust Date: 2007-02-17 06:39:26 -0800 (Sat, 17 Feb 2007) Log Message: ----------- finally fixed validation message for annotation validator Modified Paths: -------------- trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java Removed Paths: ------------- trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/NullValidator.java Modified: trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java =================================================================== --- trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java 2007-02-16 15:01:21 UTC (rev 268) +++ trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/AnnotationValidator.java 2007-02-17 14:39:26 UTC (rev 269) @@ -8,6 +8,7 @@ import org.hibernate.validator.InvalidValue; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; +import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.validation.Errors; import org.springframework.validation.Validator; @@ -34,7 +35,7 @@ } /** - * {@inheritDoc} + * @see org.springframework.validation.Validator#supports(java.lang.Class) */ @SuppressWarnings("unchecked") public boolean supports(Class clazz) @@ -53,12 +54,16 @@ InvalidValue[] validationMessages = classValidator.getInvalidValues(obj); for (InvalidValue value : validationMessages) { - String propertyName = value.getPropertyPath(); - String fqPropertyName = errors.getObjectName() + "." + propertyName; - String message = value.getMessage(); + String field = value.getPropertyPath(); - errors.rejectValue(propertyName, message, new Object[]{fqPropertyName }, null); + String[] codes = new String[]{errors.getObjectName() + Errors.NESTED_PATH_SEPARATOR + field, field }; + errors.rejectValue( + field, + value.getMessage(), + new Object[]{new DefaultMessageSourceResolvable(codes, field) }, + null); + } } Deleted: trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/NullValidator.java =================================================================== --- trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/NullValidator.java 2007-02-16 15:01:21 UTC (rev 268) +++ trunk/openutils-spring/src/main/java/it/openutils/spring/validation/hibernate/NullValidator.java 2007-02-17 14:39:26 UTC (rev 269) @@ -1,30 +0,0 @@ -package it.openutils.spring.validation.hibernate; - -import org.springframework.validation.Errors; -import org.springframework.validation.Validator; - - -/** - * @author fgiust - * @version $Revision$ ($Author$) - */ -public class NullValidator implements Validator -{ - - /** - * {@inheritDoc} - */ - @SuppressWarnings("unchecked") - public boolean supports(final Class command) - { - return true; - } - - /** - * {@inheritDoc} - */ - public void validate(final Object command, final Errors errors) - { - return; - } -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |