You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/10/03 10:41:05 UTC
git commit: Make the items iterator public so it could be reused from
outside if needed by other grid view impls
Updated Branches:
refs/heads/wicket-1.5.x 22223e20b -> 23a59ea6d
Make the items iterator public so it could be reused from outside if needed by other grid view impls
Merge 9bae51f1bc169db9f578e4b2c0f25d4cbe12a156 from master.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/23a59ea6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/23a59ea6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/23a59ea6
Branch: refs/heads/wicket-1.5.x
Commit: 23a59ea6d7bf2ecc2949de4b3b6b899510a2f8cd
Parents: 22223e2
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Oct 3 11:40:17 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Oct 3 11:40:17 2012 +0300
----------------------------------------------------------------------
.../wicket/markup/repeater/data/GridView.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/23a59ea6/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
index 0d0735e..2f93628 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
@@ -16,14 +16,15 @@
*/
package org.apache.wicket.markup.repeater.data;
-import java.util.Iterator;
-
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Generics;
+import java.util.Iterator;
+
/**
* A pageable DataView which breaks the data in the IDataProvider into a number of data-rows,
@@ -262,7 +263,7 @@ public abstract class GridView<T> extends DataViewBase<T>
* @param <T>
*
*/
- private static class ItemsIterator<T> implements Iterator<Item<T>>
+ public static class ItemsIterator<T> implements Iterator<Item<T>>
{
private final Iterator<MarkupContainer> rows;
private Iterator<Item<T>> cells;
@@ -275,7 +276,7 @@ public abstract class GridView<T> extends DataViewBase<T>
*/
public ItemsIterator(Iterator<MarkupContainer> rows)
{
- this.rows = rows;
+ this.rows = Args.notNull(rows, "rows");
findNext();
}