Author: pete
Date: Fri Nov 18 11:16:28 2011
New Revision: 1203602
URL: http://svn.apache.org/viewvc?rev=1203602&view=rev
Log:
switch from using int to long in IDataProvider and the cascade from that
Issue: WICKET-1175
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/DataView.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/DataView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/DataView.java?rev=1203602&r1=1203601&r2=1203602&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/DataView.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/DataView.java
Fri Nov 18 11:16:28 2011
@@ -89,7 +89,7 @@ public abstract class DataView<T> extend
* @param itemsPerPage
* items per page
*/
- protected DataView(String id, IDataProvider<T> dataProvider, int
itemsPerPage)
+ protected DataView(String id, IDataProvider<T> dataProvider, long
itemsPerPage)
{
super(id, dataProvider);
setItemsPerPage(itemsPerPage);
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java?rev=1203602&r1=1203601&r2=1203602&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
Fri Nov 18 11:16:28 2011
@@ -147,7 +147,7 @@ public abstract class GridView<T> extend
private void updateItemsPerPage()
{
- int items = Integer.MAX_VALUE;
+ long items = Long.MAX_VALUE;
long result = (long)rows * (long)columns;
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java?rev=1203602&r1=1203601&r2=1203602&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
Fri Nov 18 11:16:28 2011
@@ -126,7 +126,7 @@ public class OIRPage extends BasePage
}
};
- dataView.setItemsPerPage(8);
+ dataView.setItemsPerPage(8L);
dataView.setItemReuseStrategy(ReuseIfModelsEqualStrategy.getInstance());
add(new OrderByBorder("orderByFirstName", "firstName", dp)
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.java?rev=1203602&r1=1203601&r2=1203602&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.java
Fri Nov 18 11:16:28 2011
@@ -67,7 +67,7 @@ public class PagingPage extends BasePage
}
};
- dataView.setItemsPerPage(8);
+ dataView.setItemsPerPage(8L);
add(dataView);
add(new PagingNavigator("navigator", dataView));
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java?rev=1203602&r1=1203601&r2=1203602&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java
Fri Nov 18 11:16:28 2011
@@ -68,7 +68,7 @@ public class SortingPage extends BasePag
}
};
- dataView.setItemsPerPage(8);
+ dataView.setItemsPerPage(8L);
add(new OrderByBorder("orderByFirstName", "firstName", dp)
{
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java?rev=1203602&r1=1203601&r2=1203602&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
Fri Nov 18 11:16:28 2011
@@ -132,7 +132,7 @@ public class DataTable<T> extends Panel
* number of rows per page
*/
public DataTable(final String id, final List<IColumn<T>> columns,
- final IDataProvider<T> dataProvider, final int rowsPerPage)
+ final IDataProvider<T> dataProvider, final long rowsPerPage)
{
super(id);
@@ -324,7 +324,7 @@ public class DataTable<T> extends Panel
* number of items to display per page
*
*/
- public void setItemsPerPage(final int items)
+ public void setItemsPerPage(final long items)
{
datagrid.setItemsPerPage(items);
}
