You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/10/20 23:17:48 UTC
svn commit: r1025758 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java
Author: lu4242
Date: Wed Oct 20 21:17:48 2010
New Revision: 1025758
URL: http://svn.apache.org/viewvc?rev=1025758&view=rev
Log:
MYFACES-2951 [PERF] enhance scanning for #{cc} expressions (discard expressions just looking for a plain cc or cc.attrs)
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java?rev=1025758&r1=1025757&r2=1025758&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java Wed Oct 20 21:17:48 2010
@@ -72,6 +72,10 @@ public final class CompositeComponentELU
*/
public static final Pattern CC_ATTRS_METHOD_EXPRESSION_REGEX = Pattern.compile("[^\\(]*[^\\w\\.\\(]cc\\.attrs\\.[^\\.]*(\\(.*)?");
+ private static final String CC = "cc";
+
+ private static final String CC_ATTRS = "cc.attrs";
+
/**
* private constructor
*/
@@ -167,7 +171,14 @@ public final class CompositeComponentELU
*/
public static boolean isCompositeComponentExpression(String expression)
{
- return CC_EXPRESSION_REGEX.matcher(expression).matches();
+ if (expression.contains(CC))
+ {
+ return CC_EXPRESSION_REGEX.matcher(expression).matches();
+ }
+ else
+ {
+ return false;
+ }
}
/**
@@ -180,7 +191,14 @@ public final class CompositeComponentELU
*/
public static boolean isCompositeComponentAttrsMethodExpression(String expression)
{
- return CC_ATTRS_METHOD_EXPRESSION_REGEX.matcher(expression).matches();
+ if (expression.contains(CC_ATTRS))
+ {
+ return CC_ATTRS_METHOD_EXPRESSION_REGEX.matcher(expression).matches();
+ }
+ else
+ {
+ return false;
+ }
}
}