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 2009/05/28 04:07:38 UTC
svn commit: r779397 -
/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
Author: lu4242
Date: Thu May 28 02:07:38 2009
New Revision: 779397
URL: http://svn.apache.org/viewvc?rev=779397&view=rev
Log:
MYFACES-2013 h:dataTable renders caption facet twice on ear projects and TOMAHAWK-1126 Using facet name="caption" in an Extended Datatable generates caption tags twice.
Modified:
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?rev=779397&r1=779396&r2=779397&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Thu May 28 02:07:38 2009
@@ -137,7 +137,6 @@
beforeBody(facesContext, (UIData) component);
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- renderCaptionFacet(facesContext, writer, component);
writer.startElement(HTML.TBODY_ELEM, component);
writer.writeAttribute(HTML.ID_ATTR, component.getClientId(facesContext)+":tbody_element", null);
@@ -158,14 +157,7 @@
protected void renderCaptionFacet(FacesContext facesContext, ResponseWriter writer, UIComponent component)
throws IOException
{
- UIComponent facet = (UIComponent) component.getFacets().get(CAPTION_FACET_NAME);
- if (facet != null)
- {
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- writer.startElement(HTML.CAPTION_ELEM, component);
- RendererUtils.renderChild(facesContext, facet);
- writer.endElement(HTML.CAPTION_ELEM);
- }
+ HtmlRendererUtils.renderTableCaption(facesContext, writer, component);
}
/**
@@ -453,7 +445,7 @@
{
ResponseWriter writer = facesContext.getResponseWriter();
- HtmlRendererUtils.renderTableCaption(facesContext, writer, uiData);
+ renderCaptionFacet(facesContext, writer, uiData);
renderFacet(facesContext, writer, uiData, true);
renderFacet(facesContext, writer, uiData, false);
}