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 2008/02/06 01:41:45 UTC

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

Author: lu4242
Date: Tue Feb  5 16:41:42 2008
New Revision: 618839

URL: http://svn.apache.org/viewvc?rev=618839&view=rev
Log:
correct HtmlGridRendererBase.java to allow colspan on t:panelGrid

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

Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java?rev=618839&r1=618838&r2=618839&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java Tue Feb  5 16:41:42 2008
@@ -150,6 +150,15 @@
         writer.endElement(header ? HTML.THEAD_ELEM : HTML.TFOOT_ELEM);
     }
 
+    protected int childAttributes(FacesContext context,
+            ResponseWriter writer,
+            UIComponent component,
+            int columnIndex)
+        throws IOException
+    {
+        // subclasses can override this method to add attributes to the table cell <td> tag
+        return columnIndex;
+    }
 
     protected void renderChildren(FacesContext context,
                                 ResponseWriter writer,
@@ -218,6 +227,7 @@
                     {
                         writer.writeAttribute(HTML.CLASS_ATTR, columnClassesArray[columnIndex], null);
                     }
+                    columnIndex = childAttributes(context, writer, child, columnIndex);
                     RendererUtils.renderChild(context, child);
                     writer.endElement(HTML.TD_ELEM);