ebreijo closed pull request #1: MYFACES-4231 Update
SearchExpressionContextFactory and FaceletCache s…
URL: https://github.com/apache/myfaces/pull/1
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/api/src/main/java/javax/faces/component/search/SearchExpressionContextFactory.java
b/api/src/main/java/javax/faces/component/search/SearchExpressionContextFactory.java
index 76ab1121d..0bdaf4563 100644
---
a/api/src/main/java/javax/faces/component/search/SearchExpressionContextFactory.java
+++
b/api/src/main/java/javax/faces/component/search/SearchExpressionContextFactory.java
@@ -31,10 +31,6 @@
{
private SearchExpressionContextFactory delegate;
- public SearchExpressionContextFactory()
- {
- }
-
public SearchExpressionContextFactory(SearchExpressionContextFactory
delegate)
{
this.delegate = delegate;
@@ -44,5 +40,8 @@ public abstract SearchExpressionContext
getSearchExpressionContext(
FacesContext context, UIComponent source,
Set<SearchExpressionHint> expressionHints, Set<VisitHint>
visitHints);
- public abstract SearchExpressionContextFactory getWrapped();
+ public SearchExpressionContextFactory getWrapped()
+ {
+ return this.delegate;
+ }
}
diff --git a/api/src/main/java/javax/faces/view/facelets/FaceletCache.java
b/api/src/main/java/javax/faces/view/facelets/FaceletCache.java
index 8a1e08dd1..fa4c15788 100644
--- a/api/src/main/java/javax/faces/view/facelets/FaceletCache.java
+++ b/api/src/main/java/javax/faces/view/facelets/FaceletCache.java
@@ -38,6 +38,7 @@
public abstract boolean isViewMetadataFaceletCached(URL url);
+ @Deprecated
protected void setMemberFactories(FaceletCache.MemberFactory<V>
faceletFactory,
FaceletCache.MemberFactory<V>
viewMetadataFaceletFactory)
{
diff --git
a/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionContextFactoryImpl.java
b/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionContextFactoryImpl.java
index 11509d4c2..e79457163 100644
---
a/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionContextFactoryImpl.java
+++
b/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionContextFactoryImpl.java
@@ -34,6 +34,16 @@
public class SearchExpressionContextFactoryImpl extends
SearchExpressionContextFactory
{
+ public SearchExpressionContextFactoryImpl()
+ {
+ super(null);
+ }
+
+ public SearchExpressionContextFactoryImpl(SearchExpressionContextFactory
delegate)
+ {
+ super(delegate);
+ }
+
@Override
public SearchExpressionContext getSearchExpressionContext(
FacesContext context, UIComponent source,
@@ -47,10 +57,4 @@ public SearchExpressionContext getSearchExpressionContext(
return searchExpressionContext;
}
- @Override
- public SearchExpressionContextFactory getWrapped()
- {
- return null;
- }
-
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
