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 2015/06/24 14:58:53 UTC
[47/50] [abbrv] wicket git commit: WICKET-5931 Improved generics for
ListView
WICKET-5931 Improved generics for ListView<T>
This fixes WICKET-5931 by removing the wildcard for T.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/83015052
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/83015052
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/83015052
Branch: refs/heads/master
Commit: 83015052d0fdff22c7c023ea74df0fef4a1a8ddd
Parents: 235d57b
Author: Martijn Dashorst <ma...@gmail.com>
Authored: Tue Jun 23 10:32:50 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jun 24 14:56:35 2015 +0300
----------------------------------------------------------------------
.../apache/wicket/markup/html/list/ListView.java | 14 +++++++-------
.../wicket/markup/html/list/PageableListView.java | 4 ++--
.../wicket/markup/html/list/PropertyListView.java | 4 ++--
.../wicket/markup/html/list/ListViewTest.java | 17 ++++++++++-------
4 files changed, 21 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/83015052/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListView.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListView.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListView.java
index 57f9d84..e179d9e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListView.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListView.java
@@ -134,7 +134,7 @@ public abstract class ListView<T> extends AbstractRepeater
* @param model model containing a list of
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public ListView(final String id, final IModel<? extends List<? extends T>> model)
+ public ListView(final String id, final IModel<? extends List<T>> model)
{
super(id, model);
@@ -156,7 +156,7 @@ public abstract class ListView<T> extends AbstractRepeater
* List to cast to Serializable
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public ListView(final String id, final List<? extends T> list)
+ public ListView(final String id, final List<T> list)
{
this(id, Model.ofList(list));
}
@@ -169,9 +169,9 @@ public abstract class ListView<T> extends AbstractRepeater
* @return The list of items in this list view.
*/
@SuppressWarnings("unchecked")
- public final List<? extends T> getList()
+ public final List<T> getList()
{
- final List<? extends T> list = (List<? extends T>)getDefaultModelObject();
+ final List<T> list = (List<T>)getDefaultModelObject();
if (list == null)
{
return Collections.emptyList();
@@ -364,7 +364,7 @@ public abstract class ListView<T> extends AbstractRepeater
* The list for the new model. The list must implement {@link Serializable}.
* @return This for chaining
*/
- public ListView<T> setList(List<? extends T> list)
+ public ListView<T> setList(List<T> list)
{
setDefaultModel(Model.ofList(list));
return this;
@@ -638,9 +638,9 @@ public abstract class ListView<T> extends AbstractRepeater
* @return model object
*/
@SuppressWarnings("unchecked")
- public final List<? extends T> getModelObject()
+ public final List<T> getModelObject()
{
- return (List<? extends T>)getDefaultModelObject();
+ return (List<T>)getDefaultModelObject();
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/83015052/wicket-core/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
index 7690db2..b1f22a8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
@@ -51,7 +51,7 @@ public abstract class PageableListView<T> extends ListView<T> implements IPageab
* @param itemsPerPage
* Number of rows to show on a page
*/
- public PageableListView(final String id, final IModel<? extends List<? extends T>> model,
+ public PageableListView(final String id, final IModel<? extends List<T>> model,
int itemsPerPage)
{
super(id, model);
@@ -70,7 +70,7 @@ public abstract class PageableListView<T> extends ListView<T> implements IPageab
* Number of rows to show on a page
* @see ListView#ListView(String, List)
*/
- public PageableListView(final String id, final List<? extends T> list, final int itemsPerPage)
+ public PageableListView(final String id, final List<T> list, final int itemsPerPage)
{
super(id, list);
this.itemsPerPage = itemsPerPage;
http://git-wip-us.apache.org/repos/asf/wicket/blob/83015052/wicket-core/src/main/java/org/apache/wicket/markup/html/list/PropertyListView.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/list/PropertyListView.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/list/PropertyListView.java
index b458ed0..ffd4286 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/list/PropertyListView.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/list/PropertyListView.java
@@ -57,7 +57,7 @@ public abstract class PropertyListView<T> extends ListView<T>
* @param model
* wrapping a List
*/
- public PropertyListView(final String id, final IModel<? extends List<? extends T>> model)
+ public PropertyListView(final String id, final IModel<? extends List<T>> model)
{
super(id, model);
}
@@ -71,7 +71,7 @@ public abstract class PropertyListView<T> extends ListView<T>
* @param list
* unmodeled List
*/
- public PropertyListView(final String id, final List<? extends T> list)
+ public PropertyListView(final String id, final List<T> list)
{
super(id, list);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/83015052/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
index 65ea789..6c41d6f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
@@ -62,31 +62,34 @@ public class ListViewTest extends WicketTestCase
/**
*/
@Test
- public void generics() {
+ public void generics()
+ {
// a listView for numbers
- class NumberListView extends ListView<Number> {
+ class NumberListView<N extends Number> extends ListView<N>
+ {
private static final long serialVersionUID = 1L;
// since the given list is not changed actually, we can safely
// accept lists accepting subtypes of numbers only
- public NumberListView(String id, IModel<? extends List<? extends Number>> model)
+ public NumberListView(String id, IModel<? extends List<N>> model)
{
super(id, model);
}
@Override
- protected void populateItem(ListItem<Number> item)
+ protected void populateItem(ListItem<N> item)
{
// non-fancy display of the number
add(new Label("label", item.getModel()));
}
- };
-
+ }
+ ;
+
IModel<List<Integer>> integers = new ListModel<>(new ArrayList<Integer>());
// pass list of integers to the number listView
- new NumberListView("integers", integers);
+ new NumberListView<>("integers", integers);
}
/**