Author: ekoneil Date: Wed Apr 27 06:34:10 2005 New Revision: 164979 URL: http://svn.apache.org/viewcvs?rev=164979&view=rev Log: Completion of the tagId work in the data grid. This change adds a new tag <netui-data:row> which can be nested inside of the <netui-data:header>, <netui-data:rows>, and <netui-data:footer> tags in order to set HTML attributes (including the tagId) on the <tr>s generated by the data grid.
The <row> tag is completely optional; in its absence, the <rows> tag will still render the table row. When the <row> tag is used, the "renderRow" flag on <header>, <rows>, and <footer> must be set to "false" in order to keep from rendering two table rows. For example: <netui-data:dataGrid ...> <netui-data:rows renderRow="false"> <netui-data:row tagId="theTableRow" ...> <netui-data:spanCell .../> ... </netui-data:row> </netui-data:rows </netui-data:dataGrid> BB: self DRT: NetUI pass BVT: NetUI pass Added: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Row.java (with props) incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/footerRowAttributes.jsp (with props) incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/headerRowAttributes.jsp (with props) incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/rowAttributes.jsp (with props) incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridFooterRowAttributes.xml (with props) incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridHeaderRowAttributes.xml (with props) incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridRowAttributes.xml (with props) Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.java incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.java incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCSSPrefix.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionAttributes.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionJavaScript.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionTest.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridContainerIndex.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCustomHeaderStyle.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCustomTagAttributes.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridEmptyColumnsTag.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridEmptyStylePolicy.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridFooterTest.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridFormatTest.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridHeaderCellDecorator.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridHeaderTest.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridImageAnchorColumnTest.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridImageColumnTest.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ401.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJ420.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJavaScriptSmoke.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridJira493.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridMessageOverrides.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridModelTest.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridNestedJSTL.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerBasic.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerCustomSelect.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerDisable.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerExplicitHref.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerImplicitHref.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInCaption.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerInFooter.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerOverride.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerRendererSmoke.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridPagerStickyParam.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridRowGroups.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridRowGroupsEmptyStyle.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridScriptletTagFile.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridSimpleSort.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridSmokeTest.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridStylesFiltered.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridTableAttributes.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridTagIdMonster.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridTemplateColumnTest.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlDataGridSmokeTest.xml Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java?rev=164979&r1=164978&r2=164979&view=diff ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java Wed Apr 27 06:34:10 2005 @@ -29,39 +29,37 @@ */ public final class DataGridUtil { - private static final String DATA_GRID_TAG_MODEL_KEY = "dataGrid"; - private static final String CELL_MODEL_KEY = "cell"; + private static final String KEY_GRID_MODEL = "dataGrid"; + private static final String KEY_CELL_MODEL = "cell"; /* do not construct */ - private DataGridUtil() { - } + private DataGridUtil() {} public static final DataGridTagModel getDataGridTagModel(JspContext jspContext) { - Object model = jspContext.getAttribute(DATA_GRID_TAG_MODEL_KEY); + Object model = jspContext.getAttribute(KEY_GRID_MODEL); assert model != null ? model instanceof DataGridTagModel : true; return (DataGridTagModel)model; } public static final void putDataGridTagModel(JspContext jspContext, DataGridTagModel dataGridTagModel) { - jspContext.setAttribute(DATA_GRID_TAG_MODEL_KEY, dataGridTagModel); + jspContext.setAttribute(KEY_GRID_MODEL, dataGridTagModel); } public static final void removeDataGridTagModel(JspContext jspContext) { - jspContext.removeAttribute(DATA_GRID_TAG_MODEL_KEY); + jspContext.removeAttribute(KEY_GRID_MODEL); } public static final CellModel getCellModel(JspContext jspContext) { - Object model = jspContext.getAttribute(CELL_MODEL_KEY); + Object model = jspContext.getAttribute(KEY_CELL_MODEL); assert model != null ? model instanceof CellModel : true; return (CellModel)model; } public static final void putCellModel(JspContext jspContext, CellModel cellModel) { - jspContext.setAttribute(CELL_MODEL_KEY, cellModel); + jspContext.setAttribute(KEY_CELL_MODEL, cellModel); } public static final void removeCellModel(JspContext jspContext) { - assert jspContext.getAttribute(CELL_MODEL_KEY) != null : "Did not find a ColumnModel under the key " + CELL_MODEL_KEY; - jspContext.removeAttribute(CELL_MODEL_KEY); + jspContext.removeAttribute(KEY_CELL_MODEL); } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java?rev=164979&r1=164978&r2=164979&view=diff ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java Wed Apr 27 06:34:10 2005 @@ -49,6 +49,7 @@ extends AbstractDataGridHtmlTag implements IHtmlEvents, IHtmlI18n { + private boolean _renderRow = true; private TFootTag.State _tfootTag = new TFootTag.State(); public String getTagName() { @@ -328,6 +329,14 @@ } /** + * @netui:attribute required="false" rtexprvalue="true" + * @netui.tldx:attribute category="general" + */ + public void setRenderRow(boolean renderRow) { + _renderRow = renderRow; + } + + /** * Set the name of the tagId for the tfoot tag. * * @param tagId - the the name of the tagId for the tfoot tag. @@ -366,21 +375,26 @@ AbstractRenderAppender appender = new WriteRenderAppender(jspContext); - TrTag.State trState = new TrTag.State(); - trState.styleClass = styleModel.getFooterRowClass(); - if(dgm.isRenderRowGroups()) { if(_tfootTag.styleClass == null) _tfootTag.styleClass = styleModel.getTableFootClass(); tableRenderer.openTableFoot(_tfootTag, appender); } - tableRenderer.openFooterRow(trState, appender); + TrTag.State trState = null; + if(_renderRow) { + trState = new TrTag.State(); + trState.styleClass = styleModel.getFooterRowClass(); + tableRenderer.openFooterRow(trState, appender); + } fragment.invoke(sw); appender.append(sw.toString()); - tableRenderer.closeFooterRow(appender); + if(_renderRow) { + assert trState != null; + tableRenderer.closeFooterRow(appender); + } if(dgm.isRenderRowGroups()) { tableRenderer.closeTableFoot(appender); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.java?rev=164979&r1=164978&r2=164979&view=diff ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.java Wed Apr 27 06:34:10 2005 @@ -50,6 +50,7 @@ extends AbstractDataGridHtmlTag implements IHtmlEvents, IHtmlI18n { + private boolean _renderRow = true; private THeadTag.State _theadTag = new THeadTag.State(); public String getTagName() { @@ -329,6 +330,14 @@ } /** + * @netui:attribute required="false" rtexprvalue="true" + * @netui.tldx:attribute category="general" + */ + public void setRenderRow(boolean renderRow) { + _renderRow = renderRow; + } + + /** * Set the name of the tagId for the thead tag. * * @param tagId - the the name of the tagId for the thead tag. @@ -369,9 +378,12 @@ tableRenderer.openTableHead(_theadTag, appender); } - TrTag.State trState = new TrTag.State(); - trState.styleClass = styleModel.getHeaderRowClass(); - tableRenderer.openHeaderRow(trState, appender); + TrTag.State trState = null; + if(_renderRow) { + trState = new TrTag.State(); + trState.styleClass = styleModel.getHeaderRowClass(); + tableRenderer.openHeaderRow(trState, appender); + } JspFragment fragment = getJspBody(); if(fragment != null) { @@ -380,7 +392,8 @@ appender.append(sw.toString()); } - tableRenderer.closeHeaderRow(appender); + if(_renderRow) + tableRenderer.closeHeaderRow(appender); if(dgm.isRenderRowGroups()) { tableRenderer.closeTableHead(appender); Added: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Row.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Row.java?rev=164979&view=auto ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Row.java (added) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Row.java Wed Apr 27 06:34:10 2005 @@ -0,0 +1,353 @@ +/* + * Copyright 2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * $Header:$ + */ +package org.apache.beehive.netui.tags.databinding.datagrid; + +import java.io.IOException; +import java.io.StringWriter; +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspContext; +import javax.servlet.jsp.tagext.JspFragment; +import javax.servlet.http.HttpServletRequest; + +import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; +import org.apache.beehive.netui.tags.rendering.TrTag; +import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender; +import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender; +import org.apache.beehive.netui.tags.html.HtmlConstants; +import org.apache.beehive.netui.databinding.datagrid.runtime.rendering.table.TableRenderer; +import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil; +import org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel; +import org.apache.beehive.netui.databinding.datagrid.api.rendering.StyleModel; +import org.apache.beehive.netui.util.Bundle; +import org.apache.beehive.netui.util.internal.InternalStringBuilder; + +/** + * @jsptagref.tagdescription Sets HTML attributes on data grid table rows. + * @netui:tag name="row" body-content="scriptless" description="Sets HTML attributes on data grid table rows" + * @netui.tldx:tag whitespace="indent" + */ +public class Row + extends AbstractDataGridHtmlTag { + + private TrTag.State _trState = new TrTag.State(); + + public final String getTagName() { + return "Row"; + } + + /** + * Sets the onClick javascript event. + * + * @param onClick - the onClick event. + * @jsptagref.attributedescription The onClick JavaScript event. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_onClick</i> + * @netui:attribute required="false" rtexprvalue="true" description="The onClick JavaScript event." + * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event" + */ + public void setOnClick(String onClick) { + _trState.registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT, HtmlConstants.ONCLICK, onClick); + } + + /** + * Sets the onDblClick javascript event. + * + * @param onDblClick - the onDblClick event. + * @jsptagref.attributedescription The onDblClick JavaScript event. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_onDblClick</i> + * @netui:attribute required="false" rtexprvalue="true" description="The onDblClick JavaScript event." + * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event" + */ + public void setOnDblClick(String onDblClick) { + _trState.registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT, HtmlConstants.ONDBLCLICK, onDblClick); + } + + /** + * Sets the onKeyDown javascript event. + * + * @param onKeyDown - the onKeyDown event. + * @jsptagref.attributedescription The onKeyDown JavaScript event. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_onKeyDown</i> + * @netui:attribute required="false" rtexprvalue="true" description="The onKeyDown JavaScript event." + * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event" + */ + public void setOnKeyDown(String onKeyDown) { + _trState.registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT, HtmlConstants.ONKEYDOWN, onKeyDown); + } + + /** + * Sets the onKeyUp javascript event. + * + * @param onKeyUp - the onKeyUp event. + * @jsptagref.attributedescription The onKeyUp JavaScript event. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_onKeyUp</i> + * @netui:attribute required="false" rtexprvalue="true" description="The onKeyUp JavaScript event." + * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event" + */ + public void setOnKeyUp(String onKeyUp) { + _trState.registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT, HtmlConstants.ONKEYUP, onKeyUp); + } + + /** + * Sets the onKeyPress javascript event. + * + * @param onKeyPress - the onKeyPress event. + * @jsptagref.attributedescription The onKeyPress JavaScript event. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_onKeyPress</i> + * @netui:attribute required="false" rtexprvalue="true" description="The onKeyPress JavaScript event." + * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event" + */ + public void setOnKeyPress(String onKeyPress) { + _trState.registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT, HtmlConstants.ONKEYPRESS, onKeyPress); + } + + /** + * Sets the onMouseDown javascript event. + * + * @param onMouseDown - the onMouseDown event. + * @jsptagref.attributedescription The onMouseDown JavaScript event. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_onMouseDown</i> + * @netui:attribute required="false" rtexprvalue="true" description="The onMouseDown JavaScript event." + * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event" + */ + public void setOnMouseDown(String onMouseDown) { + _trState.registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT, HtmlConstants.ONMOUSEDOWN, onMouseDown); + } + + /** + * Sets the onMouseUp javascript event. + * + * @param onMouseUp - the onMouseUp event. + * @jsptagref.attributedescription The onMouseUp JavaScript event. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_onMouseUp</i> + * @netui:attribute required="false" rtexprvalue="true" description="The onMouseUp JavaScript event." + * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event" + */ + public void setOnMouseUp(String onMouseUp) { + _trState.registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT, HtmlConstants.ONMOUSEUP, onMouseUp); + } + + /** + * Sets the onMouseMove javascript event. + * + * @param onMouseMove - the onMouseMove event. + * @jsptagref.attributedescription The onMouseMove JavaScript event. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_onMouseMove</i> + * @netui:attribute required="false" rtexprvalue="true" description="The onMouseMove JavaScript event." + * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event" + */ + public void setOnMouseMove(String onMouseMove) { + _trState.registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT, HtmlConstants.ONMOUSEMOVE, onMouseMove); + } + + /** + * Sets the onMouseOut javascript event. + * + * @param onMouseOut - the onMouseOut event. + * @jsptagref.attributedescription The onMouseOut JavaScript event. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_onMouseOut</i> + * @netui:attribute required="false" rtexprvalue="true" description="The onMouseOut JavaScript event." + * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event" + */ + public void setOnMouseOut(String onMouseOut) { + _trState.registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT, HtmlConstants.ONMOUSEOUT, onMouseOut); + } + + /** + * Sets the onMouseOver javascript event. + * + * @param onMouseOver - the onMouseOver event. + * @jsptagref.attributedescription The onMouseOver JavaScript event. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_onMouseOver</i> + * @netui:attribute required="false" rtexprvalue="true" description="The onMouseOver JavaScript event." + * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.EventPropertyClass" category="event" + */ + public void setOnMouseOver(String onMouseOver) { + _trState.registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT, HtmlConstants.ONMOUSEOVER, onMouseOver); + } + + /** + * Sets the style of the rendered html tag. + * + * @param style - the html style. + * @jsptagref.attributedescription The style. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_style</i> + * @netui:attribute required="false" rtexprvalue="true" description="The style." + * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.JspStyleProperty" category="format" + */ + public void setStyle(String style) { + if("".equals(style)) return; + + _trState.style = style; + } + + /** + * Sets the style class of the rendered html tag. + * + * @param styleClass - the html style class. + * @jsptagref.attributedescription The style class. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_style_class</i> + * @netui:attribute required="false" rtexprvalue="true" description="The style class." + * @netui.tldx:attribute category="Format" + */ + public void setStyleClass(String styleClass) { + if("".equals(styleClass)) return; + + _trState.styleClass = styleClass; + } + + /** + * Sets the value of the title attribute. + * + * @param title + * @jsptagref.attributedescription The title. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_title</i> + * @netui:attribute required="false" rtexprvalue="true" description="The title. " + * @netui.tldx:attribute category="misc" + */ + public void setTitle(String title) { + _trState.registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.TITLE, title); + } + + /** + * Sets the lang attribute for the HTML element. + * @param lang + * @jsptagref.attributedescription The lang. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_lang</i> + * @netui:attribute required="false" rtexprvalue="true" + * description="The lang." + * @netui.tldx:attribute category="internationalization" + */ + public void setLang(String lang) + { + _trState.registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.LANG, lang); + } + + /** + * Sets the lang attribute for the HTML element. + * @param dir + * @jsptagref.attributedescription The dir. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_dir</i> + * @netui:attribute required="false" rtexprvalue="true" + * description="The dir." + * @netui.tldx:attribute category="internationalization" + */ + public void setDir(String dir) + { + _trState.registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.DIR, dir); + } + + /** + * Set the name of the tagId for the table row. + * + * @param tagId - the the name of the tagId for the table row. + * @jsptagref.attributedescription The tagId. + * @jsptagref.databindable false + * @jsptagref.attributesyntaxvalue <i>string_tagId</i> + * @netui:attribute required="false" rtexprvalue="true" + * description="String value. Sets the id (or name) attribute of the rendered HTML tag. " + * @netui.tldx:attribute category="general" + */ + public void setTagId(String tagId) + throws JspException { + JspContext jspContext = getJspContext(); + DataGridTagModel dataGridModel = DataGridUtil.getDataGridTagModel(jspContext); + if(dataGridModel == null) + throw new JspException(Bundle.getErrorString("DataGridTags_MissingDataGridModel")); + + int renderState = dataGridModel.getRenderState(); + + if(renderState == DataGridTagModel.RENDER_STATE_GRID) + applyIndexedTagId(_trState, tagId); + else applyTagId(_trState, tagId); + } + + public void doTag() + throws JspException, IOException { + + JspContext jspContext = getJspContext(); + DataGridTagModel dataGridModel = DataGridUtil.getDataGridTagModel(jspContext); + if(dataGridModel == null) + throw new JspException(Bundle.getErrorString("DataGridTags_MissingDataGridModel")); + + int renderState = dataGridModel.getRenderState(); + + if(!(renderState == DataGridTagModel.RENDER_STATE_HEADER || + renderState != DataGridTagModel.RENDER_STATE_GRID || + renderState != DataGridTagModel.RENDER_STATE_FOOTER)) + return; + + JspFragment fragment = getJspBody(); + + StyleModel styleModel = dataGridModel.getStyleModel(); + assert styleModel != null; + + TableRenderer tableRenderer = dataGridModel.getTableRenderer(); + assert tableRenderer != null; + + HttpServletRequest request = JspUtil.getRequest(getJspContext()); + InternalStringBuilder content = new InternalStringBuilder(); + AbstractRenderAppender appender = new StringBuilderRenderAppender(content); + + if(renderState == DataGridTagModel.RENDER_STATE_GRID) { + int index = dataGridModel.getCurrentIndex(); + if(index % 2 == 0) + _trState.styleClass = styleModel.getRowClass(); + else _trState.styleClass = styleModel.getAltRowClass(); + } + else if(renderState == DataGridTagModel.RENDER_STATE_HEADER) + _trState.styleClass = styleModel.getHeaderRowClass(); + else if(renderState == DataGridTagModel.RENDER_STATE_FOOTER) + _trState.styleClass = styleModel.getFooterRowClass(); + else assert false : "Attempting to apply style information during an invalid render state"; + + String trScript = null; + if(_trState.id != null) + trScript = renderNameAndId(request, _trState, null); + + tableRenderer.openTableRow(_trState, appender); + + StringWriter sw = new StringWriter(); + if(fragment != null) + fragment.invoke(sw); + appender.append(sw.toString()); + + tableRenderer.closeTableRow(appender); + + if(trScript != null) + appender.append(trScript); + + jspContext.getOut().write(content.toString()); + + return; + } +} Propchange: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Row.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.java?rev=164979&r1=164978&r2=164979&view=diff ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.java Wed Apr 27 06:34:10 2005 @@ -30,7 +30,6 @@ import org.apache.beehive.netui.databinding.datagrid.api.rendering.StyleModel; import org.apache.beehive.netui.databinding.datagrid.runtime.rendering.table.TableRenderer; import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil; -import org.apache.beehive.netui.tags.AbstractSimpleTag; import org.apache.beehive.netui.tags.IHtmlEvents; import org.apache.beehive.netui.tags.IHtmlI18n; import org.apache.beehive.netui.tags.html.HtmlConstants; @@ -52,6 +51,7 @@ extends AbstractDataGridHtmlTag implements IHtmlEvents, IHtmlI18n { + private boolean _renderRow = true; private TBodyTag.State _tbodyTag = new TBodyTag.State(); public String getTagName() { @@ -346,6 +346,14 @@ applyTagId(_tbodyTag, tagId); } + /** + * @netui:attribute required="false" rtexprvalue="true" + * @netui.tldx:attribute category="general" + */ + public void setRenderRow(boolean renderRow) { + _renderRow = renderRow; + } + public void doTag() throws IOException, JspException { @@ -369,31 +377,38 @@ if(dataGridModel.isRenderRowGroups()) tableRenderer.openTableBody(_tbodyTag, appender); + HttpServletRequest request = JspUtil.getRequest(getJspContext()); while(dataGridModel.hasNextDataItem()) { - TrTag.State trState = new TrTag.State(); - - String trScript = null; - if(trState.id != null) { - HttpServletRequest request = JspUtil.getRequest(getJspContext()); - trScript = renderNameAndId(request, trState, null); - } StringWriter sw = new StringWriter(); - int index = dataGridModel.getCurrentIndex(); - if(index % 2 == 0) - trState.styleClass = styleModel.getRowClass(); - else - trState.styleClass = styleModel.getAltRowClass(); - + /* first things first -- advance to the next data item */ dataGridModel.nextDataItem(); + fragment.invoke(sw); - tableRenderer.openTableRow(trState, appender); + + String trScript = null; + if(_renderRow) { + TrTag.State trState = new TrTag.State(); + int index = dataGridModel.getCurrentIndex(); + if(index % 2 == 0) + trState.styleClass = styleModel.getRowClass(); + else trState.styleClass = styleModel.getAltRowClass(); + + if(trState.id != null) + trScript = renderNameAndId(request, trState, null); + + tableRenderer.openTableRow(trState, appender); + } + content.append(sw.toString()); - tableRenderer.closeTableRow(appender); - if(trScript != null) - appender.append(trScript); + if(_renderRow) { + tableRenderer.closeTableRow(appender); + + if(trScript != null) + appender.append(trScript); + } } if(dataGridModel.isRenderRowGroups()) { @@ -401,7 +416,6 @@ String tbodyScript = null; if(_tbodyTag.id != null) { - HttpServletRequest request = JspUtil.getRequest(getJspContext()); tbodyScript = renderNameAndId(request, _tbodyTag, null); } Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/footerRowAttributes.jsp URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/footerRowAttributes.jsp?rev=164979&view=auto ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/footerRowAttributes.jsp (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/footerRowAttributes.jsp Wed Apr 27 06:34:10 2005 @@ -0,0 +1,38 @@ +<%@ page language="java" contentType="text/html;charset=UTF-8"%> +<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0"; prefix="netui"%> +<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0"; prefix="netui-data"%> +<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0"; prefix="netui-template"%> +<%@ taglib prefix="datagrid" tagdir="/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles" %> +<netui-template:template templatePage="../site/template.jsp"> + <netui-template:setAttribute name="title" value="Data Grid HTML Row Attributes"/> + <netui-template:section name="body"> + <p> + <datagrid:portfolioXmlBean/> + <br/> + <netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio" width="50%" cellpadding="5" cellspacing="5"> + <netui-data:configurePager pageHref="${pageContext.request.contextPath}"/> + <netui-data:header> + <netui-data:headerCell headerText="Symbol"/> + <netui-data:headerCell headerText="Price"/> + <netui-data:headerCell headerText="Web"/> + </netui-data:header> + <netui-data:rows> + <netui-data:spanCell value="${container.item.symbol}"/> + <netui-data:spanCell value="${container.item.price}"/> + <netui-data:anchorCell value="${container.item.name}" href="${container.item.web}"> + <netui:parameter name="rowid" value="${container.index}"/> + <netui:parameter name="symbol" value="${container.item.symbol}"/> + </netui-data:anchorCell> + </netui-data:rows> + <netui-data:footer renderRow="false"> + <netui-data:row tagId="theFooterRow" lang="en" dir="foo"> + <td colspan="3" align="center">This space intentionally left blank</td> + </netui-data:row> + </netui-data:footer> + </netui-data:dataGrid> + <br/> + <netui:anchor href="index.jsp">Reset</netui:anchor> + <br/> + </p> + </netui-template:section> +</netui-template:template> \ No newline at end of file Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/footerRowAttributes.jsp ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/headerRowAttributes.jsp URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/headerRowAttributes.jsp?rev=164979&view=auto ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/headerRowAttributes.jsp (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/headerRowAttributes.jsp Wed Apr 27 06:34:10 2005 @@ -0,0 +1,35 @@ +<%@ page language="java" contentType="text/html;charset=UTF-8"%> +<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0"; prefix="netui"%> +<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0"; prefix="netui-data"%> +<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0"; prefix="netui-template"%> +<%@ taglib prefix="datagrid" tagdir="/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles" %> +<netui-template:template templatePage="../site/template.jsp"> + <netui-template:setAttribute name="title" value="Data Grid HTML Row Attributes"/> + <netui-template:section name="body"> + <p> + <datagrid:portfolioXmlBean/> + <br/> + <netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio" width="50%" cellpadding="5" cellspacing="5"> + <netui-data:configurePager pageHref="${pageContext.request.contextPath}"/> + <netui-data:header renderRow="false"> + <netui-data:row tagId="theHeaderRow" lang="en" dir="foo"> + <netui-data:headerCell headerText="Symbol"/> + <netui-data:headerCell headerText="Price"/> + <netui-data:headerCell headerText="Web"/> + </netui-data:row> + </netui-data:header> + <netui-data:rows> + <netui-data:spanCell value="${container.item.symbol}"/> + <netui-data:spanCell value="${container.item.price}"/> + <netui-data:anchorCell value="${container.item.name}" href="${container.item.web}"> + <netui:parameter name="rowid" value="${container.index}"/> + <netui:parameter name="symbol" value="${container.item.symbol}"/> + </netui-data:anchorCell> + </netui-data:rows> + </netui-data:dataGrid> + <br/> + <netui:anchor href="index.jsp">Reset</netui:anchor> + <br/> + </p> + </netui-template:section> +</netui-template:template> \ No newline at end of file Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/headerRowAttributes.jsp ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/rowAttributes.jsp URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/rowAttributes.jsp?rev=164979&view=auto ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/rowAttributes.jsp (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/rowAttributes.jsp Wed Apr 27 06:34:10 2005 @@ -0,0 +1,35 @@ +<%@ page language="java" contentType="text/html;charset=UTF-8"%> +<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0"; prefix="netui"%> +<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0"; prefix="netui-data"%> +<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0"; prefix="netui-template"%> +<%@ taglib prefix="datagrid" tagdir="/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles" %> +<netui-template:template templatePage="../site/template.jsp"> + <netui-template:setAttribute name="title" value="Data Grid HTML Row Attributes"/> + <netui-template:section name="body"> + <p> + <datagrid:portfolioXmlBean/> + <br/> + <netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio" width="50%" cellpadding="5" cellspacing="5"> + <netui-data:configurePager pageHref="${pageContext.request.contextPath}"/> + <netui-data:header> + <netui-data:headerCell headerText="Symbol"/> + <netui-data:headerCell headerText="Price"/> + <netui-data:headerCell headerText="Web"/> + </netui-data:header> + <netui-data:rows renderRow="false"> + <netui-data:row tagId="theRow" lang="en" dir="foo"> + <netui-data:spanCell value="${container.item.symbol}"/> + <netui-data:spanCell value="${container.item.price}"/> + <netui-data:anchorCell value="${container.item.name}" href="${container.item.web}"> + <netui:parameter name="rowid" value="${container.index}"/> + <netui:parameter name="symbol" value="${container.item.symbol}"/> + </netui-data:anchorCell> + </netui-data:row> + </netui-data:rows> + </netui-data:dataGrid> + <br/> + <netui:anchor href="index.jsp">Reset</netui:anchor> + <br/> + </p> + </netui-template:section> +</netui-template:template> \ No newline at end of file Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/rowAttributes.jsp ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?rev=164979&r1=164978&r2=164979&view=diff ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Wed Apr 27 06:34:10 2005 @@ -2809,6 +2809,21 @@ </features> </test> <test> + <name>DataGridFooterRowAttributes</name> + <description>DataGridFooterRowAttributes</description> + <webapp>coreWeb</webapp> + <categories> + <category>bvt</category> + <category>bvt.struts11</category> + <category>databinding</category> + <category>datagrid</category> + </categories> + <features> + <feature>Databinding</feature> + <feature>Data Grid</feature> + </features> + </test> + <test> <name>DataGridFooterTest</name> <description>DataGridFooterTest</description> <webapp>coreWeb</webapp> @@ -2855,6 +2870,21 @@ </features> </test> <test> + <name>DataGridHeaderRowAttributes</name> + <description>DataGridHeaderRowAttributes</description> + <webapp>coreWeb</webapp> + <categories> + <category>bvt</category> + <category>bvt.struts11</category> + <category>databinding</category> + <category>datagrid</category> + </categories> + <features> + <feature>Databinding</feature> + <feature>Data Grid</feature> + </features> + </test> + <test> <name>DataGridHeaderTest</name> <description>DataGridHeaderTest</description> <webapp>coreWeb</webapp> @@ -3167,6 +3197,21 @@ <category>drt</category> <category>datagrid</category> <category>databinding</category> + </categories> + <features> + <feature>Databinding</feature> + <feature>Data Grid</feature> + </features> + </test> + <test> + <name>DataGridRowAttributes</name> + <description>DataGridRowAttributes</description> + <webapp>coreWeb</webapp> + <categories> + <category>bvt</category> + <category>bvt.struts11</category> + <category>databinding</category> + <category>datagrid</category> </categories> <features> <feature>Databinding</feature> Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCSSPrefix.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCSSPrefix.xml?rev=164979&r1=164978&r2=164979&view=diff ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCSSPrefix.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCSSPrefix.xml Wed Apr 27 06:34:10 2005 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>DataGridCSSPrefix</ses:sessionName> <ses:tester>ekoneil</ses:tester> - <ses:startDate>24 Apr 2005, 04:47:56.571 PM MDT</ses:startDate> + <ses:startDate>26 Apr 2005, 06:54:54.721 PM MDT</ses:startDate> <ses:description>ekoneil</ses:description> <ses:tests> <ses:test> @@ -18,7 +18,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>540BAC00651BB89E804869735792D4BF</ses:value> + <ses:value>B03D7B9751C39776E6BE33B89A758571</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -44,7 +44,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=540BAC00651BB89E804869735792D4BF; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B03D7B9751C39776E6BE33B89A758571; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>host</ses:name> @@ -56,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-6dc17ca0:1037664f187:-7fe6</ses:value> + <ses:value>1be1c38c:1038123d4ed:-7fe5</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -118,7 +118,7 @@ -<tr class="foo-odd"> +<tr class="foo-even"> <td class="foo"><span>BEAS</span></td> <td class="foo"><span>14.35</span></td> @@ -127,7 +127,7 @@ </tr> -<tr class="foo-even"> +<tr class="foo-odd"> <td class="foo"><span>CSCO</span></td> <td class="foo"><span>19.42</span></td> @@ -136,7 +136,7 @@ </tr> -<tr class="foo-odd"> +<tr class="foo-even"> <td class="foo"><span>GE</span></td> <td class="foo"><span>59.42</span></td> @@ -145,7 +145,7 @@ </tr> -<tr class="foo-even"> +<tr class="foo-odd"> <td class="foo"><span>RHAT</span></td> <td class="foo"><span>18.2</span></td> @@ -154,7 +154,7 @@ </tr> -<tr class="foo-odd"> +<tr class="foo-even"> <td class="foo"><span>YHOO</span></td> <td class="foo"><span>48.16</span></td> @@ -176,9 +176,9 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>24 Apr 2005, 04:47:58.003 PM MDT</ses:endDate> + <ses:endDate>26 Apr 2005, 06:54:54.761 PM MDT</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>1</ses:testCount> <ses:passedCount>0</ses:passedCount> <ses:failedCount>1</ses:failedCount> -</ses:recorderSession> +</ses:recorderSession> \ No newline at end of file Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionAttributes.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionAttributes.xml?rev=164979&r1=164978&r2=164979&view=diff ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionAttributes.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionAttributes.xml Wed Apr 27 06:34:10 2005 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>DataGridCaptionAttributes</ses:sessionName> <ses:tester>ekoneil</ses:tester> - <ses:startDate>24 Apr 2005, 04:47:46.897 PM MDT</ses:startDate> + <ses:startDate>26 Apr 2005, 06:54:39.810 PM MDT</ses:startDate> <ses:description>ekoneil</ses:description> <ses:tests> <ses:test> @@ -47,7 +47,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-6dc17ca0:1037664f187:-7fff</ses:value> + <ses:value>1be1c38c:1038123d4ed:-7ffe</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -120,35 +120,35 @@ -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>BEAS</span></td> <td class="datagrid"><span>14.35</span></td> </tr> -<tr class="datagrid-even"> +<tr class="datagrid-odd"> <td class="datagrid"><span>CSCO</span></td> <td class="datagrid"><span>19.42</span></td> </tr> -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>GE</span></td> <td class="datagrid"><span>59.42</span></td> </tr> -<tr class="datagrid-even"> +<tr class="datagrid-odd"> <td class="datagrid"><span>RHAT</span></td> <td class="datagrid"><span>18.2</span></td> </tr> -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>YHOO</span></td> <td class="datagrid"><span>48.16</span></td> @@ -194,35 +194,35 @@ -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>BEAS</span></td> <td class="datagrid"><span>14.35</span></td> </tr> -<tr class="datagrid-even"> +<tr class="datagrid-odd"> <td class="datagrid"><span>CSCO</span></td> <td class="datagrid"><span>19.42</span></td> </tr> -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>GE</span></td> <td class="datagrid"><span>59.42</span></td> </tr> -<tr class="datagrid-even"> +<tr class="datagrid-odd"> <td class="datagrid"><span>RHAT</span></td> <td class="datagrid"><span>18.2</span></td> </tr> -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>YHOO</span></td> <td class="datagrid"><span>48.16</span></td> @@ -265,35 +265,35 @@ -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>BEAS</span></td> <td class="datagrid"><span>14.35</span></td> </tr> -<tr class="datagrid-even"> +<tr class="datagrid-odd"> <td class="datagrid"><span>CSCO</span></td> <td class="datagrid"><span>19.42</span></td> </tr> -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>GE</span></td> <td class="datagrid"><span>59.42</span></td> </tr> -<tr class="datagrid-even"> +<tr class="datagrid-odd"> <td class="datagrid"><span>RHAT</span></td> <td class="datagrid"><span>18.2</span></td> </tr> -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>YHOO</span></td> <td class="datagrid"><span>48.16</span></td> @@ -318,7 +318,7 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>24 Apr 2005, 04:47:50.593 PM MDT</ses:endDate> + <ses:endDate>26 Apr 2005, 06:54:44.606 PM MDT</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>1</ses:testCount> <ses:passedCount>0</ses:passedCount> Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionJavaScript.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionJavaScript.xml?rev=164979&r1=164978&r2=164979&view=diff ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionJavaScript.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionJavaScript.xml Wed Apr 27 06:34:10 2005 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>DataGridCaptionJavaScript</ses:sessionName> <ses:tester>ekoneil</ses:tester> - <ses:startDate>24 Apr 2005, 04:47:53.217 PM MDT</ses:startDate> + <ses:startDate>26 Apr 2005, 06:54:50.976 PM MDT</ses:startDate> <ses:description>ekoneil</ses:description> <ses:tests> <ses:test> @@ -18,7 +18,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>540BAC00651BB89E804869735792D4BF</ses:value> + <ses:value>B03D7B9751C39776E6BE33B89A758571</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -44,7 +44,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=540BAC00651BB89E804869735792D4BF; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B03D7B9751C39776E6BE33B89A758571; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>host</ses:name> @@ -56,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-6dc17ca0:1037664f187:-7ffb</ses:value> + <ses:value>1be1c38c:1038123d4ed:-7ffa</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -121,35 +121,35 @@ -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>BEAS</span></td> <td class="datagrid"><span>14.35</span></td> </tr> -<tr class="datagrid-even"> +<tr class="datagrid-odd"> <td class="datagrid"><span>CSCO</span></td> <td class="datagrid"><span>19.42</span></td> </tr> -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>GE</span></td> <td class="datagrid"><span>59.42</span></td> </tr> -<tr class="datagrid-even"> +<tr class="datagrid-odd"> <td class="datagrid"><span>RHAT</span></td> <td class="datagrid"><span>18.2</span></td> </tr> -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>YHOO</span></td> <td class="datagrid"><span>48.16</span></td> @@ -177,7 +177,7 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>24 Apr 2005, 04:47:54.659 PM MDT</ses:endDate> + <ses:endDate>26 Apr 2005, 06:54:52.328 PM MDT</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>1</ses:testCount> <ses:passedCount>0</ses:passedCount> Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionTest.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionTest.xml?rev=164979&r1=164978&r2=164979&view=diff ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionTest.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridCaptionTest.xml Wed Apr 27 06:34:10 2005 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>DataGridCaptionTest</ses:sessionName> <ses:tester>ekoneil</ses:tester> - <ses:startDate>24 Apr 2005, 04:47:50.783 PM MDT</ses:startDate> + <ses:startDate>26 Apr 2005, 06:54:44.797 PM MDT</ses:startDate> <ses:description>ekoneil</ses:description> <ses:tests> <ses:test> @@ -18,7 +18,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>540BAC00651BB89E804869735792D4BF</ses:value> + <ses:value>B03D7B9751C39776E6BE33B89A758571</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -44,7 +44,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=540BAC00651BB89E804869735792D4BF; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B03D7B9751C39776E6BE33B89A758571; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>host</ses:name> @@ -56,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-6dc17ca0:1037664f187:-7ffd</ses:value> + <ses:value>1be1c38c:1038123d4ed:-7ffc</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -122,7 +122,7 @@ -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>BEAS</span></td> <td class="datagrid"><span>14.35</span></td> @@ -131,7 +131,7 @@ </tr> -<tr class="datagrid-even"> +<tr class="datagrid-odd"> <td class="datagrid"><span>CSCO</span></td> <td class="datagrid"><span>19.42</span></td> @@ -140,7 +140,7 @@ </tr> -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>GE</span></td> <td class="datagrid"><span>59.42</span></td> @@ -149,7 +149,7 @@ </tr> -<tr class="datagrid-even"> +<tr class="datagrid-odd"> <td class="datagrid"><span>RHAT</span></td> <td class="datagrid"><span>18.2</span></td> @@ -158,7 +158,7 @@ </tr> -<tr class="datagrid-odd"> +<tr class="datagrid-even"> <td class="datagrid"><span>YHOO</span></td> <td class="datagrid"><span>48.16</span></td> @@ -190,9 +190,9 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>24 Apr 2005, 04:47:53.176 PM MDT</ses:endDate> + <ses:endDate>26 Apr 2005, 06:54:50.926 PM MDT</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>1</ses:testCount> <ses:passedCount>0</ses:passedCount> <ses:failedCount>1</ses:failedCount> -</ses:recorderSession> +</ses:recorderSession> \ No newline at end of file
