svn commit: r535393 - /incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java

[awiner]

Author: awiner
Date: Fri May  4 15:13:38 2007
New Revision: 535393

URL: http://svn.apache.org/viewvc?view=rev&rev=535393
Log:
ADFFACES-479: Column headerText attribute should not be rendered if column 
header facet is present
- Patch from John Fan

Modified:
    
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java

Modified: 
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java
URL: 
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java?view=diff&rev=535393&r1=535392&r2=535393
==============================================================================
--- 
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java
 (original)
+++ 
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java
 Fri May  4 15:13:38 2007
@@ -555,13 +555,17 @@
     String                sortOnclick) throws IOException
   {
     ResponseWriter rw = context.getResponseWriter();
-    String headerText = getHeaderText(getFacesBean(column));
-    if (headerText != null)
-      rw.writeText(headerText, "headerText");
-
     UIComponent header = getFacet(column, CoreColumn.HEADER_FACET);
     if (header != null)
+    {
       encodeChild(context, header);
+    }
+    else
+    {
+      String headerText = getHeaderText(getFacesBean(column));
+      if (headerText != null)
+        rw.writeText(headerText, "headerText");
+    }
 
     renderSortOrderSymbol(context, arc, sortability, sortIcon, sortOnclick);
   }