You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2012/01/25 00:02:33 UTC
git commit: parameter rename + method reorder
Updated Branches:
refs/heads/master 09d01b18d -> dffeb3065
parameter rename + method reorder
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/dffeb306
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/dffeb306
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/dffeb306
Branch: refs/heads/master
Commit: dffeb30654cca5d65ea27a6d558647d61022179f
Parents: 09d01b1
Author: Peter Ertl <pe...@apache.org>
Authored: Tue Jan 24 23:58:43 2012 +0100
Committer: Peter Ertl <pe...@apache.org>
Committed: Wed Jan 25 00:02:05 2012 +0100
----------------------------------------------------------------------
.../main/java/org/apache/wicket/model/Model.java | 32 +++++++-------
1 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/dffeb306/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 382021f..e11ca92 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
@@ -121,13 +121,13 @@ public class Model<T extends Serializable> implements IModel<T>
*
* @param <C>
* model type
- * @param set
+ * @param collection
* 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> set)
+ public static <C> IModel<Collection<? extends C>> of(final Collection<? extends C> collection)
{
- return new WildcardCollectionModel<C>(set);
+ return new WildcardCollectionModel<C>(collection);
}
@@ -145,6 +145,19 @@ public class Model<T extends Serializable> implements IModel<T>
}
/**
+ * Supresses generics warning when converting model types
+ *
+ * @param <T>
+ * @param model
+ * @return <code>model</code>
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> IModel<T> of(IModel<?> model)
+ {
+ return (IModel<T>)model;
+ }
+
+ /**
* Factory methods for Model which uses type inference to make code shorter. Equivalent to
* <code>new Model<TypeOfObject>()</code>.
*
@@ -230,17 +243,4 @@ public class Model<T extends Serializable> implements IModel<T>
Model<?> that = (Model<?>)obj;
return Objects.equal(object, that.object);
}
-
- /**
- * Supresses generics warning when converting model types
- *
- * @param <T>
- * @param model
- * @return <code>model</code>
- */
- @SuppressWarnings("unchecked")
- public static <T> IModel<T> of(IModel<?> model)
- {
- return (IModel<T>)model;
- }
}