You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2004/09/25 18:38:52 UTC
svn commit: rev 47204 - in incubator/beehive/trunk/netui: src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid test/webapps/drt/coreWeb/databinding/datagrid/pager/basic test/webapps/drt/coreWeb/databinding/datagrid/pager/customselect test/webapps/drt/coreWeb/databinding/datagrid/pager/empty test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption test/webapps/drt/coreWeb/databinding/datagrid/pager/infooter
Author: ekoneil
Date: Sat Sep 25 09:38:51 2004
New Revision: 47204
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/basic/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/customselect/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/empty/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/infooter/index.jsp
Log:
Change the name of the "pagerStyle" attribute on the <netui-data:configurePager> tag to "pagerFormat".
This seemed to be confusing because the "Style" attributes are usually reserved for CSS styles -- not output formats.
BB: self
DRT: NetUI pass
datagrid pass
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java Sat Sep 25 09:38:51 2004
@@ -41,7 +41,7 @@
private static final String PREV_NEXT = "prevNext";
private Integer _pageSize = null;
- private String _pagerStyle = null;
+ private String _pagerFormat = null;
private String _pageHref = null;
private String _pageAction = null;
@@ -66,7 +66,7 @@
*
* @netui:attribute required="false" rtexprvalue="true"
*/
- public void setPagerStyle(String pagerStyle) {_pagerStyle = pagerStyle;}
+ public void setPagerFormat(String pagerFormat) {_pagerFormat = pagerFormat;}
/**
* @jsptagref.attributedescription The URI to access when paging occurs.
@@ -100,14 +100,15 @@
pm.setPageSize(_pageSize);
- if(_pagerStyle != null)
+ if(_pagerFormat != null)
{
IPagerRenderer pagerRenderer = null;
- if(_pagerStyle.equals(FIRST_LAST_PREV_NEXT))
+ if(_pagerFormat.equals(FIRST_LAST_PREV_NEXT))
pagerRenderer = new FirstPreviousNextLastPagerRenderer(dgm, pm);
- else if(_pagerStyle.equals(PREV_NEXT))
+ else if(_pagerFormat.equals(PREV_NEXT))
pagerRenderer = new PreviousNextPagerRenderer(dgm, pm);
-
+ else throw new JspException("The pagerFormat \"" + _pagerFormat + "\" is not supported");
+
dgm.setPagerRenderer(pagerRenderer);
}
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/basic/index.jsp
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/basic/index.jsp (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/basic/index.jsp Sat Sep 25 09:38:51 2004
@@ -9,7 +9,7 @@
<%@ include file="../../util/portfolioXmlBean.jsp" %>
<br/>
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
- <netui-data:configurePager pageSize="2" pagerStyle="firstPrevNextLast" pageAction="begin.do"/>
+ <netui-data:configurePager pageSize="2" pagerFormat="firstPrevNextLast" pageAction="begin.do"/>
<netui-data:columns>
<netui-data:literalColumn headerText="Symbol" value="${container.item.symbol}"/>
<netui-data:literalColumn headerText="Price" value="${container.item.price}"/>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/customselect/index.jsp
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/customselect/index.jsp (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/customselect/index.jsp Sat Sep 25 09:38:51 2004
@@ -14,7 +14,7 @@
<%@ include file="../../util/portfolioXmlBean.jsp" %>
<br/>
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio" disableDefaultPager="true">
- <netui-data:configurePager pageSize="2" pagerStyle="firstPrevNextLast" pageAction="begin.do"/>
+ <netui-data:configurePager pageSize="2" pagerFormat="firstPrevNextLast" pageAction="begin.do"/>
<netui-data:columns>
<netui-data:literalColumn headerText="Symbol" value="${container.item.symbol}"/>
<netui-data:literalColumn headerText="Price" value="${container.item.price}"/>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/empty/index.jsp
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/empty/index.jsp (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/empty/index.jsp Sat Sep 25 09:38:51 2004
@@ -10,7 +10,7 @@
<% pageContext.setAttribute("emptyList", Collections.EMPTY_LIST); %>
<br/>
<netui-data:dataGrid dataSource="pageScope.emptyList" name="portfolio">
- <netui-data:configurePager pageSize="2" pagerStyle="firstPrevNextLast" pageAction="begin.do"/>
+ <netui-data:configurePager pageSize="2" pagerFormat="firstPrevNextLast" pageAction="begin.do"/>
<netui-data:columns>
<netui-data:literalColumn headerText="Symbol" value="${container.item.symbol}"/>
<netui-data:literalColumn headerText="Price" value="${container.item.price}"/>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp Sat Sep 25 09:38:51 2004
@@ -9,7 +9,7 @@
<%@ include file="../../util/portfolioXmlBean.jsp" %>
<br/>
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio" disableDefaultPager="true">
- <netui-data:configurePager pageSize="2" pagerStyle="firstPrevNextLast" pageAction="begin.do"/>
+ <netui-data:configurePager pageSize="2" pagerFormat="firstPrevNextLast" pageAction="begin.do"/>
<netui-data:caption>
<table><tr><td><netui-data:renderPager/></td></tr></table>
</netui-data:caption>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/infooter/index.jsp
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/infooter/index.jsp (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/infooter/index.jsp Sat Sep 25 09:38:51 2004
@@ -9,7 +9,7 @@
<%@ include file="../../util/portfolioXmlBean.jsp" %>
<br/>
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio" disableDefaultPager="true">
- <netui-data:configurePager pageSize="2" pagerStyle="firstPrevNextLast" pageAction="begin.do"/>
+ <netui-data:configurePager pageSize="2" pagerFormat="firstPrevNextLast" pageAction="begin.do"/>
<netui-data:columns>
<netui-data:literalColumn headerText="Symbol" value="${container.item.symbol}"/>
<netui-data:literalColumn headerText="Price" value="${container.item.price}"/>