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 2014/09/23 14:54:56 UTC
[2/3] git commit: WICKET-5350 remove wildcards from #ofList() and
others
WICKET-5350 remove wildcards from #ofList() and others
Reapply ee41e39a5695bef0f6fc3c31b38e5f78de21d018 by just making Wildcard**Model classes deprecated, instead of completely removing them.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/562d1ee5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/562d1ee5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/562d1ee5
Branch: refs/heads/master
Commit: 562d1ee536ebaa07206c90baebdda5280fbf68e3
Parents: ffb5a97
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Sep 23 14:49:58 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Sep 23 14:49:58 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/model/Model.java | 18 +++++++++---------
.../model/util/WildcardCollectionModel.java | 6 ++++--
.../wicket/model/util/WildcardListModel.java | 4 +++-
.../wicket/model/util/WildcardSetModel.java | 4 +++-
4 files changed, 19 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/562d1ee5/wicket-core/src/main/java/org/apache/wicket/model/Model.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/Model.java b/wicket-core/src/main/java/org/apache/wicket/model/Model.java
index 8cdadac..f48b26f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/Model.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/Model.java
@@ -24,10 +24,10 @@ import java.util.Map;
import java.util.Set;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.model.util.CollectionModel;
+import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.model.util.MapModel;
-import org.apache.wicket.model.util.WildcardCollectionModel;
-import org.apache.wicket.model.util.WildcardListModel;
-import org.apache.wicket.model.util.WildcardSetModel;
+import org.apache.wicket.model.util.SetModel;
import org.apache.wicket.util.lang.Objects;
@@ -78,9 +78,9 @@ public class Model<T extends Serializable> implements IModel<T>
* The List, which may or may not be Serializable
* @return A Model object wrapping the List
*/
- public static <C> IModel<List<? extends C>> ofList(final List<? extends C> list)
+ public static <C> IModel<List<C>> ofList(final List<C> list)
{
- return new WildcardListModel<>(list);
+ return new ListModel<>(list);
}
/**
@@ -110,9 +110,9 @@ public class Model<T extends Serializable> implements IModel<T>
* The Set, which may or may not be Serializable
* @return A Model object wrapping the Set
*/
- public static <C> IModel<Set<? extends C>> ofSet(final Set<? extends C> set)
+ public static <C> IModel<Set<C>> ofSet(final Set<C> set)
{
- return new WildcardSetModel<>(set);
+ return new SetModel<>(set);
}
/**
@@ -125,9 +125,9 @@ public class Model<T extends Serializable> implements IModel<T>
* The Collection, which may or may not be Serializable
* @return A Model object wrapping the Set
*/
- public static <C> IModel<Collection<? extends C>> of(final Collection<? extends C> collection)
+ public static <C> IModel<Collection<C>> of(final Collection<C> collection)
{
- return new WildcardCollectionModel<>(collection);
+ return new CollectionModel<>(collection);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/562d1ee5/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardCollectionModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardCollectionModel.java b/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardCollectionModel.java
index 8a8d138..fe81b5f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardCollectionModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardCollectionModel.java
@@ -26,7 +26,9 @@ import java.util.Collection;
* @author Timo Rantalaiho
* @param <T>
* type of object inside collection
+ * @deprecated Will be removed in Wicket 8
*/
+@Deprecated
public class WildcardCollectionModel<T> extends GenericBaseModel<Collection<? extends T>>
{
private static final long serialVersionUID = 1L;
@@ -52,6 +54,6 @@ public class WildcardCollectionModel<T> extends GenericBaseModel<Collection<? ex
@Override
protected Collection<? extends T> createSerializableVersionOf(Collection<? extends T> object)
{
- return new ArrayList<T>(object);
+ return new ArrayList<>(object);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/562d1ee5/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardListModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardListModel.java b/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardListModel.java
index 059e7c7..5f241d5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardListModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardListModel.java
@@ -26,7 +26,9 @@ import java.util.List;
* @author Timo Rantalaiho
* @param <T>
* type of object inside list
+ * @deprecated Will be removed in Wicket 8
*/
+@Deprecated
public class WildcardListModel<T> extends GenericBaseModel<List<? extends T>>
{
private static final long serialVersionUID = 1L;
@@ -59,4 +61,4 @@ public class WildcardListModel<T> extends GenericBaseModel<List<? extends T>>
}
return new ArrayList<T>(object);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/562d1ee5/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardSetModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardSetModel.java b/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardSetModel.java
index 97fabb7..bd3e11f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardSetModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/util/WildcardSetModel.java
@@ -26,7 +26,9 @@ import java.util.Set;
* @author Timo Rantalaiho
* @param <T>
* type of object inside set
+ * @deprecated Will be removed in Wicket 8
*/
+@Deprecated
public class WildcardSetModel<T> extends GenericBaseModel<Set<? extends T>>
{
private static final long serialVersionUID = 1L;
@@ -54,4 +56,4 @@ public class WildcardSetModel<T> extends GenericBaseModel<Set<? extends T>>
{
return new HashSet<T>(object);
}
-}
\ No newline at end of file
+}