You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mb...@apache.org on 2011/09/29 00:06:01 UTC
svn commit: r1177087 - in /myfaces/extensions/validator/trunk: ./
core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/
core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/
Author: mbenson
Date: Wed Sep 28 22:06:00 2011
New Revision: 1177087
URL: http://svn.apache.org/viewvc?rev=1177087&view=rev
Log:
Merged /myfaces/extensions/validator/branches/branch_for_jsf_2_0:r1177077
Modified:
myfaces/extensions/validator/trunk/ (props changed)
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValLazyRendererProxy.java (props changed)
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterFactory.java
Propchange: myfaces/extensions/validator/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 28 22:06:00 2011
@@ -1 +1,2 @@
+/myfaces/extensions/validator/branches/branch_for_jsf_2_0:1177077
/myfaces/extensions/validator/branches/trunk_layout_myfaces:681364-686067
Propchange: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValLazyRendererProxy.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 28 22:06:00 2011
@@ -1 +1,2 @@
+/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValLazyRendererProxy.java:1177077
/myfaces/extensions/validator/branches/trunk_layout_myfaces/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererProxy.java:681364-686067
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterFactory.java?rev=1177087&r1=1177086&r2=1177087&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterFactory.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/parameter/DefaultValidationParameterFactory.java Wed Sep 28 22:06:00 2011
@@ -40,7 +40,8 @@ import java.util.Map;
@UsageInformation(UsageCategory.INTERNAL)
public class DefaultValidationParameterFactory implements ClassMappingFactory<Class, Class>
{
- private Map<Class, Class> parameterMapping = new NullValueAwareConcurrentHashMap<Class, Class>(Class.class);
+ private Map<Class<?>, Class<?>> parameterMapping
+ = new NullValueAwareConcurrentHashMap<Class<?>, Class<?>>((Class<Class>) Class.class);
public Class create(Class source)
{