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 2017/09/05 20:55:59 UTC
svn commit: r1807404 - in
/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search:
SearchExpressionContextImpl.java SearchExpressionHandlerImpl.java
Author: tandraschko
Date: Tue Sep 5 20:55:59 2017
New Revision: 1807404
URL: http://svn.apache.org/viewvc?rev=1807404&view=rev
Log:
MYFACES-4075 use SharedStringBuilder + cosmetics
Modified:
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionContextImpl.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionHandlerImpl.java
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionContextImpl.java?rev=1807404&r1=1807403&r2=1807404&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionContextImpl.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionContextImpl.java Tue Sep 5 20:55:59 2017
@@ -26,17 +26,12 @@ import javax.faces.component.search.Sear
import javax.faces.component.visit.VisitHint;
import javax.faces.context.FacesContext;
-/**
- *
- */
public class SearchExpressionContextImpl extends SearchExpressionContext
{
private final FacesContext facesContext;
-
- private UIComponent source;
+ private UIComponent source;
private Set<VisitHint> visitHints;
-
private Set<SearchExpressionHint> expressionHints;
public SearchExpressionContextImpl(FacesContext facesContext)
@@ -44,60 +39,42 @@ public class SearchExpressionContextImpl
this.facesContext = facesContext;
}
- /**
- * @return the source
- */
+ @Override
public UIComponent getSource()
{
return source;
}
- /**
- * @param source the source to set
- */
public void setSource(UIComponent source)
{
this.source = source;
}
- /**
- * @return the visitHints
- */
+ @Override
public Set<VisitHint> getVisitHints()
{
return visitHints;
}
- /**
- * @param visitHints the visitHints to set
- */
public void setVisitHints(Set<VisitHint> visitHints)
{
this.visitHints = visitHints;
}
- /**
- * @return the expressionHints
- */
+ @Override
public Set<SearchExpressionHint> getExpressionHints()
{
return expressionHints;
}
- /**
- * @param expressionHints the expressionHints to set
- */
public void setExpressionHints(Set<SearchExpressionHint> expressionHints)
{
this.expressionHints = expressionHints;
}
- /**
- * @return the facesContext
- */
+ @Override
public FacesContext getFacesContext()
{
return facesContext;
}
-
}
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=1807404&r1=1807403&r2=1807404&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 Sep 5 20:55:59 2017
@@ -32,12 +32,14 @@ import javax.faces.component.search.Sear
import javax.faces.component.search.SearchExpressionHint;
import javax.faces.component.search.SearchKeywordContext;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.shared.renderkit.html.util.SharedStringBuilder;
/**
*
*/
public class SearchExpressionHandlerImpl extends SearchExpressionHandler
{
+ private static final String SB_SPLIT = SearchExpressionHandlerImpl.class.getName() + "#split";
protected void addHint(SearchExpressionContext searchExpressionContext, SearchExpressionHint hint)
{
@@ -385,8 +387,7 @@ public class SearchExpressionHandlerImpl
char separatorChar = facesContext.getNamingContainerSeparatorChar();
if (topExpression.charAt(0) == separatorChar)
{
- UIComponent findBase;
- findBase = SearchComponentUtils.getRootComponent(previous);
+ UIComponent findBase = SearchComponentUtils.getRootComponent(previous);
handler.invokeOnComponent(searchExpressionContext, findBase, topExpression.substring(1), topCallback);
return;
}
@@ -741,11 +742,11 @@ public class SearchExpressionHandlerImpl
public String[] splitExpressions(FacesContext context, String expressions)
{
// split expressions by blank or comma (and ignore blank and commas inside brackets)
- String[] splittedExpressions = split(expressions, EXPRESSION_SEPARATOR_CHARS);
+ String[] splittedExpressions = split(context, expressions, EXPRESSION_SEPARATOR_CHARS);
return splittedExpressions;
}
- private static String[] split(String value, char... separators)
+ private static String[] split(FacesContext context, String value, char... separators)
{
if (value == null)
{
@@ -753,7 +754,7 @@ public class SearchExpressionHandlerImpl
}
List<String> tokens = new ArrayList<String>();
- StringBuilder buffer = new StringBuilder();
+ StringBuilder buffer = SharedStringBuilder.get(context, SB_SPLIT);
int parenthesesCounter = 0;