Author: ekoneil
Date: Mon Feb 21 10:46:44 2005
New Revision: 154705
URL: http://svn.apache.org/viewcvs?view=rev&rev=154705
Log:
JIRA fixes for:
BEEHIVE-333 Data Grid : PagerModel lastRowForPage starts with 1, instead
of zero
BEEHIVE-330 Behavior Tag
BEEHIVE-259 Data Grid: Default pagers Next Last links incorrect when
pageSize equals list size
Also added the license file to IBehaviorConsumer and added a
Tags_BehaviorFacetNotSupported message to netui.properties.
Cleaned up the IAttributeConsumer and IFormattable support in the data grid
tags. There wasn't any reason to have ImageCell support formatters since
there's no text to format.
BB: self
DRT: NetUI pass
BVT: NetUI pass (1 failure)
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IBehaviorConsumer.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/helloHeaderDecorator.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/pagerExplicitOverride.jsp
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java?view=diff&r1=154704&r2=154705
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
Mon Feb 21 10:46:44 2005
@@ -108,7 +108,7 @@
}
public int getLastRowForPage() {
- return _currentRow + getPageSize();
+ return _currentRow + getPageSize() - 1;
}
public int getFirstPage() {
@@ -130,15 +130,15 @@
}
private void updatePagerState() {
-
if(getRow() == 0)
_currentPage = DEFAULT_PAGE;
else
_currentPage = (int)Math.floor((double)getRow() /
(double)getPageSize());
+
_prevPage = _currentPage - 1;
_nextPage = _currentPage + 1;
if(_dataSetSize != null)
- _lastPage = (int)Math.floor((double)_dataSetSize.doubleValue() /
(double)getPageSize());
+ _lastPage = (int)(Math.ceil((double)_dataSetSize.doubleValue() /
(double)getPageSize())) - 1;
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java?view=diff&r1=154704&r2=154705
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java
Mon Feb 21 10:46:44 2005
@@ -35,8 +35,7 @@
*
*/
public abstract class AbstractCell
- extends AbstractSimpleTag
- implements IFormattable {
+ extends AbstractSimpleTag {
private static final String EMPTY_CELL = " ";
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.java?view=diff&r1=154704&r2=154705
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.java
Mon Feb 21 10:46:44 2005
@@ -27,6 +27,7 @@
import
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.table.TableRenderer;
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortModel;
import org.apache.beehive.netui.tags.IAttributeConsumer;
+import org.apache.beehive.netui.tags.IBehaviorConsumer;
import org.apache.beehive.netui.tags.html.HtmlConstants;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
import org.apache.beehive.netui.tags.rendering.TdTag;
@@ -38,7 +39,7 @@
*/
public abstract class AbstractHtmlTableCell
extends AbstractCell
- implements IAttributeConsumer {
+ implements IAttributeConsumer, IBehaviorConsumer {
private String _sortExpression = null;
private String _filterExpression = null;
@@ -267,11 +268,16 @@
*/
public void setAttribute(String name, String value, String facet)
throws JspException {
-
String s = Bundle.getString("Tags_AttributeFacetNotSupported", new
Object[]{facet});
throw new JspException(s);
}
+ public void setBehavior(String name, String value, String facet)
+ throws JspException {
+ String s = Bundle.getString("Tags_BehaviorFacetNotSupported", new
Object[]{facet});
+ throw new JspException(s);
+ }
+
protected void renderCell(AbstractRenderAppender appender)
throws IOException, JspException {
@@ -281,7 +287,7 @@
TableRenderer tableRenderer = dataGridModel.getTableRenderer();
assert tableRenderer != null;
- /* todo: extensibility in supporting style decorators */
+ /* todo: refactor. extensibility in supporting style decorators */
ArrayList<String> styleClasses = new ArrayList<String>();
SortModel sortModel = dataGridModel.getDataGridState().getSortModel();
if(sortModel.isSorted(_sortExpression))
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java?view=diff&r1=154704&r2=154705
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java
Mon Feb 21 10:46:44 2005
@@ -24,6 +24,7 @@
import
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell.AnchorCellDecorator;
import org.apache.beehive.netui.tags.html.IUrlParams;
import org.apache.beehive.netui.tags.html.HtmlConstants;
+import org.apache.beehive.netui.tags.html.IFormattable;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.tags.rendering.AnchorTag;
@@ -31,18 +32,18 @@
import org.apache.beehive.netui.util.Bundle;
/**
- * @netui:tag name="anchorCell"
- * description="Renders a column of anchors in a NetUI data grid"
- * body-content="scriptless"
+ * @netui:tag name="anchorCell" body-content="scriptless"
+ * description="Renders a data grid table cell containing an HTML anchor"
* @netui.tldx:tag whitespace="indent"
* renderer="workshop.netui.jspdesigner.tldx.AnchorColumnRenderer"
*/
public class AnchorCell
extends AbstractHtmlTableCell
- implements IUrlParams {
+ implements IFormattable, IUrlParams {
private static final AnchorCellDecorator DECORATOR = new
AnchorCellDecorator();
private static final String REQUIRED_ATTR = "href, action, linkName";
+ private static final String ANCHOR_FACET_NAME = "anchor";
private AnchorCellModel _anchorCellModel = new AnchorCellModel();
private AnchorTag.State _anchorState = _anchorCellModel.getAnchorState();
@@ -383,7 +384,7 @@
public void setAttribute(String name, String value, String facet)
throws JspException {
- if(facet == null)
+ if(facet == null || facet.equals(ANCHOR_FACET_NAME))
super.addStateAttribute(_anchorState, name, value);
else super.setAttribute(name, value, facet);
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java?view=diff&r1=154704&r2=154705
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
Mon Feb 21 10:46:44 2005
@@ -40,6 +40,7 @@
import org.apache.beehive.netui.tags.ExpressionHandling;
import org.apache.beehive.netui.tags.AbstractSimpleTag;
import org.apache.beehive.netui.tags.IAttributeConsumer;
+import org.apache.beehive.netui.tags.IBehaviorConsumer;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender;
import org.apache.beehive.netui.tags.rendering.TableTag;
@@ -52,7 +53,7 @@
*/
public class DataGrid
extends AbstractSimpleTag
- implements IDataAccessProvider, IAttributeConsumer {
+ implements IDataAccessProvider, IBehaviorConsumer {
private static final String FACET_RESOURCE = "resource";
@@ -117,12 +118,12 @@
* @param facet
* @throws JspException
*/
- public void setAttribute(String name, String value, String facet)
+ public void setBehavior(String name, String value, String facet)
throws JspException {
if(facet.equals(FACET_RESOURCE)) {
_gridTagModel.addResourceOverride(name, value);
} else {
- String s = Bundle.getString("Tags_AttributeFacetNotSupported", new
Object[]{facet});
+ String s = Bundle.getString("Tags_BehaviorFacetNotSupported", new
Object[]{facet});
throw new JspException(s);
}
}
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?view=diff&r1=154704&r2=154705
==============================================================================
---
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
Mon Feb 21 10:46:44 2005
@@ -24,7 +24,9 @@
import javax.servlet.jsp.tagext.JspFragment;
import org.apache.beehive.netui.tags.IAttributeConsumer;
+import org.apache.beehive.netui.tags.IBehaviorConsumer;
import org.apache.beehive.netui.tags.html.HtmlConstants;
+import org.apache.beehive.netui.tags.html.IFormattable;
import org.apache.beehive.netui.tags.rendering.ThTag;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
@@ -45,7 +47,7 @@
*/
public class HeaderCell
extends AbstractCell
- implements IAttributeConsumer {
+ implements IFormattable, IBehaviorConsumer {
private static final String TAG_NAME = "HeaderCell";
@@ -340,20 +342,7 @@
_headerText = headerText;
}
- /**
- * Base support for the <code>attribute</code> tag. This requires that
the tag buffer their body and
- * write attribute in the end tag. For the HTML tags it is not legal to
set
- * the <code>id</code> or <code>name</code> attributes. In addition, the
base tag does
- * not allow facets to be set. If the attribute is legal it will be added
to the
- * general expression map stored in the <code>AbstractHtmlState</code> of
the tag.
- *
- * @param name The name of the attribute. This value may not be null or
the empty string.
- * @param value The value of the attribute. This may contain an
expression.
- * @param facet The name of a facet to which the attribute will be
applied. This is optional.
- */
- public void setAttribute(String name, String value, String facet)
- throws JspException {
-
+ public void setBehavior(String name, String value, String facet) throws
JspException {
if(facet != null && facet.equals(FACET_HEADER_NAME)) {
super.addStateAttribute(_thState, name, value);
return;
@@ -377,9 +366,6 @@
_cellDecorator = cellDecorator;
}
}
-
- String s = Bundle.getString("Tags_AttributeFacetNotSupported", new
Object[]{facet});
- throw new JspException(s);
}
protected CellModel internalGetCellModel() {
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.java?view=diff&r1=154704&r2=154705
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.java
Mon Feb 21 10:46:44 2005
@@ -45,6 +45,7 @@
private static final ImageAnchorCellDecorator DECORATOR = new
ImageAnchorCellDecorator();
private static final String IMAGE_FACET_NAME = "image";
+ private static final String ANCHOR_FACET_NAME = "anchor";
private ImageAnchorCellModel _imageAnchorCellModel = new
ImageAnchorCellModel();
private AnchorTag.State _anchorState =
_imageAnchorCellModel.getAnchorState();
@@ -586,7 +587,7 @@
public void setAttribute(String name, String value, String facet)
throws JspException {
- if(facet == null)
+ if(facet == null || facet.equals(ANCHOR_FACET_NAME))
super.addStateAttribute(_anchorState, name, value);
else if(facet.equals(IMAGE_FACET_NAME))
super.addStateAttribute(_imageState, name, value);
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.java?view=diff&r1=154704&r2=154705
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.java
Mon Feb 21 10:46:44 2005
@@ -35,6 +35,7 @@
extends AbstractHtmlTableCell {
private static final ImageCellDecorator DECORATOR = new
ImageCellDecorator();
+ private static final String IMAGE_FACET_NAME = "image";
private ImageCellModel _imageCellModel = new ImageCellModel();
private ImageTag.State _imageState = _imageCellModel.getImageState();
@@ -318,7 +319,7 @@
public void setAttribute(String name, String value, String facet)
throws JspException {
- if(facet == null)
+ if(facet == null || facet.equals(IMAGE_FACET_NAME))
super.addStateAttribute(_imageState, name, value);
else super.setAttribute(name, value, facet);
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java?view=diff&r1=154704&r2=154705
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java
Mon Feb 21 10:46:44 2005
@@ -23,6 +23,7 @@
import
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.SpanCellModel;
import
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell.SpanCellDecorator;
import org.apache.beehive.netui.tags.html.HtmlConstants;
+import org.apache.beehive.netui.tags.html.IFormattable;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.tags.rendering.SpanTag;
@@ -32,9 +33,11 @@
* @netui.tldx:tag whitespace="indent"
*/
public class SpanCell
- extends AbstractHtmlTableCell {
+ extends AbstractHtmlTableCell
+ implements IFormattable {
private static final SpanCellDecorator DECORATOR = new SpanCellDecorator();
+ private static final String SPAN_FACET_NAME = "span";
private SpanCellModel _spanCellModel = new SpanCellModel();
private SpanTag.State _spanState = _spanCellModel.getSpanState();
@@ -238,7 +241,7 @@
public void setAttribute(String name, String value, String facet)
throws JspException {
- if(facet == null)
+ if(facet == null || facet.equals(SPAN_FACET_NAME))
super.addStateAttribute(_spanState, name, value);
else super.setAttribute(name, value, facet);
}
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IBehaviorConsumer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IBehaviorConsumer.java?view=diff&r1=154704&r2=154705
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IBehaviorConsumer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IBehaviorConsumer.java
Mon Feb 21 10:46:44 2005
@@ -1,3 +1,20 @@
+/*
+ * 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;
import javax.servlet.jsp.JspException;
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties?view=diff&r1=154704&r2=154705
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties
Mon Feb 21 10:46:44 2005
@@ -81,6 +81,7 @@
Tags_AttributeFacetNotSupported=The facet "<b>{0}</b>" is not supported by
this tag.
Tags_AttributeInvalidParent=The parent tag of this "<b>attribute</b>" does not
support dynamic attributes.
Tags_BehaviorInvalidParent=The parent tag of this "<b>behavior</b>" does not
support dynamic behaviors.
+Tags_BehaviorFacetNotSupported=The facet "<b>{0}</b>" is not supported by this
tag.
Tags_ButtonText=Click
Tags_ButtonTypeError=The type of a button must be one of 'submit', 'button' or
'reset', found ''{0}''.
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java?view=diff&r1=154704&r2=154705
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java
Mon Feb 21 10:46:44 2005
@@ -82,9 +82,9 @@
public void testPagerModel3() {
/*
row: 9
- pagesize: 10, set to 5
- current page: 1
- last page: 2
+ pagesize: 10, manually set to 5
+ current page: 0
+ last page: 1
*/
DataGridTestUtil.initQueryString(_jspContext, "netui_row=" +
DataGridTestUtil.DEFAULT_DATA_GRID_NAME + "~9");
DataGridTagModel dgm =
DataGridTestUtil.getDataGridTagModel(_jspContext);
@@ -101,7 +101,6 @@
String[] pagerParamValules = dgm.getPagerParamValues();
assertNotNull("Expected non-null pagerParamValues", pagerParamValules);
assertEquals("Invalud number of pager params", 3,
pagerParamValules.length);
- assertEquals("Invalud number of pager params", 3,
pagerParamValules.length);
assertEquals("Expected empty pagerParamValue[0]", "",
pagerParamValules[0]);
assertNotNull("Expected non-null next page query params",
dgm.getQueryParamsForNextPage());
@@ -113,6 +112,7 @@
row: 7
pagesize: 3
current page: 2
+ data set size: 12
*/
String name = "bugs";
DataGridTestUtil.initQueryString(_jspContext, "netui_pagesize=bugs~2");
@@ -122,7 +122,7 @@
assertEquals("Invalid page", 0, pm.getPage());
assertEquals("Invalid page size", 2, pm.getPageSize());
assertEquals("Invalid row", 0, pm.getRow());
- assertEquals("Invalid last page", 6, pm.getLastPage());
+ assertEquals("Invalid last page", 5, pm.getLastPage());
assertEquals("Invalid previous page", -1, pm.getPreviousPage());
assertEquals("Invalid next page", 1, pm.getNextPage());
}
@@ -151,7 +151,7 @@
pm.setDataSetSize(20);
- assertEquals("Invalid last page", 2, pm.getLastPage());
+ assertEquals("Invalid last page", 1, pm.getLastPage());
assertEquals("Previous page", -1, pm.getPreviousPage());
}
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/helloHeaderDecorator.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/helloHeaderDecorator.jsp?view=diff&r1=154704&r2=154705
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/helloHeaderDecorator.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/helloHeaderDecorator.jsp
Mon Feb 21 10:46:44 2005
@@ -29,15 +29,15 @@
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio"
styleClassPrefix="foo" >
<netui-data:header>
<netui-data:headerCell headerText="Symbol">
- <netui:attribute facet="renderer" name="extends"
value="databinding.datagrid.decorator.HelloWorldDecorator"/>
+ <netui:behavior facet="renderer" name="extends"
value="databinding.datagrid.decorator.HelloWorldDecorator"/>
</netui-data:headerCell>
<netui-data:headerCell headerText="Price">
- <netui:attribute facet="renderer" name="extends"
value="databinding.datagrid.decorator.HelloWorldDecorator"/>
- <netui:attribute facet="renderer" name="extends"
value="databinding.datagrid.decorator.FooDecorator"/>
+ <netui:behavior facet="renderer" name="extends"
value="databinding.datagrid.decorator.HelloWorldDecorator"/>
+ <netui:behavior facet="renderer" name="extends"
value="databinding.datagrid.decorator.FooDecorator"/>
</netui-data:headerCell>
<netui-data:headerCell headerText="Web">
- <netui:attribute facet="renderer" name="extends"
value="databinding.datagrid.decorator.FooDecorator"/>
- <netui:attribute facet="renderer" name="extends"
value="databinding.datagrid.decorator.HelloWorldDecorator"/>
+ <netui:behavior facet="renderer" name="extends"
value="databinding.datagrid.decorator.FooDecorator"/>
+ <netui:behavior facet="renderer" name="extends"
value="databinding.datagrid.decorator.HelloWorldDecorator"/>
</netui-data:headerCell>
</netui-data:header>
<netui-data:rows>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/pagerExplicitOverride.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/pagerExplicitOverride.jsp?view=diff&r1=154704&r2=154705
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/pagerExplicitOverride.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/pagerExplicitOverride.jsp
Mon Feb 21 10:46:44 2005
@@ -10,9 +10,9 @@
<datagrid:portfolioXmlBean/>
<br/>
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio"
resourceBundlePath="databinding.datagrid.resources.simple-test">
- <netui:attribute facet="resource" name="pager.msg.next" value="Next
Page (JSP)"/>
- <netui:attribute facet="resource" name="pager.msg.previous"
value="Previous Page (JSP)"/>
- <netui:attribute facet="resource" name="pager.fmt.banner" value="The
JSP thinks that you''re looking at page {0} of {1}"/>
+ <netui:behavior facet="resource" name="pager.msg.next" value="Next
Page (JSP)"/>
+ <netui:behavior facet="resource" name="pager.msg.previous"
value="Previous Page (JSP)"/>
+ <netui:behavior facet="resource" name="pager.fmt.banner" value="The
JSP thinks that you''re looking at page {0} of {1}"/>
<netui-data:configurePager pageSize="2"/>
<netui-data:header>
