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 2013/02/19 17:05:57 UTC
svn commit: r1447781 - in
/myfaces/extensions/validator/branches/branch_for_jsf_2_0:
component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/
core/src/main/java/org/apache/myfaces/extensions/validator/c...
Author: gpetracek
Date: Tue Feb 19 16:05:57 2013
New Revision: 1447781
URL: http://svn.apache.org/r1447781
Log:
EXTVAL-151 moved renderkit-cache
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/GenericRenderKitWrapperFactory.java
myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java
myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/DefaultRenderKitWrapperFactory.java
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/GenericRenderKitWrapperFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/GenericRenderKitWrapperFactory.java?rev=1447781&r1=1447780&r2=1447781&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/GenericRenderKitWrapperFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/renderkit/GenericRenderKitWrapperFactory.java Tue Feb 19 16:05:57 2013
@@ -19,12 +19,10 @@
package org.apache.myfaces.extensions.validator.generic.renderkit;
import org.apache.myfaces.extensions.validator.core.renderkit.AbstractRenderKitWrapperFactory;
-import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import javax.faces.render.RenderKit;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
/**
* @since 1.x.1
@@ -32,19 +30,10 @@ import java.util.concurrent.ConcurrentHa
@UsageInformation(UsageCategory.INTERNAL)
public class GenericRenderKitWrapperFactory extends AbstractRenderKitWrapperFactory
{
- private Map<Class<? extends RenderKit>, RenderKit> renderKitCache =
- new ConcurrentHashMap<Class<? extends RenderKit>, RenderKit>();
-
protected RenderKit createWrapper(RenderKit renderKit)
{
logger.finest("extval renderkit wrapper created for " + renderKit.getClass().getName() + " via cglib");
- if(!this.renderKitCache.containsKey(renderKit.getClass()))
- {
- RenderKit wrappedRenderKit = ExtValGenericRenderKit.newInstance(renderKit);
- this.renderKitCache.put(renderKit.getClass(), wrappedRenderKit);
- }
-
- return this.renderKitCache.get(renderKit.getClass());
+ return ExtValGenericRenderKit.newInstance(renderKit);
}
}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java?rev=1447781&r1=1447780&r2=1447781&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java Tue Feb 19 16:05:57 2013
@@ -24,6 +24,8 @@ import org.apache.myfaces.extensions.val
import org.apache.myfaces.extensions.validator.util.JsfUtils;
import javax.faces.render.RenderKit;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Logger;
/**
@@ -37,6 +39,9 @@ public abstract class AbstractRenderKitW
{
protected final Logger logger = Logger.getLogger(getClass().getName());
+ private Map<Class<? extends RenderKit>, RenderKit> renderKitCache =
+ new ConcurrentHashMap<Class<? extends RenderKit>, RenderKit>();
+
protected AbstractRenderKitWrapperFactory wrapped;
private boolean deactivated = false;
@@ -94,12 +99,17 @@ public abstract class AbstractRenderKitW
*/
public final RenderKit create(RenderKit renderKit)
{
- if(isDeactivated())
+ if(isDeactivated() || renderKit == null)
{
return null;
}
- RenderKit result = null;
+ RenderKit result = this.renderKitCache.get(renderKit.getClass());
+
+ if (result != null)
+ {
+ return result;
+ }
if(this.wrapped != null)
{
@@ -108,7 +118,12 @@ public abstract class AbstractRenderKitW
if(result == null)
{
- return createWrapper(renderKit);
+ result = createWrapper(renderKit);
+ }
+
+ if(result != null)
+ {
+ renderKitCache.put(renderKit.getClass(), result);
}
return result;
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/DefaultRenderKitWrapperFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/DefaultRenderKitWrapperFactory.java?rev=1447781&r1=1447780&r2=1447781&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/DefaultRenderKitWrapperFactory.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/DefaultRenderKitWrapperFactory.java Tue Feb 19 16:05:57 2013
@@ -30,7 +30,6 @@ import javax.faces.render.RenderKit;
@UsageInformation(UsageCategory.INTERNAL)
public class DefaultRenderKitWrapperFactory extends AbstractRenderKitWrapperFactory
{
- private RenderKit renderKit;
private static final String GENERIC_RENDER_KIT_WRAPPER_FACTORY =
"org.apache.myfaces.extensions.validator.generic.renderkit.GenericRenderKitWrapperFactory";
private static Boolean useGenericRenderKitWrapperFactory = null;
@@ -53,10 +52,6 @@ public class DefaultRenderKitWrapperFact
return renderKitWrapperFactory.createWrapper(renderKit);
}
- if(this.renderKit == null)
- {
- this.renderKit = new ExtValRenderKit(renderKit);
- }
- return this.renderKit;
+ return new ExtValRenderKit(renderKit);
}
}