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/13 13:04:03 UTC
svn commit: r1774006 - 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: Tue Dec 13 13:04:03 2016
New Revision: 1774006
URL: http://svn.apache.org/viewvc?rev=1774006&view=rev
Log:
MYFACES-4075 SearchExpression API (renamed "last" parameters to "previous", removed unused methods, added @Override)
Modified:
myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchExpressionHandler.java
myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchExpressionHandlerWrapper.java
myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchKeywordResolver.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/CompositeSearchKeywordResolver.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/NoneSearchKeywordResolver.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/SearchExpressionHandlerImpl.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/SearchExpressionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchExpressionHandler.java?rev=1774006&r1=1774005&r2=1774006&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchExpressionHandler.java (original)
+++ myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchExpressionHandler.java Tue Dec 13 13:04:03 2016
@@ -52,7 +52,7 @@ public abstract class SearchExpressionHa
}
public abstract void invokeOnComponent(SearchExpressionContext searchExpressionContext,
- UIComponent last, String expression, ContextCallback topCallback);
+ UIComponent previous, String expression, ContextCallback topCallback);
public abstract String[] splitExpressions(String expressions);
Modified: myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchExpressionHandlerWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchExpressionHandlerWrapper.java?rev=1774006&r1=1774005&r2=1774006&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchExpressionHandlerWrapper.java (original)
+++ myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchExpressionHandlerWrapper.java Tue Dec 13 13:04:03 2016
@@ -67,9 +67,9 @@ public abstract class SearchExpressionHa
@Override
public void invokeOnComponent(SearchExpressionContext searchExpressionContext,
- UIComponent last, String expression, ContextCallback topCallback)
+ UIComponent previous, String expression, ContextCallback topCallback)
{
- getWrapped().invokeOnComponent(searchExpressionContext, last, expression, topCallback);
+ getWrapped().invokeOnComponent(searchExpressionContext, previous, expression, topCallback);
}
@Override
Modified: myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchKeywordResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchKeywordResolver.java?rev=1774006&r1=1774005&r2=1774006&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchKeywordResolver.java (original)
+++ myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/component/search/SearchKeywordResolver.java Tue Dec 13 13:04:03 2016
@@ -27,7 +27,7 @@ import javax.faces.component.UIComponent
public abstract class SearchKeywordResolver
{
- public abstract void resolve(SearchKeywordContext keywordContext, UIComponent last, String command);
+ public abstract void resolve(SearchKeywordContext keywordContext, UIComponent previous, String command);
/**
* Check if the keyword can be resolved by the current resolver
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=1774006&r1=1774005&r2=1774006&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 Tue Dec 13 13:04:03 2016
@@ -33,11 +33,11 @@ public class AllSearchKeywordResolver ex
public static final String ALL_KEYWORD = "all";
@Override
- public void resolve(SearchKeywordContext expressionContext, UIComponent last, String command)
+ public void resolve(SearchKeywordContext expressionContext, UIComponent previous, String command)
{
if (command != null && command.equalsIgnoreCase(ALL_KEYWORD))
{
- UIComponent parent = last.getParent();
+ UIComponent parent = previous.getParent();
while (parent.getParent() != null)
{
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=1774006&r1=1774005&r2=1774006&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 13 13:04:03 2016
@@ -39,7 +39,7 @@ public class ChildSearchKeywordResolver
private static final Pattern PATTERN = Pattern.compile("child\\((\\d+)\\)");
@Override
- public void resolve(SearchKeywordContext expressionContext, UIComponent last, String command)
+ public void resolve(SearchKeywordContext expressionContext, UIComponent previous, String command)
{
if (command != null && command.length() > 6 &&
command.substring(0, CHILD_KEYWORD.length()).equalsIgnoreCase(CHILD_KEYWORD))
@@ -53,17 +53,17 @@ public class ChildSearchKeywordResolver
int childNumber = Integer.parseInt(matcher.group(1));
- if (childNumber + 1 > last.getChildCount())
+ if (childNumber + 1 > previous.getChildCount())
{
throw new FacesException("Component with clientId \""
- + last.getClientId(expressionContext.getFacesContext())
+ + previous.getClientId(expressionContext.getFacesContext())
+ "\" has fewer children as \"" +
childNumber + "\". Expression: \"" + command + "\"");
}
- List<UIComponent> list = last.getChildren();
+ List<UIComponent> list = previous.getChildren();
int count = 0;
- for (int i = 0; i < last.getChildCount(); i++)
+ for (int i = 0; i < previous.getChildCount(); i++)
{
if (! (list.get(i) instanceof Markup))
{
@@ -71,14 +71,14 @@ public class ChildSearchKeywordResolver
}
if (count == childNumber + 1)
{
- expressionContext.invokeContextCallback(last.getChildren().get(childNumber));
+ expressionContext.invokeContextCallback(previous.getChildren().get(childNumber));
break;
}
}
if (count < childNumber)
{
throw new FacesException("Component with clientId \""
- + last.getClientId(expressionContext.getFacesContext())
+ + previous.getClientId(expressionContext.getFacesContext())
+ "\" has fewer children as \"" +
childNumber + "\". Expression: \"" + command + "\"");
}
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=1774006&r1=1774005&r2=1774006&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 Tue Dec 13 13:04:03 2016
@@ -32,11 +32,11 @@ public class CompositeComponentParentSea
public static final String COMPOSITE_KEYWORD = "composite";
@Override
- public void resolve(SearchKeywordContext expressionContext, UIComponent last, String command)
+ public void resolve(SearchKeywordContext expressionContext, UIComponent previous, String command)
{
if (command != null && command.equalsIgnoreCase(COMPOSITE_KEYWORD))
{
- expressionContext.invokeContextCallback(UIComponent.getCompositeComponentParent(last));
+ expressionContext.invokeContextCallback(UIComponent.getCompositeComponentParent(previous));
}
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/CompositeSearchKeywordResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/CompositeSearchKeywordResolver.java?rev=1774006&r1=1774005&r2=1774006&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/CompositeSearchKeywordResolver.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/CompositeSearchKeywordResolver.java Tue Dec 13 13:04:03 2016
@@ -56,7 +56,7 @@ public class CompositeSearchKeywordResol
}
@Override
- public void resolve(SearchKeywordContext context, UIComponent last, String command)
+ public void resolve(SearchKeywordContext context, UIComponent previous, String command)
{
context.setCommandResolved(false);
int sz = this.size;
@@ -64,7 +64,7 @@ public class CompositeSearchKeywordResol
{
if (this.resolvers[i].matchKeyword(context.getSearchExpressionContext(), command))
{
- this.resolvers[i].resolve(context, last, command);
+ this.resolvers[i].resolve(context, previous, command);
if (context.isCommandResolved())
{
return;
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=1774006&r1=1774005&r2=1774006&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 Tue Dec 13 13:04:03 2016
@@ -34,11 +34,11 @@ public class FormSearchKeywordResolver e
public static final String FORM_KEYWORD = "form";
@Override
- public void resolve(SearchKeywordContext expressionContext, UIComponent last, String command)
+ public void resolve(SearchKeywordContext expressionContext, UIComponent previous, String command)
{
if (command != null && command.equalsIgnoreCase(FORM_KEYWORD))
{
- expressionContext.invokeContextCallback(closest(UIForm.class, last));
+ expressionContext.invokeContextCallback(closest(UIForm.class, previous));
}
}
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=1774006&r1=1774005&r2=1774006&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 13 13:04:03 2016
@@ -43,7 +43,7 @@ public class IdSearchKeywordResolver ext
private static final Pattern PATTERN = Pattern.compile("id\\((\\w+)\\)");
@Override
- public void resolve(SearchKeywordContext expressionContext, UIComponent last, String command)
+ public void resolve(SearchKeywordContext expressionContext, UIComponent previous, String command)
{
if (command != null && command.length() > 4
&& command.substring(0, 2).equalsIgnoreCase(ID_KEYWORD) && command.charAt(2) == '(')
@@ -55,12 +55,12 @@ 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, last, expressionContext.getTopCallback());
+ withId(expressionContext.getFacesContext(), targetId, previous, expressionContext.getTopCallback());
expressionContext.setCommandResolved(true);
}
else
{
- last.visitTree(
+ previous.visitTree(
VisitContext.createVisitContext(expressionContext.getFacesContext(), null,
expressionContext.getSearchExpressionContext().getVisitHints()),
new VisitCallback()
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=1774006&r1=1774005&r2=1774006&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 Tue Dec 13 13:04:03 2016
@@ -33,11 +33,11 @@ public class NamingContainerSearchKeywor
public static final String NAMING_CONTAINER_KEYWORD = "namingcontainer";
@Override
- public void resolve(SearchKeywordContext expressionContext, UIComponent last, String command)
+ public void resolve(SearchKeywordContext expressionContext, UIComponent previous, String command)
{
if (command != null && command.equalsIgnoreCase(NAMING_CONTAINER_KEYWORD))
{
- expressionContext.invokeContextCallback((UIComponent) closest(NamingContainer.class, last));
+ expressionContext.invokeContextCallback((UIComponent) closest(NamingContainer.class, previous));
}
}
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=1774006&r1=1774005&r2=1774006&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 13 13:04:03 2016
@@ -34,15 +34,15 @@ public class NextSearchKeywordResolver e
public static final String NEXT_KEYWORD = "next";
@Override
- public void resolve(SearchKeywordContext expressionContext, UIComponent last, String command)
+ public void resolve(SearchKeywordContext expressionContext, UIComponent previous, String command)
{
if (command != null && command.equalsIgnoreCase(NEXT_KEYWORD))
{
- UIComponent parent = last.getParent();
+ UIComponent parent = previous.getParent();
if (parent.getChildCount() > 1)
{
List<UIComponent> children = parent.getChildren();
- int index = children.indexOf(last);
+ int index = children.indexOf(previous);
if (index < parent.getChildCount() - 1)
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/NoneSearchKeywordResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/NoneSearchKeywordResolver.java?rev=1774006&r1=1774005&r2=1774006&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/NoneSearchKeywordResolver.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/NoneSearchKeywordResolver.java Tue Dec 13 13:04:03 2016
@@ -33,7 +33,7 @@ public class NoneSearchKeywordResolver e
public static final String NONE_KEYWORD = "none";
@Override
- public void resolve(SearchKeywordContext expressionContext, UIComponent last, String command)
+ public void resolve(SearchKeywordContext expressionContext, UIComponent previous, String command)
{
if (command != null && command.equalsIgnoreCase(NONE_KEYWORD))
{
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=1774006&r1=1774005&r2=1774006&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 Tue Dec 13 13:04:03 2016
@@ -32,11 +32,11 @@ public class ParentSearchKeywordResolver
public static final String PARENT_KEYWORD = "parent";
@Override
- public void resolve(SearchKeywordContext expressionContext, UIComponent last, String command)
+ public void resolve(SearchKeywordContext expressionContext, UIComponent previous, String command)
{
if (command != null && command.equalsIgnoreCase(PARENT_KEYWORD))
{
- expressionContext.invokeContextCallback(last.getParent());
+ expressionContext.invokeContextCallback(previous.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=1774006&r1=1774005&r2=1774006&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 13 13:04:03 2016
@@ -34,16 +34,16 @@ public class PreviousSearchKeywordResolv
public static final String PREVIOUS_KEYWORD = "previous";
@Override
- public void resolve(SearchKeywordContext expressionContext, UIComponent last, String command)
+ public void resolve(SearchKeywordContext expressionContext, UIComponent previous, String command)
{
if (command != null && command.equalsIgnoreCase(PREVIOUS_KEYWORD))
{
- UIComponent parent = last.getParent();
+ UIComponent parent = previous.getParent();
if (parent.getChildCount() > 1)
{
List<UIComponent> children = parent.getChildren();
- int index = children.indexOf(last);
+ int index = children.indexOf(previous);
if (index > 0)
{
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=1774006&r1=1774005&r2=1774006&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 13 13:04:03 2016
@@ -32,7 +32,7 @@ public class RootSearchKeywordResolver e
public static final String ROOT_KEYWORD = "root";
@Override
- public void resolve(SearchKeywordContext expressionContext, UIComponent last, String command)
+ public void resolve(SearchKeywordContext expressionContext, UIComponent previous, String command)
{
if (command != null && command.equalsIgnoreCase(ROOT_KEYWORD))
{
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=1774006&r1=1774005&r2=1774006&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 13 13:04:03 2016
@@ -40,6 +40,7 @@ import javax.faces.context.FacesContext;
public class SearchExpressionHandlerImpl extends SearchExpressionHandler
{
+ @Override
public String resolveClientId(SearchExpressionContext searchExpressionContext, String expression)
{
FacesContext facesContext = searchExpressionContext.getFacesContext();
@@ -101,6 +102,7 @@ public class SearchExpressionHandlerImpl
}
}
+ @Override
public List<String> resolveClientIds(SearchExpressionContext searchExpressionContext,
String expressions)
{
@@ -177,6 +179,7 @@ public class SearchExpressionHandlerImpl
}
}
+ @Override
public void resolveComponent(SearchExpressionContext searchExpressionContext, String expression,
ContextCallback callback)
{
@@ -239,6 +242,7 @@ public class SearchExpressionHandlerImpl
}
}
+ @Override
public void resolveComponents(SearchExpressionContext searchExpressionContext, String expressions,
ContextCallback callback)
{
@@ -302,13 +306,14 @@ public class SearchExpressionHandlerImpl
}
}
+ @Override
public void invokeOnComponent(final SearchExpressionContext searchExpressionContext,
- UIComponent last, String topExpression, ContextCallback topCallback)
+ UIComponent previous, String topExpression, ContextCallback topCallback)
{
// Command pattern to apply the keyword or command to the base and then invoke the callback
FacesContext facesContext = searchExpressionContext.getFacesContext();
- UIComponent currentBase = last;
+ UIComponent currentBase = previous;
//Step 1: find base
// Case ':' (root)
@@ -473,6 +478,7 @@ public class SearchExpressionHandlerImpl
.getSearchKeywordResolver().resolve(searchContext, last, command);
}
+ @Override
public boolean isPassthroughExpression(SearchExpressionContext searchExpressionContext, String topExpression)
{
FacesContext facesContext = searchExpressionContext.getFacesContext();
@@ -607,105 +613,6 @@ public class SearchExpressionHandlerImpl
return isValid;
}
- private static String[] splitSingleExpression(String value)
- {
- if (value == null)
- {
- return null;
- }
-
- List<String> tokens = new ArrayList<String>();
- StringBuilder buffer = new StringBuilder();
-
- int parenthesesCounter = 0;
-
- char[] charArray = value.toCharArray();
-
- for (int i = 0; i < charArray.length; i++)
- {
- char c = charArray[i];
- if (c == '(')
- {
- parenthesesCounter++;
- }
-
- if (c == ')')
- {
- parenthesesCounter--;
- }
-
- if (parenthesesCounter == 0)
- {
- boolean isSeparator = false;
-
- if (c == ':')
- {
- for (int j = i+1; j < charArray.length; j++)
- {
- if (charArray[j] == '@')
- {
- isSeparator = true;
- break;
- }
- else if (Character.isAlphabetic(charArray[j]))
- {
- //Different char than @
- break;
- }
- }
- }
-
- if (isSeparator)
- {
- // lets add token inside buffer to our tokens
- tokens.add(buffer.toString());
- // now we need to clear buffer
- buffer.delete(0, buffer.length());
- }
- else
- {
- buffer.append(c);
- }
- }
- else
- {
- buffer.append(c);
- }
- }
-
- // lets not forget about part after the separator
- tokens.add(buffer.toString());
-
- return tokens.toArray(new String[tokens.size()]);
- }
-
- private static class ComponentExistsContextCallback implements ContextCallback
- {
- private boolean found;
-
- /**
- * @return the found
- */
- public boolean isFound()
- {
- return found;
- }
-
- /**
- * @param found the found to set
- */
- public void setFound(boolean found)
- {
- this.found = found;
- }
-
- @Override
- public void invokeContextCallback(FacesContext context, UIComponent target)
- {
- found = true;
- }
- }
-
private static String extractKeyword(String expression, int startIndex, char separatorChar)
{
int parenthesesCounter = -1;
@@ -750,6 +657,7 @@ public class SearchExpressionHandlerImpl
}
}
+ @Override
public String[] splitExpressions(String expressions)
{
// split expressions by blank or comma (and ignore blank and commas inside brackets)
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=1774006&r1=1774005&r2=1774006&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 Tue Dec 13 13:04:03 2016
@@ -32,11 +32,11 @@ public class ThisSearchKeywordResolver e
public static final String THIS_KEYWORD = "this";
@Override
- public void resolve(SearchKeywordContext expressionContext, UIComponent last, String command)
+ public void resolve(SearchKeywordContext expressionContext, UIComponent previous, String command)
{
if (command != null && command.equalsIgnoreCase(THIS_KEYWORD))
{
- expressionContext.invokeContextCallback(last);
+ expressionContext.invokeContextCallback(previous);
}
}