You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2016/12/27 21:11:15 UTC
svn commit: r1776196 - in
/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces:
component/search/ view/facelets/compiler/
Author: tandraschko
Date: Tue Dec 27 21:11:15 2016
New Revision: 1776196
URL: http://svn.apache.org/viewvc?rev=1776196&view=rev
Log:
MYFACES-4075 SearchExpression API (applied api changes)
Modified:
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/ChildSearchKeywordResolver.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/IdSearchKeywordResolver.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/NextSearchKeywordResolver.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/PreviousSearchKeywordResolver.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/RootSearchKeywordResolver.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionHandlerImpl.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/ChildSearchKeywordResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/ChildSearchKeywordResolver.java?rev=1776196&r1=1776195&r2=1776196&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/ChildSearchKeywordResolver.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/ChildSearchKeywordResolver.java Tue Dec 27 21:11:15 2016
@@ -23,7 +23,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
-import javax.faces.component.search.Markup;
+import javax.faces.component.search.UntargetableComponent;
import javax.faces.component.search.SearchExpressionContext;
import javax.faces.component.search.SearchKeywordContext;
import javax.faces.component.search.SearchKeywordResolver;
@@ -53,7 +53,7 @@ public class ChildSearchKeywordResolver
if (childNumber + 1 > previous.getChildCount())
{
throw new FacesException("Component with clientId \""
- + previous.getClientId(expressionContext.getFacesContext())
+ + previous.getClientId(expressionContext.getSearchExpressionContext().getFacesContext())
+ "\" has fewer children as \"" +
childNumber + "\". Expression: \"" + command + "\"");
}
@@ -62,7 +62,7 @@ public class ChildSearchKeywordResolver
int count = 0;
for (int i = 0; i < previous.getChildCount(); i++)
{
- if (! (list.get(i) instanceof Markup))
+ if (! (list.get(i) instanceof UntargetableComponent))
{
count++;
}
@@ -75,7 +75,7 @@ public class ChildSearchKeywordResolver
if (count < childNumber)
{
throw new FacesException("Component with clientId \""
- + previous.getClientId(expressionContext.getFacesContext())
+ + previous.getClientId(expressionContext.getSearchExpressionContext().getFacesContext())
+ "\" has fewer children as \"" +
childNumber + "\". Expression: \"" + command + "\"");
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/IdSearchKeywordResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/IdSearchKeywordResolver.java?rev=1776196&r1=1776195&r2=1776196&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/IdSearchKeywordResolver.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/IdSearchKeywordResolver.java Tue Dec 27 21:11:15 2016
@@ -45,6 +45,8 @@ public class IdSearchKeywordResolver ext
@Override
public void resolve(SearchKeywordContext expressionContext, UIComponent previous, String command)
{
+ FacesContext facesContext = expressionContext.getSearchExpressionContext().getFacesContext();
+
final String targetId = extractId(command);
if (expressionContext.getSearchExpressionContext().getExpressionHints() != null
&& expressionContext.getSearchExpressionContext().getExpressionHints().contains(
@@ -52,13 +54,13 @@ public class IdSearchKeywordResolver ext
{
// Avoid visit tree because in this case we need real component instances.
// This means components inside UIData will not be scanned.
- withId(expressionContext.getFacesContext(), targetId, previous, expressionContext.getTopCallback());
+ withId(facesContext, targetId, previous, expressionContext.getCallback());
expressionContext.setCommandResolved(true);
}
else
{
previous.visitTree(
- VisitContext.createVisitContext(expressionContext.getFacesContext(), null,
+ VisitContext.createVisitContext(facesContext, null,
expressionContext.getSearchExpressionContext().getVisitHints()),
new VisitCallback()
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/NextSearchKeywordResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/NextSearchKeywordResolver.java?rev=1776196&r1=1776195&r2=1776196&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/NextSearchKeywordResolver.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/NextSearchKeywordResolver.java Tue Dec 27 21:11:15 2016
@@ -21,7 +21,7 @@ package org.apache.myfaces.component.sea
import java.util.List;
import javax.faces.component.UIComponent;
-import javax.faces.component.search.Markup;
+import javax.faces.component.search.UntargetableComponent;
import javax.faces.component.search.SearchExpressionContext;
import javax.faces.component.search.SearchKeywordContext;
import javax.faces.component.search.SearchKeywordResolver;
@@ -48,7 +48,7 @@ public class NextSearchKeywordResolver e
do
{
index++;
- if(!(children.get(index) instanceof Markup))
+ if(!(children.get(index) instanceof UntargetableComponent))
{
nextIndex = index;
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/PreviousSearchKeywordResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/PreviousSearchKeywordResolver.java?rev=1776196&r1=1776195&r2=1776196&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/PreviousSearchKeywordResolver.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/PreviousSearchKeywordResolver.java Tue Dec 27 21:11:15 2016
@@ -21,7 +21,7 @@ package org.apache.myfaces.component.sea
import java.util.List;
import javax.faces.component.UIComponent;
-import javax.faces.component.search.Markup;
+import javax.faces.component.search.UntargetableComponent;
import javax.faces.component.search.SearchExpressionContext;
import javax.faces.component.search.SearchKeywordContext;
import javax.faces.component.search.SearchKeywordResolver;
@@ -49,7 +49,7 @@ public class PreviousSearchKeywordResolv
do
{
index--;
- if(!(children.get(index) instanceof Markup))
+ if(!(children.get(index) instanceof UntargetableComponent))
{
nextIndex = index;
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/RootSearchKeywordResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/RootSearchKeywordResolver.java?rev=1776196&r1=1776195&r2=1776196&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/RootSearchKeywordResolver.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/RootSearchKeywordResolver.java Tue Dec 27 21:11:15 2016
@@ -34,7 +34,8 @@ public class RootSearchKeywordResolver e
@Override
public void resolve(SearchKeywordContext expressionContext, UIComponent previous, String command)
{
- expressionContext.invokeContextCallback(expressionContext.getFacesContext().getViewRoot());
+ expressionContext.invokeContextCallback(
+ expressionContext.getSearchExpressionContext().getFacesContext().getViewRoot());
}
@Override
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionHandlerImpl.java?rev=1776196&r1=1776195&r2=1776196&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionHandlerImpl.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionHandlerImpl.java Tue Dec 27 21:11:15 2016
@@ -493,9 +493,7 @@ public class SearchExpressionHandlerImpl
String command, String remainingExpression, ContextCallback topCallback)
{
// take the command and resolve it using the chain of responsibility pattern.
- SearchKeywordContext searchContext = new SearchKeywordContext(searchExpressionContext.getFacesContext());
- searchContext.setSearchExpressionContext(searchExpressionContext);
- searchContext.setTopCallback(topCallback);
+ SearchKeywordContext searchContext = new SearchKeywordContext(searchExpressionContext, topCallback);
searchContext.setRemainingExpression(remainingExpression);
searchExpressionContext.getFacesContext().getApplication()
.getSearchKeywordResolver().resolve(searchContext, last, command);
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java?rev=1776196&r1=1776195&r2=1776196&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java Tue Dec 27 21:11:15 2016
@@ -33,7 +33,7 @@ import javax.faces.component.ContextCall
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
import javax.faces.component.UniqueIdVendor;
-import javax.faces.component.search.Markup;
+import javax.faces.component.search.UntargetableComponent;
import javax.faces.component.visit.VisitCallback;
import javax.faces.component.visit.VisitContext;
import javax.faces.context.FacesContext;
@@ -48,7 +48,7 @@ import javax.faces.view.Location;
import org.apache.commons.collections.iterators.EmptyIterator;
import org.apache.myfaces.view.facelets.tag.jsf.ComponentSupport;
-class UILeaf extends UIComponent implements Markup, Map<String, Object>
+class UILeaf extends UIComponent implements UntargetableComponent, Map<String, Object>
{
//-------------- START TAKEN FROM UIComponentBase ----------------
private static final String _STRING_BUILDER_KEY