Author: ekoneil
Date: Thu Mar 3 18:14:00 2005
New Revision: 156123
URL: http://svn.apache.org/viewcvs?view=rev&rev=156123
Log:
Few data grid bug fixes:
BEEHIVE-406 ArrayIndexOutOfBoundsException in ResultSetIterator.java when
using ResultSet in netui-data tag
BEEHIVE-397 Unable to override default data grid properties using
<netui:behavior> tag.
BB: self
DRT: NetUI / datagrid pass
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/messageOverrides.jsp
(with props)
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridMessageOverrides.xml
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java?view=diff&r1=156122&r2=156123
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
Thu Mar 3 18:14:00 2005
@@ -196,6 +196,7 @@
OverridableDataGridResourceProvider overrideResourceProvider = null;
if(!(_resourceProvider instanceof
OverridableDataGridResourceProvider)) {
overrideResourceProvider = new
OverridableDataGridResourceProvider(_resourceProvider);
+ _resourceProvider = overrideResourceProvider;
}
else {
assert _resourceProvider instanceof
OverridableDataGridResourceProvider;
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java?view=diff&r1=156122&r2=156123
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java
Thu Mar 3 18:14:00 2005
@@ -92,9 +92,10 @@
throw new
NoSuchElementException(Bundle.getErrorString("IteratorFactory_Iterator_noSuchElement"));
/* not currently on the last row, should be safe to advance */
- _rs.next();
+ boolean hasNext = _rs.next();
+ assert hasNext : "Ran off the end of a ResultSet";
SortedMap map = new TreeMap(String.CASE_INSENSITIVE_ORDER);
- for(int i = 1; i <= _columnNames.length; i++) {
+ for(int i = 0; i < _columnNames.length; i++) {
Object value = _rs.getObject(i);
if(_rs.wasNull())
value = null;
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/messageOverrides.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/messageOverrides.jsp?view=auto&rev=156123
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/messageOverrides.jsp
(added)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/messageOverrides.jsp
Thu Mar 3 18:14:00 2005
@@ -0,0 +1,39 @@
+<%@ 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="Message Overrides"/>
+ <netui-template:section name="body">
+ <p>
+ <datagrid:portfolioXmlBean/>
+ <br/>
+ <br/>
+ <b>Message Overrides via behavior</b>
+ <br/>
+ <br/>
+ <netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
+ <netui-data:configurePager pageSize="2"/>
+ <netui:behavior facet="resource" name="pager.msg.next" value=">>"/>
+ <netui:behavior facet="resource" name="pager.msg.previous" value="<<"/>
+ <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: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/messageOverrides.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?view=diff&r1=156122&r2=156123
==============================================================================
---
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
Thu Mar 3 18:14:00 2005
@@ -2859,6 +2859,21 @@
</features>
</test>
<test>
+ <name>DataGridMessageOverrides</name>
+ <description>DataGridMessageOverrides</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>DataGridModelTest</name>
<description>DataGridModelTest</description>
<webapp>coreWeb</webapp>
Added:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridMessageOverrides.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridMessageOverrides.xml?view=auto&rev=156123
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridMessageOverrides.xml
(added)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/DataGridMessageOverrides.xml
Thu Mar 3 18:14:00 2005
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
+ <ses:sessionName>DataGridMessageOverrides</ses:sessionName>
+ <ses:tester>ekoneil</ses:tester>
+ <ses:startDate>02 Mar 2005, 10:52:56.276 PM MST</ses:startDate>
+ <ses:description>Test the use of the attribute tag to override the messages
displayed to via the data grid tags.</ses:description>
+ <ses:tests>
+ <ses:test>
+ <ses:testNumber>1</ses:testNumber>
+ <ses:request>
+ <ses:protocol>HTTP</ses:protocol>
+ <ses:protocolVersion>1.1</ses:protocolVersion>
+ <ses:host>localhost</ses:host>
+ <ses:port>8080</ses:port>
+
<ses:uri>/coreWeb/databinding/datagrid/misc/messageOverrides.jsp</ses:uri>
+ <ses:method>GET</ses:method>
+ <ses:parameters/>
+ <ses:cookies>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+ <ses:value>117559FEEDDFBEB27B05059457F0E3A2</ses:value>
+ </ses:cookie>
+ </ses:cookies>
+ <ses:headers>
+ <ses:header>
+ <ses:name>accept</ses:name>
+
<ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-charset</ses:name>
+ <ses:value>ISO-8859-1,utf-8;q=0.7,*;q=0.7</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-encoding</ses:name>
+ <ses:value>gzip,deflate</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-language</ses:name>
+ <ses:value>en-us,en;q=0.5</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>connection</ses:name>
+ <ses:value>keep-alive</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>cookie</ses:name>
+
<ses:value>JSESSIONID=117559FEEDDFBEB27B05059457F0E3A2</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>host</ses:name>
+ <ses:value>localhost:8080</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>keep-alive</ses:name>
+ <ses:value>300</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>user-agent</ses:name>
+ <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
rv:1.7.5) Gecko/20041107 Firefox/1.0</ses:value>
+ </ses:header>
+ </ses:headers>
+ </ses:request>
+ <ses:response>
+ <ses:statusCode>200</ses:statusCode>
+ <ses:reason/>
+ <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML
4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+
+ <head>
+ <title>NetUI Data Grid Samples</title>
+ <link rel="stylesheet"
href="/coreWeb/databinding/datagrid/site/css/default.css" type="text/css"/>
+ </head>
+ <base
href="http://localhost:8080/coreWeb/databinding/datagrid/misc/messageOverrides.jsp";>
+ <body>
+ <p>
+ <b>Message Overrides</b>
+ <table width="100%">
+ <tr><td></td></tr>
+ <tr><td>
+
+ <p>
+
+
+
+
+
+
+
+ <br/>
+ <br/>
+ <b>Message Overrides via behavior</b>
+ <br/>
+ <br/>
+ Page 1 of 3 << <a
href="/coreWeb/databinding/datagrid/misc/messageOverrides.jsp?netui_row=portfolio%7E2">>></a>
+<table class="datagrid">
+
+
+
+
+
+
+
+
+
+
+
+<tr class="datagrid-header">
+ <th class="datagrid">Symbol</th>
+
+
+ <th class="datagrid">Price</th>
+
+
+ <th class="datagrid">Web</th>
+
+
+
+</tr>
+
+
+
+
+
+
+
+<tr class="datagrid-even">
+ <td class="datagrid"><span>BEAS</span></td>
+
+ <td class="datagrid"><span>14.35</span></td>
+
+ <td class="datagrid"><a
href="http://www.bea.com?rowid=1&symbol=BEAS";><span>BEA Systems</span></a></td>
+
+
+</tr>
+<tr class="datagrid-odd">
+ <td class="datagrid"><span>CSCO</span></td>
+
+ <td class="datagrid"><span>19.42</span></td>
+
+ <td class="datagrid"><a
href="http://www.cisco.com?rowid=2&symbol=CSCO";><span>Cisco
Systems</span></a></td>
+
+
+</tr>
+ </table>
+
+
+ <br/>
+ <a href="/coreWeb/databinding/datagrid/misc/index.jsp">Reset</a>
+ <br/>
+ </p>
+
+ </td></tr>
+ </p>
+ <table>
+ <tr><td><a
href="/netuiDRT/databinding/datagrid/basic/index.jsp">Home</a></td></tr>
+ </table>
+ </p>
+ </body>
+
+</html>]]></ses:responseBody>
+ </ses:response>
+ </ses:test>
+ </ses:tests>
+ <ses:endDate>02 Mar 2005, 10:53:04.568 PM MST</ses:endDate>
+ <ses:testCount>1</ses:testCount>
+</ses:recorderSession>
\ No newline at end of file
