svn commit: r170298 - /incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java

[ek...@apache.org]

Author: ekoneil
Date: Sun May 15 21:15:33 2005
New Revision: 170298

URL: http://svn.apache.org/viewcvs?rev=170298&view=rev
Log:
Re-fix JIRA 504 for real this time.

Problem was that the body was rendering after the <th> tag had already been opened.  So, while the state variable showed up in the right place, it was too late to be handled at render time. 

Fix was simply to move body rendering up a couple of lines.  

Risk of this change is pretty low.

BB: self
DRT: NetUI pass
BVT: NetUI pass


Modified:
    incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java?rev=170298&r1=170297&r2=170298&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java Sun May 15 21:15:33 2005
@@ -583,8 +583,16 @@
 
         _cellState.styleClass = dataGridModel.getStyleModel().buildStyleClassValue(styleClasses);
 
+        JspFragment fragment = getJspBody();
+        StringWriter sw = new StringWriter();
+        String jspFragmentOutput = null;
+        if(fragment != null) {
+            fragment.invoke(sw);
+            jspFragmentOutput = sw.toString();
+        }
+
         tableRenderer.openHeaderCell(_cellState, appender);
-        renderHeaderCellContents(appender);
+        renderHeaderCellContents(appender, jspFragmentOutput);
         tableRenderer.closeHeaderCell(appender);
 
         /* render any JavaScript needed to support framework features */
@@ -598,23 +606,15 @@
 
     }
 
-    protected void renderHeaderCellContents(AbstractRenderAppender appender)
+    protected void renderHeaderCellContents(AbstractRenderAppender appender, String jspFragmentOutput)
             throws IOException, JspException {
 
-        JspFragment fragment = getJspBody();
-        StringWriter sw = new StringWriter();
-        String bodyContent = null;
-        if(fragment != null) {
-            fragment.invoke(sw);
-            bodyContent = sw.toString();
-        }
-
         if(_headerText == null) {
-            appender.append(bodyContent.toString());
+            appender.append(jspFragmentOutput);
         }
         else {
             _headerCellModel.setDataGridTagModel(DataGridUtil.getDataGridTagModel(getJspContext()));
-            _headerCellModel.setBodyContent(bodyContent);
+            _headerCellModel.setBodyContent(jspFragmentOutput);
             _headerCellModel.setHeaderText(_headerText);
 
             getCellDecorator().decorate(getJspContext(), appender, _headerCellModel);