Repository: wicket Updated Branches: refs/heads/master d0503eccf -> e25832d15
Improve javadoc of IModel and Model classes Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e25832d1 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e25832d1 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e25832d1 Branch: refs/heads/master Commit: e25832d1575709dcab55d934e223e52c412e30a9 Parents: d0503ec Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Nov 1 20:52:54 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Nov 1 20:52:54 2016 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/model/IModel.java | 12 ++++++------ .../src/main/java/org/apache/wicket/model/Model.java | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/e25832d1/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 cfb6bfe..55b5f04 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 @@ -90,7 +90,7 @@ public interface IModel<T> extends IDetachable /** * Returns a IModel checking whether the predicate holds for the contained object, if it is not - * null. If the predicate doesn't evaluate to true, the contained object will be null. + * {@code null}. If the predicate doesn't evaluate to {@code true}, the contained object will be {@code null}. * * @param predicate * a predicate to be used for testing the contained object @@ -138,8 +138,8 @@ public interface IModel<T> extends IDetachable } /** - * Returns a @IModel@ applying the given combining function to the current model object and - * to the one from the other model, if they are not null. + * Returns a {@link IModel} applying the given combining function to the current model object and + * to the one from the other model, if they are not {@code null}. * * @param <R> * the resulting type @@ -171,7 +171,7 @@ public interface IModel<T> extends IDetachable } /** - * Returns a IModel applying the given IModel-bearing mapper to the contained object, if it is not NULL. + * Returns a IModel applying the given IModel-bearing mapper to the contained object, if it is not {@code null}. * * @param <R> * the new type of the contained object @@ -284,14 +284,14 @@ public interface IModel<T> extends IDetachable } /** - * Supresses generics warning when casting model types. + * Suppresses 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) + static <T> IModel<T> of(IModel<?> model) { return (IModel<T>)model; } http://git-wip-us.apache.org/repos/asf/wicket/blob/e25832d1/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 3c7b3a9..2b2c210 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 @@ -69,7 +69,7 @@ public class Model<T extends Serializable> implements IObjectClassAwareModel<T> /** * Factory method for models that contain lists. This factory method will automatically rebuild - * a nonserializable <code>list</code> into a serializable one. + * a non-serializable <code>list</code> into a serializable one. * * @param <C> * model type @@ -84,7 +84,7 @@ public class Model<T extends Serializable> implements IObjectClassAwareModel<T> /** * Factory method for models that contain maps. This factory method will automatically rebuild a - * nonserializable <code>map</code> into a serializable one. + * non-serializable <code>map</code> into a serializable one. * * @param <K> * key type in map @@ -101,7 +101,7 @@ public class Model<T extends Serializable> implements IObjectClassAwareModel<T> /** * Factory method for models that contain sets. This factory method will automatically rebuild a - * nonserializable <code>set</code> into a serializable one. + * non-serializable <code>set</code> into a serializable one. * * @param <C> * model type @@ -116,7 +116,7 @@ public class Model<T extends Serializable> implements IObjectClassAwareModel<T> /** * Factory method for models that contain collections. This factory method will automatically - * rebuild a nonserializable <code>collection</code> into a serializable {@link ArrayList}. + * rebuild a non-serializable <code>collection</code> into a serializable {@link ArrayList}. * * @param <C> * model type
