svn commit: r453370 - /myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java

[ba...@apache.org]

Author: baranda
Date: Thu Oct  5 13:35:36 2006
New Revision: 453370

URL: http://svn.apache.org/viewvc?view=rev&rev=453370
Log:
MYFACES-1248 (JSR-252 Issue #123) - Clarified renderkit docs with respect to dataTable attribute rendering
This has implied adding the scope=col for column headers

Modified:
    myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?view=diff&rev=453370&r1=453369&r2=453370
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Thu Oct  5 13:35:36 2006
@@ -15,10 +15,12 @@
  */
 package org.apache.myfaces.shared.renderkit.html;
 
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.util.ArrayUtils;
+import org.apache.myfaces.shared.util.StringUtils;
 
 import javax.faces.component.UIColumn;
 import javax.faces.component.UIComponent;
@@ -26,13 +28,10 @@
 import javax.faces.component.html.HtmlDataTable;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared.renderkit.JSFAttr;
-import org.apache.myfaces.shared.renderkit.RendererUtils;
-import org.apache.myfaces.shared.util.ArrayUtils;
-import org.apache.myfaces.shared.util.StringUtils;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
 
 /**
  * Common methods for renderers for components that subclass the standard
@@ -635,7 +634,7 @@
             UIComponent headerFacet, String headerStyleClass, int colspan) throws IOException
     {
         renderTableHeaderOrFooterRow(facesContext, writer, component, headerFacet, headerStyleClass, HTML.TH_ELEM,
-                colspan);
+                colspan, false);
     }
 
     /**
@@ -653,7 +652,7 @@
             UIComponent footerFacet, String footerStyleClass, int colspan) throws IOException
     {
         renderTableHeaderOrFooterRow(facesContext, writer, component, footerFacet, footerStyleClass, HTML.TD_ELEM,
-                colspan);
+                colspan, false);
     }
 
     /**
@@ -688,12 +687,12 @@
     }
 
     private void renderTableHeaderOrFooterRow(FacesContext facesContext, ResponseWriter writer, UIComponent component,
-            UIComponent facet, String styleClass, String colElementName, int colspan) throws IOException
+            UIComponent facet, String styleClass, String colElementName, int colspan, boolean isHeader) throws IOException
     {
         HtmlRendererUtils.writePrettyLineSeparator(facesContext);
         writer.startElement(HTML.TR_ELEM, component);
         writer.startElement(colElementName, component);
-        if (colElementName.equals(HTML.TH_ELEM))
+        if (colElementName.equals(HTML.TH_ELEM) && isHeader)
         {
             writer.writeAttribute(HTML.SCOPE_ATTR, HTML.SCOPE_COLGROUP_VALUE, null);
         }
@@ -769,11 +768,11 @@
      }
 
     protected void renderColumnChildHeaderOrFooterRow(FacesContext facesContext,
-        ResponseWriter writer, UIComponent uiComponent, String styleClass, boolean header) throws IOException
+        ResponseWriter writer, UIComponent uiComponent, String styleClass, boolean isHeader) throws IOException
     {
         if (uiComponent instanceof UIColumn)
         {
-            if (header)
+            if (isHeader)
             {
                 renderColumnHeaderCell(facesContext, writer, uiComponent,
                     ((UIColumn) uiComponent).getHeader(), styleClass, 0);
@@ -833,6 +832,7 @@
         {
             RendererUtils.renderChild(facesContext, facet);
         }
+        writer.writeAttribute(HTML.SCOPE_ATTR, "col", null);
         writer.endElement(HTML.TH_ELEM);
     }