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/08 16:21:14 UTC
svn commit: r1773265 - in /myfaces/core/branches/2.3.x:
api/src/main/java/javax/faces/component/search/
impl/src/main/java/org/apache/myfaces/component/search/
Author: tandraschko
Date: Thu Dec 8 16:21:14 2016
New Revision: 1773265
URL: http://svn.apache.org/viewvc?rev=1773265&view=rev
Log:
MYFACES-4075 SearchExpression API (removed unnecessary parameter)
Modified:
myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchKeywordContext.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/AllSearchKeywordResolver.java
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/CompositeComponentParentSearchKeywordResolver.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/FormSearchKeywordResolver.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/NamingContainerSearchKeywordResolver.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/ParentSearchKeywordResolver.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/ThisSearchKeywordResolver.java
Modified: myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchKeywordContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchKeywordContext.java?rev=1773265&r1=1773264&r2=1773265&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchKeywordContext.java (original)
+++ myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchKeywordContext.java Thu Dec 8 16:21:14 2016
@@ -49,11 +49,11 @@ public class SearchKeywordContext
return facesContext;
}
- public void invokeContextCallback(FacesContext context, UIComponent target)
+ public void invokeContextCallback(UIComponent target)
{
try
{
- this.getTopCallback().invokeContextCallback(context, target);
+ this.getTopCallback().invokeContextCallback(facesContext, target);
}
finally
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/AllSearchKeywordResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/AllSearchKeywordResolver.java?rev=1773265&r1=1773264&r2=1773265&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/AllSearchKeywordResolver.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/AllSearchKeywordResolver.java Thu Dec 8 16:21:14 2016
@@ -44,7 +44,7 @@ public class AllSearchKeywordResolver ex
parent = parent.getParent();
}
- expressionContext.invokeContextCallback(expressionContext.getFacesContext(), parent);
+ expressionContext.invokeContextCallback(parent);
}
}
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=1773265&r1=1773264&r2=1773265&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 Thu Dec 8 16:21:14 2016
@@ -71,8 +71,7 @@ public class ChildSearchKeywordResolver
}
if (count == childNumber + 1)
{
- expressionContext.invokeContextCallback(expressionContext.getFacesContext(),
- last.getChildren().get(childNumber));
+ expressionContext.invokeContextCallback(last.getChildren().get(childNumber));
break;
}
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/CompositeComponentParentSearchKeywordResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/CompositeComponentParentSearchKeywordResolver.java?rev=1773265&r1=1773264&r2=1773265&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/CompositeComponentParentSearchKeywordResolver.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/CompositeComponentParentSearchKeywordResolver.java Thu Dec 8 16:21:14 2016
@@ -36,8 +36,7 @@ public class CompositeComponentParentSea
{
if (command != null && command.equalsIgnoreCase(COMPOSITE_KEYWORD))
{
- expressionContext.invokeContextCallback(expressionContext.getFacesContext(),
- UIComponent.getCompositeComponentParent(last));
+ expressionContext.invokeContextCallback(UIComponent.getCompositeComponentParent(last));
}
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/FormSearchKeywordResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/FormSearchKeywordResolver.java?rev=1773265&r1=1773264&r2=1773265&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/FormSearchKeywordResolver.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/FormSearchKeywordResolver.java Thu Dec 8 16:21:14 2016
@@ -38,7 +38,7 @@ public class FormSearchKeywordResolver e
{
if (command != null && command.equalsIgnoreCase(FORM_KEYWORD))
{
- expressionContext.invokeContextCallback(expressionContext.getFacesContext(), closest(UIForm.class, last));
+ expressionContext.invokeContextCallback(closest(UIForm.class, last));
}
}
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=1773265&r1=1773264&r2=1773265&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 Thu Dec 8 16:21:14 2016
@@ -70,8 +70,7 @@ public class IdSearchKeywordResolver ext
{
if (targetId.equals(target.getId()))
{
- expressionContext.invokeContextCallback(
- expressionContext.getFacesContext(), target);
+ expressionContext.invokeContextCallback(target);
return VisitResult.COMPLETE;
}
else
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/NamingContainerSearchKeywordResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/NamingContainerSearchKeywordResolver.java?rev=1773265&r1=1773264&r2=1773265&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/NamingContainerSearchKeywordResolver.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/NamingContainerSearchKeywordResolver.java Thu Dec 8 16:21:14 2016
@@ -37,8 +37,7 @@ public class NamingContainerSearchKeywor
{
if (command != null && command.equalsIgnoreCase(NAMING_CONTAINER_KEYWORD))
{
- expressionContext.invokeContextCallback(expressionContext.getFacesContext(),
- (UIComponent) closest(NamingContainer.class, last));
+ expressionContext.invokeContextCallback((UIComponent) closest(NamingContainer.class, last));
}
}
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=1773265&r1=1773264&r2=1773265&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 Thu Dec 8 16:21:14 2016
@@ -58,8 +58,7 @@ public class NextSearchKeywordResolver e
if (nextIndex != -1)
{
- expressionContext.invokeContextCallback(expressionContext.getFacesContext(),
- children.get(nextIndex));
+ expressionContext.invokeContextCallback(children.get(nextIndex));
}
}
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/ParentSearchKeywordResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/ParentSearchKeywordResolver.java?rev=1773265&r1=1773264&r2=1773265&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/ParentSearchKeywordResolver.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/ParentSearchKeywordResolver.java Thu Dec 8 16:21:14 2016
@@ -36,7 +36,7 @@ public class ParentSearchKeywordResolver
{
if (command != null && command.equalsIgnoreCase(PARENT_KEYWORD))
{
- expressionContext.invokeContextCallback(expressionContext.getFacesContext(), last.getParent());
+ expressionContext.invokeContextCallback(last.getParent());
}
}
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=1773265&r1=1773264&r2=1773265&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 Thu Dec 8 16:21:14 2016
@@ -59,8 +59,7 @@ public class PreviousSearchKeywordResolv
if (nextIndex != -1)
{
- expressionContext.invokeContextCallback(
- expressionContext.getFacesContext(), children.get(nextIndex));
+ expressionContext.invokeContextCallback(children.get(nextIndex));
}
}
}
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=1773265&r1=1773264&r2=1773265&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 Thu Dec 8 16:21:14 2016
@@ -36,8 +36,7 @@ public class RootSearchKeywordResolver e
{
if (command != null && command.equalsIgnoreCase(ROOT_KEYWORD))
{
- expressionContext.invokeContextCallback(expressionContext.getFacesContext(),
- expressionContext.getFacesContext().getViewRoot());
+ expressionContext.invokeContextCallback(expressionContext.getFacesContext().getViewRoot());
}
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/ThisSearchKeywordResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/ThisSearchKeywordResolver.java?rev=1773265&r1=1773264&r2=1773265&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/ThisSearchKeywordResolver.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/ThisSearchKeywordResolver.java Thu Dec 8 16:21:14 2016
@@ -36,7 +36,7 @@ public class ThisSearchKeywordResolver e
{
if (command != null && command.equalsIgnoreCase(THIS_KEYWORD))
{
- expressionContext.invokeContextCallback(expressionContext.getFacesContext(), last);
+ expressionContext.invokeContextCallback(last);
}
}