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 2013/11/27 02:26:03 UTC
svn commit: r1545903 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui:
CompositionHandler.java DecorateHandler.java IncludeHandler.java
Author: lu4242
Date: Wed Nov 27 01:26:02 2013
New Revision: 1545903
URL: http://svn.apache.org/r1545903
Log:
MYFACES-3825 - [perf] Cache EL expressions using an indirection for ui:param and user tag attributes ( do not start an unique id section, instead just use one identifier)
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java?rev=1545903&r1=1545902&r2=1545903&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java Wed Nov 27 01:26:02 2013
@@ -137,7 +137,7 @@ public final class CompositionHandler ex
actx.extendClient(this);
if (_params != null)
{
- String uniqueId = fcc.startComponentUniqueIdSection();
+ String uniqueId = fcc.generateUniqueComponentId();
//VariableMapper vm = new VariableMapperWrapper(orig);
//ctx.setVariableMapper(vm);
for (int i = 0; i < _params.length; i++)
@@ -154,10 +154,6 @@ public final class CompositionHandler ex
{
actx.popExtendedClient(this);
//ctx.setVariableMapper(orig);
- if (_params != null)
- {
- fcc.endComponentUniqueIdSection();
- }
}
}
else
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java?rev=1545903&r1=1545902&r2=1545903&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java Wed Nov 27 01:26:02 2013
@@ -137,10 +137,14 @@ public final class DecorateHandler exten
actx.pushClient(this);
FaceletCompositionContext fcc = FaceletCompositionContext.getCurrentInstance(ctx);
String uniqueId = null;
- if (!_template.isLiteral() || _params != null)
+ if (!_template.isLiteral())
{
uniqueId = fcc.startComponentUniqueIdSection();
}
+ else if (_params != null)
+ {
+ uniqueId = fcc.generateUniqueComponentId();
+ }
if (_params != null)
{
@@ -231,7 +235,7 @@ public final class DecorateHandler exten
//ctx.setVariableMapper(orig);
actx.popClient(this);
}
- if (!_template.isLiteral() || _params != null)
+ if (!_template.isLiteral())
{
fcc.endComponentUniqueIdSection();
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java?rev=1545903&r1=1545902&r2=1545903&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java Wed Nov 27 01:26:02 2013
@@ -115,10 +115,14 @@ public final class IncludeHandler extend
String path;
boolean markInitialState = false;
String uniqueId = null;
- if (!src.isLiteral() || _params != null)
+ if (!src.isLiteral())
{
uniqueId = fcc.startComponentUniqueIdSection();
}
+ else if (_params != null)
+ {
+ uniqueId = fcc.generateUniqueComponentId();
+ }
if (!src.isLiteral())
{
//String uniqueId = fcc.startComponentUniqueIdSection();
@@ -253,7 +257,7 @@ public final class IncludeHandler extend
}
finally
{
- if (!src.isLiteral() || _params != null)
+ if (!src.isLiteral())
{
fcc.endComponentUniqueIdSection();
}