[richfaces-svn-commits] JBoss Rich Faces SVN: r14379 - branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2009-05-27 12:31:51 -0400 (Wed, 27 May 2009)
New Revision: 14379

Modified:
   branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
https://jira.jboss.org/jira/browse/RF-4731

Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java	2009-05-27 15:41:03 UTC (rev 14378)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java	2009-05-27 16:31:51 UTC (rev 14379)
@@ -167,9 +167,13 @@
 			int numberOfColumns) throws IOException {
 		
 		UIComponent header = table.getHeader();
-		boolean columnFacetPresent = isColumnFacetPresent(table, "header");
-		boolean isFilterByPresent = isHeaderFactoryColumnAttributePresent(table, "filterBy");
-		if (header != null || columnFacetPresent || isFilterByPresent) {
+
+		boolean isEncodeHeaders = isColumnFacetPresent(table, "header") || 
+			isHeaderFactoryColumnAttributePresent(table, "sortBy") ||
+			isHeaderFactoryColumnAttributePresent(table, "comparator") ||
+			isHeaderFactoryColumnAttributePresent(table, "filterBy");
+		
+		if (header != null || isEncodeHeaders) {
 		    
 		    ResponseWriter writer = context.getResponseWriter();
 			writer.startElement("thead", table);
@@ -183,7 +187,7 @@
 						headerClass, "th");
 			}
 
-			if (columnFacetPresent || isFilterByPresent) {
+			if (isEncodeHeaders) {
 				writer.startElement("tr", table);
 				encodeStyleClass(writer, null,
 						"rich-table-subheader", null,