You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2007/10/24 16:48:15 UTC
svn commit: r587900 - in
/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit:
RendererUtils.java html/HtmlGridRendererBase.java
html/HtmlGroupRendererBase.java html/HtmlLinkRendererBase.java
html/HtmlTableRendererBase.java
Author: mmarinschek
Date: Wed Oct 24 07:47:55 2007
New Revision: 587900
URL: http://svn.apache.org/viewvc?rev=587900&view=rev
Log:
https://issues.apache.org/jira/browse/MYFACES-1751 (MYFACES-1751): encodeChildren is wrongly implemented everywhere else as well - as it was doubly wrong, the bug was not visible
Modified:
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java?rev=587900&r1=587899&r2=587900&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java Wed Oct 24 07:47:55 2007
@@ -433,11 +433,8 @@
}
child.encodeBegin(facesContext);
- if (child.getRendersChildren()) {
+ if (!child.getRendersChildren()) {
child.encodeChildren(facesContext);
- }
- else {
- renderChildren(facesContext, child);
}
child.encodeEnd(facesContext);
}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java?rev=587900&r1=587899&r2=587900&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java Wed Oct 24 07:47:55 2007
@@ -50,18 +50,6 @@
return true;
}
- public void encodeBegin(FacesContext facesContext, UIComponent component)
- throws IOException
- {
- // all work done in encodeEnd()
- }
-
- public void encodeChildren(FacesContext context, UIComponent component)
- throws IOException
- {
- // all work done in encodeEnd()
- }
-
public void encodeEnd(FacesContext facesContext, UIComponent component)
throws IOException
{
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java?rev=587900&r1=587899&r2=587900&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java Wed Oct 24 07:47:55 2007
@@ -41,16 +41,6 @@
return true;
}
- public void encodeBegin(FacesContext context, UIComponent component)
- throws IOException
- {
- }
-
- public void encodeChildren(FacesContext context, UIComponent component)
- throws IOException
- {
- }
-
public void encodeEnd(FacesContext context, UIComponent component)
throws IOException
{
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?rev=587900&r1=587899&r2=587900&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Wed Oct 24 07:47:55 2007
@@ -140,6 +140,8 @@
else {
throw new IllegalArgumentException("Unsupported component class " + component.getClass().getName());
}
+
+ encodeChildren(facesContext, component);
}
protected void renderCommandLinkStart(FacesContext facesContext, UIComponent component,
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?rev=587900&r1=587899&r2=587900&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Wed Oct 24 07:47:55 2007
@@ -521,6 +521,8 @@
{
RendererUtils.checkParamValidity(facesContext, uiComponent, UIData.class);
+ encodeChildren(facesContext, uiComponent);
+
ResponseWriter writer = facesContext.getResponseWriter();
writer.endElement(HTML.TABLE_ELEM);
HtmlRendererUtils.writePrettyLineSeparator(facesContext);