You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2017/04/06 23:30:18 UTC
svn commit: r1790485 - in /myfaces/core/branches/2.3.x:
api/src/main/java/javax/faces/view/facelets/
impl/src/main/java/org/apache/myfaces/view/facelets/
impl/src/main/java/org/apache/myfaces/view/facelets/impl/
Author: lu4242
Date: Thu Apr 6 23:30:18 2017
New Revision: 1790485
URL: http://svn.apache.org/viewvc?rev=1790485&view=rev
Log:
MYFACES-4108 - Implement FaceletCache.setCacheFactories(...)
Modified:
myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/view/facelets/FaceletCache.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletCache.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
Modified: myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/view/facelets/FaceletCache.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/view/facelets/FaceletCache.java?rev=1790485&r1=1790484&r2=1790485&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/view/facelets/FaceletCache.java (original)
+++ myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/view/facelets/FaceletCache.java Thu Apr 6 23:30:18 2017
@@ -67,4 +67,15 @@ public abstract class FaceletCache<V>
{
V newInstance(URL key) throws IOException;
}
+
+ /**
+ * @since 2.3
+ * @param faceletFactory
+ * @param viewMetadataFaceletFactory
+ */
+ public void setCacheFactories(FaceletCache.MemberFactory<V> faceletFactory,
+ FaceletCache.MemberFactory<V> viewMetadataFaceletFactory)
+ {
+ this.setMemberFactories(faceletFactory, viewMetadataFaceletFactory);
+ }
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletCache.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletCache.java?rev=1790485&r1=1790484&r2=1790485&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletCache.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletCache.java Thu Apr 6 23:30:18 2017
@@ -84,7 +84,7 @@ public abstract class AbstractFaceletCac
throw new NullPointerException("viewMetadataFaceletFactory is null");
}
_compositeComponentMetadataFaceletFactory = compositeComponentMetadataFaceletFactory;
- setMemberFactories(faceletFactory, viewMetadataFaceletFactory);
+ setCacheFactories(faceletFactory, viewMetadataFaceletFactory);
}
/**
@@ -95,4 +95,17 @@ public abstract class AbstractFaceletCac
{
return _compositeComponentMetadataFaceletFactory;
}
+
+ /**
+ * @since 2.3
+ * @param faceletFactory
+ * @param viewMetadataFaceletFactory
+ */
+ public void setCacheFactories(FaceletCache.MemberFactory<V> faceletFactory,
+ FaceletCache.MemberFactory<V> viewMetadataFaceletFactory,
+ FaceletCache.MemberFactory<V> compositeComponentMetadataFaceletFactory)
+ {
+ this.setMemberFactories(faceletFactory, viewMetadataFaceletFactory, compositeComponentMetadataFaceletFactory);
+ }
+
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java?rev=1790485&r1=1790484&r2=1790485&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java Thu Apr 6 23:30:18 2017
@@ -20,7 +20,6 @@ package org.apache.myfaces.view.facelets
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLConnection;
import java.util.HashMap;
@@ -147,12 +146,8 @@ public final class DefaultFaceletFactory
try
{
- Method setMemberFactoriesMethod = AbstractFaceletCache.class.getDeclaredMethod("setMemberFactories",
- new Class[]{FaceletCache.MemberFactory.class, FaceletCache.MemberFactory.class,
- FaceletCache.MemberFactory.class});
- setMemberFactoriesMethod.setAccessible(true);
- setMemberFactoriesMethod.invoke(_faceletCache, faceletFactory, viewMetadataFaceletFactory,
- compositeComponentMetadataFaceletFactory);
+ _abstractFaceletCache.setCacheFactories(faceletFactory,
+ viewMetadataFaceletFactory, compositeComponentMetadataFaceletFactory);
}
catch (Exception e)
{
@@ -170,10 +165,7 @@ public final class DefaultFaceletFactory
// the code first check for "suppressAccessChecks" permission).
try
{
- Method setMemberFactoriesMethod = FaceletCache.class.getDeclaredMethod("setMemberFactories",
- new Class[]{FaceletCache.MemberFactory.class, FaceletCache.MemberFactory.class});
- setMemberFactoriesMethod.setAccessible(true);
- setMemberFactoriesMethod.invoke(_faceletCache, faceletFactory, viewMetadataFaceletFactory);
+ _faceletCache.setCacheFactories(faceletFactory, viewMetadataFaceletFactory);
}
catch (Exception e)
{