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/08/19 02:06:53 UTC
svn commit: r986988 -
/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
Author: lu4242
Date: Thu Aug 19 00:06:52 2010
New Revision: 986988
URL: http://svn.apache.org/viewvc?rev=986988&view=rev
Log:
TOMAHAWK-1482 HtmlTableRendererBase produces invalid html if row is not available
Modified:
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/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=986988&r1=986987&r2=986988&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 Thu Aug 19 00:06:52 2010
@@ -352,8 +352,7 @@ public class HtmlTableRendererBase exten
// walk through the newspaper rows
for(int nr = 0; nr < newspaperRows; nr++)
{
- beforeRow(facesContext, uiData);
-
+ boolean rowStartRendered = false;
// walk through the newspaper columns
for(int nc = 0; nc < newspaperColumns; nc++) {
@@ -397,6 +396,7 @@ public class HtmlTableRendererBase exten
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
renderRowStart(facesContext, writer, uiData, styles, nr);
+ rowStartRendered = true;
}
List children = getChildren(component);
@@ -423,9 +423,11 @@ public class HtmlTableRendererBase exten
if(nc < newspaperColumns - 1) renderSpacerCell(facesContext, writer, uiData);
}
}
- renderRowEnd(facesContext, writer, uiData);
-
- afterRow(facesContext, uiData);
+ if (rowStartRendered)
+ {
+ renderRowEnd(facesContext, writer, uiData);
+ afterRow(facesContext, uiData);
+ }
}
if(bodyrowsCount != 0)