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/03/11 14:16:48 UTC
git commit: WICKET-5528 Allow models of subtypes of Select type
parameter in SelectOption constructor
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x 24fba0fb0 -> 4fe4c999d
WICKET-5528 Allow models of subtypes of Select type parameter in SelectOption constructor
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4fe4c999
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4fe4c999
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4fe4c999
Branch: refs/heads/wicket-6.x
Commit: 4fe4c999d26a1203b17f96a90b072b8593d3b726
Parents: 24fba0f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Mar 11 15:14:31 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Mar 11 15:14:31 2014 +0200
----------------------------------------------------------------------
.../wicket/extensions/markup/html/form/select/SelectOption.java | 2 +-
.../wicket/extensions/markup/html/form/select/SelectOptions.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4fe4c999/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java
index 564eead..73eb4cc 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java
@@ -53,7 +53,7 @@ public class SelectOption<T> extends WebMarkupContainer
* @param model
* @see WebMarkupContainer#WebMarkupContainer(String, IModel)
*/
- public SelectOption(final String id, final IModel<T> model)
+ public SelectOption(final String id, final IModel<? extends T> model)
{
super(id, model);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/4fe4c999/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
index d5c2324..8116615 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
@@ -129,7 +129,7 @@ public class SelectOptions<T> extends RepeatingView
* @param model
* @return a {@link SelectOption}
*/
- protected SelectOption<T> newOption(final String text, final IModel<T> model)
+ protected SelectOption<T> newOption(final String text, final IModel<? extends T> model)
{
return new SimpleSelectOption<T>("option", model, text);
}
@@ -149,7 +149,7 @@ public class SelectOptions<T> extends RepeatingView
* @param model
* @param text
*/
- public SimpleSelectOption(final String id, final IModel<V> model, final String text)
+ public SimpleSelectOption(final String id, final IModel<? extends V> model, final String text)
{
super(id, model);
this.text = text;