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/09/16 06:51:15 UTC

svn commit: r815606 - /myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java

Author: lu4242
Date: Wed Sep 16 04:51:15 2009
New Revision: 815606

URL: http://svn.apache.org/viewvc?rev=815606&view=rev
Log:
MYFACES-2278 Render columns with th instead td, according to HtmlColumn.isRowHeader (rollback change on h:panelGrid because h:column is only available for UIData parent components like h:dataTable)

Modified:
    myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java

Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java?rev=815606&r1=815605&r2=815606&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java Wed Sep 16 04:51:15 2009
@@ -222,33 +222,14 @@
                         }
                     }
 
-                    // Get the rowHeader attribute from the attribute map, because of MYFACES-1790
-                    Object rowHeaderAttr = child.getAttributes().get(JSFAttr.ROW_HEADER_ATTR);
-                    boolean rowHeader = rowHeaderAttr != null && ((Boolean) rowHeaderAttr);
-                    
-                    if(rowHeader) 
-                    {
-                        writer.startElement(HTML.TH_ELEM, component);   
-                        writer.writeAttribute(HTML.SCOPE_ATTR, HTML.SCOPE_ROW_VALUE, null);
-                    }
-                    else 
-                    {
-                        writer.startElement(HTML.TD_ELEM, component);
-                    }
+                    writer.startElement(HTML.TD_ELEM, component);
                     if (columnIndex < columnClassesCount)
                     {
                         writer.writeAttribute(HTML.CLASS_ATTR, columnClassesArray[columnIndex], null);
                     }
                     columnIndex = childAttributes(context, writer, child, columnIndex);
                     RendererUtils.renderChild(context, child);
-                    if(rowHeader) 
-                    {
-                        writer.endElement(HTML.TH_ELEM);   
-                    }
-                    else 
-                    {
-                        writer.endElement(HTML.TD_ELEM);
-                    }
+                    writer.endElement(HTML.TD_ELEM);
 
                     columnIndex++;
                     if (columnIndex >= columns) {