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 2012/09/03 00:44:57 UTC
svn commit: r1380081 - in
/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler:
AbstractUIHandler.java UIInstructionHandler.java
Author: lu4242
Date: Sun Sep 2 22:44:57 2012
New Revision: 1380081
URL: http://svn.apache.org/viewvc?rev=1380081&view=rev
Log:
MYFACES-3600 Prevent create additional facet panel when html markup is used
Modified:
myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/AbstractUIHandler.java
myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIInstructionHandler.java
Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/AbstractUIHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/AbstractUIHandler.java?rev=1380081&r1=1380080&r2=1380081&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/AbstractUIHandler.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/AbstractUIHandler.java Sun Sep 2 22:44:57 2012
@@ -29,6 +29,13 @@ import org.apache.myfaces.view.facelets.
public abstract class AbstractUIHandler implements FaceletHandler, TextHandler
{
+ /**
+ * @param ctx
+ * @param parent
+ * @param c
+ * @deprecated
+ */
+ @Deprecated
public void addComponent(FaceletContext ctx, UIComponent parent, UIComponent c)
{
// possible facet scoped
Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIInstructionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIInstructionHandler.java?rev=1380081&r1=1380080&r2=1380081&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIInstructionHandler.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UIInstructionHandler.java Sun Sep 2 22:44:57 2012
@@ -81,6 +81,8 @@ final class UIInstructionHandler extends
{
if (parent != null)
{
+ String facetName = this.getFacetName(ctx, parent);
+
// our id
String id = ctx.generateUniqueId(this.id);
@@ -154,7 +156,14 @@ final class UIInstructionHandler extends
{
ctx.getFacesContext().setProcessingEvents(false);
}
- parent.getChildren().remove(c);
+ if (facetName == null)
+ {
+ parent.getChildren().remove(c);
+ }
+ else
+ {
+ ComponentSupport.removeFacet(ctx, parent, c, facetName);
+ }
if (mctx.isRefreshingSection())
{
ctx.getFacesContext().setProcessingEvents(oldProcessingEvents);
@@ -164,7 +173,14 @@ final class UIInstructionHandler extends
{
ctx.getFacesContext().setProcessingEvents(false);
}
- this.addComponent(ctx, parent, c);
+ if (facetName == null)
+ {
+ parent.getChildren().add(c);
+ }
+ else
+ {
+ ComponentSupport.addFacet(ctx, parent, c, facetName);
+ }
if (componentFound && mctx.isRefreshingSection())
{
ctx.getFacesContext().setProcessingEvents(oldProcessingEvents);