You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2009/06/20 01:14:45 UTC
svn commit: r786714 - in /myfaces/extensions/validator/branches/branch_for_jsf_1_1: core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/ core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/...

Author: gpetracek
Date: Fri Jun 19 23:14:45 2009
New Revision: 786714

URL: http://svn.apache.org/viewvc?rev=786714&view=rev
Log:
minor changes

Modified:
    myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java
    myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractor.java
    myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java

Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java?rev=786714&r1=786713&r2=786714&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java Fri Jun 19 23:14:45 2009
@@ -67,6 +67,11 @@
             return null;
         }
 
+        if(key.contains(" "))
+        {
+            return key;
+        }
+
         ResourceBundle resourceBundle = null;
         String customMessage = null;
 

Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractor.java?rev=786714&r1=786713&r2=786714&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterExtractor.java Fri Jun 19 23:14:45 2009
@@ -334,7 +334,8 @@
                 for(Type upperBounds : ((WildcardType)type).getUpperBounds())
                 {
                     if(upperBounds instanceof Class &&
-                            ((Class)upperBounds).isAssignableFrom(ValidationParameter.class))
+                            //for attributes like: Class<? extends InheritedFromValidationParameter> value();
+                            ValidationParameter.class.isAssignableFrom((Class)upperBounds))
                     {
                         return true;
                     }

Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java?rev=786714&r1=786713&r2=786714&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/transformer/LengthMetaDataTransformer.java Fri Jun 19 23:14:45 2009
@@ -43,7 +43,11 @@
         int minimum = annotation.minimum();
 
         results.put(CommonMetaDataKeys.MIN_LENGTH, minimum);
-        results.put(CommonMetaDataKeys.MAX_LENGTH, annotation.maximum());
+
+        if(annotation.maximum() != Integer.MAX_VALUE)
+        {
+            results.put(CommonMetaDataKeys.MAX_LENGTH, annotation.maximum());
+        }
 
         if(minimum > 0)
         {