You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2016/04/25 09:57:12 UTC
[3/4] wicket git commit: moved casting of() method to IModel
moved casting of() method to IModel
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/533431d7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/533431d7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/533431d7
Branch: refs/heads/master
Commit: 533431d7ebda97f5c77a3d8bc1b2445fa5caebfb
Parents: 4f07ee1
Author: Sven Meier <sv...@apache.org>
Authored: Mon Apr 25 09:32:31 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 09:38:37 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/model/IModel.java | 15 ++++++++++++++-
.../src/main/java/org/apache/wicket/model/Model.java | 15 ---------------
2 files changed, 14 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/533431d7/wicket-core/src/main/java/org/apache/wicket/model/IModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/IModel.java b/wicket-core/src/main/java/org/apache/wicket/model/IModel.java
index a4522bd..9fdac84 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/IModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/IModel.java
@@ -282,4 +282,17 @@ public interface IModel<T> extends IDetachable
}
};
}
-}
+
+ /**
+ * Supresses generics warning when casting model types.
+ *
+ * @param <T>
+ * @param model
+ * @return cast <code>model</code>
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> IModel<T> of(IModel<?> model)
+ {
+ return (IModel<T>)model;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/533431d7/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 ded41cd..3c7b3a9 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
@@ -23,8 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.wicket.lambda.WicketConsumer;
-import org.apache.wicket.lambda.WicketSupplier;
import org.apache.wicket.model.util.CollectionModel;
import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.model.util.MapModel;
@@ -146,19 +144,6 @@ public class Model<T extends Serializable> implements IObjectClassAwareModel<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>.
*