Author: ivaynberg
Date: Thu Apr 17 00:10:54 2008
New Revision: 648986
URL: http://svn.apache.org/viewvc?rev=648986&view=rev
Log:
wip WICKET-1512 generics widening
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListChoice.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java?rev=648986&r1=648985&r2=648986&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java
Thu Apr 17 00:10:54 2008
@@ -81,7 +81,7 @@
{
super(id);
// sort locales on strings of selected locale
- setChoices(new AbstractReadOnlyModel<List<Locale>>()
+ setChoices(new AbstractReadOnlyModel<List< ? extends
Locale>>()
{
@Override
public List<Locale> getObject()
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=648986&r1=648985&r2=648986&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Thu Apr
17 00:10:54 2008
@@ -3891,7 +3891,7 @@
// apply behaviors that are attached to the component
tag.
if (tag.hasBehaviors())
{
- Iterator<IBehavior> tagBehaviors =
tag.getBehaviors();
+ Iterator< ? extends IBehavior> tagBehaviors =
tag.getBehaviors();
while (tagBehaviors.hasNext())
{
final IBehavior behavior =
tagBehaviors.next();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java?rev=648986&r1=648985&r2=648986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
Thu Apr 17 00:10:54 2008
@@ -163,7 +163,7 @@
/**
* @return read only iterator over added behaviors
*/
- public final Iterator<IBehavior> getBehaviors()
+ public final Iterator<? extends IBehavior> getBehaviors()
{
if (behaviors == null)
{
@@ -171,8 +171,7 @@
return lst.iterator();
}
- Collection<IBehavior> locked =
Collections.unmodifiableCollection(behaviors);
- return locked.iterator();
+ return Collections.unmodifiableCollection(behaviors).iterator();
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java?rev=648986&r1=648985&r2=648986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
Thu Apr 17 00:10:54 2008
@@ -49,7 +49,7 @@
private static final long serialVersionUID = 1L;
/** The list of objects. */
- private IModel<List<E>> choices;
+ private IModel<List< ? extends E>> choices;
/** The renderer used to generate display/id values for the objects. */
private IChoiceRenderer<E> renderer;
@@ -75,7 +75,7 @@
* The collection of choices in the dropdown
* @see org.apache.wicket.Component#Component(String)
*/
- public AbstractChoice(final String id, final List<E> choices)
+ public AbstractChoice(final String id, final List< ? extends E> choices)
{
this(id, new Model((Serializable)choices), new
ChoiceRenderer<E>());
}
@@ -91,7 +91,8 @@
* The collection of choices in the dropdown
* @see org.apache.wicket.Component#Component(String)
*/
- public AbstractChoice(final String id, final List<E> choices, final
IChoiceRenderer<E> renderer)
+ public AbstractChoice(final String id, final List< ? extends E> choices,
+ final IChoiceRenderer<E> renderer)
{
this(id, new Model((Serializable)choices), renderer);
}
@@ -107,7 +108,7 @@
* The collection of choices in the dropdown
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public AbstractChoice(final String id, IModel<T> model, final List<E>
choices)
+ public AbstractChoice(final String id, IModel<T> model, final List< ?
extends E> choices)
{
this(id, model, new Model((Serializable)choices), new
ChoiceRenderer<E>());
}
@@ -125,7 +126,7 @@
* The rendering engine
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public AbstractChoice(final String id, IModel<T> model, final List<E>
choices,
+ public AbstractChoice(final String id, IModel<T> model, final List< ?
extends E> choices,
final IChoiceRenderer<E> renderer)
{
this(id, model, new Model((Serializable)choices), renderer);
@@ -140,7 +141,7 @@
* The collection of choices in the dropdown
* @see org.apache.wicket.Component#Component(String)
*/
- public AbstractChoice(final String id, final IModel<List<E>> choices)
+ public AbstractChoice(final String id, final IModel<List< ? extends E>>
choices)
{
this(id, choices, new ChoiceRenderer<E>());
}
@@ -156,7 +157,7 @@
* The collection of choices in the dropdown
* @see org.apache.wicket.Component#Component(String)
*/
- public AbstractChoice(final String id, final IModel<List<E>> choices,
+ public AbstractChoice(final String id, final IModel<List< ? extends E>>
choices,
final IChoiceRenderer<E> renderer)
{
super(id);
@@ -175,7 +176,7 @@
* The collection of choices in the dropdown
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public AbstractChoice(final String id, IModel<T> model, final
IModel<List<E>> choices)
+ public AbstractChoice(final String id, IModel<T> model, final
IModel<List< ? extends E>> choices)
{
this(id, model, choices, new ChoiceRenderer<E>());
}
@@ -193,8 +194,8 @@
* The drop down choices
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public AbstractChoice(final String id, IModel<T> model, final
IModel<List<E>> choices,
- final IChoiceRenderer<E> renderer)
+ public AbstractChoice(final String id, IModel<T> model,
+ final IModel<List< ? extends E>> choices, final
IChoiceRenderer<E> renderer)
{
super(id, model);
this.choices = wrap(choices);
@@ -205,7 +206,7 @@
/**
* @return The collection of object that this choice has
*/
- public List<E> getChoices()
+ public List< ? extends E> getChoices()
{
List<E> choices = (this.choices != null) ?
(List<E>)this.choices.getObject() : null;
if (choices == null)
@@ -224,7 +225,7 @@
* model representing the list of choices
* @return this for chaining
*/
- public final AbstractChoice<T, E> setChoices(IModel<List<E>> choices)
+ public final AbstractChoice<T, E> setChoices(IModel<List< ? extends E>>
choices)
{
if (this.choices != null && this.choices != choices)
{
@@ -347,7 +348,7 @@
@Override
protected void onComponentTagBody(final MarkupStream markupStream,
final ComponentTag openTag)
{
- List<E> choices = getChoices();
+ List< ? extends E> choices = getChoices();
final AppendingStringBuffer buffer = new
AppendingStringBuffer((choices.size() * 50) + 16);
final String selected = getValue();
@@ -459,7 +460,7 @@
{
private static final long serialVersionUID = 1L;
- private final IModel<List<E>> oldChoices;
+ private final IModel<List< ? extends E>> oldChoices;
/**
* Construct.
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java?rev=648986&r1=648985&r2=648986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractSingleSelectChoice.java
Thu Apr 17 00:10:54 2008
@@ -59,7 +59,7 @@
/**
* @see AbstractChoice#AbstractChoice(String, List)
*/
- public AbstractSingleSelectChoice(final String id, final List<T>
choices)
+ public AbstractSingleSelectChoice(final String id, final List< ?
extends T> choices)
{
super(id, choices);
}
@@ -70,7 +70,7 @@
* @param renderer
* @see AbstractChoice#AbstractChoice(String, List ,IChoiceRenderer)
*/
- public AbstractSingleSelectChoice(final String id, final List<T> data,
+ public AbstractSingleSelectChoice(final String id, final List< ?
extends T> data,
final IChoiceRenderer<T> renderer)
{
super(id, data, renderer);
@@ -79,7 +79,8 @@
/**
* @see AbstractChoice#AbstractChoice(String, IModel, List)
*/
- public AbstractSingleSelectChoice(final String id, IModel<T> model,
final List<T> data)
+ public AbstractSingleSelectChoice(final String id, IModel<T> model,
+ final List< ? extends T> data)
{
super(id, model, data);
}
@@ -91,8 +92,8 @@
* @param renderer
* @see AbstractChoice#AbstractChoice(String, IModel, List,
IChoiceRenderer)
*/
- public AbstractSingleSelectChoice(final String id, IModel<T> model,
final List<T> data,
- final IChoiceRenderer<T> renderer)
+ public AbstractSingleSelectChoice(final String id, IModel<T> model,
+ final List< ? extends T> data, final IChoiceRenderer<T>
renderer)
{
super(id, model, data, renderer);
}
@@ -100,7 +101,7 @@
/**
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel)
*/
- public AbstractSingleSelectChoice(String id, IModel<List<T>> choices)
+ public AbstractSingleSelectChoice(String id, IModel<List< ? extends T>>
choices)
{
super(id, choices);
}
@@ -108,7 +109,7 @@
/**
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
IModel,IModel)
*/
- public AbstractSingleSelectChoice(String id, IModel<T> model,
IModel<List<T>> choices)
+ public AbstractSingleSelectChoice(String id, IModel<T> model,
IModel<List< ? extends T>> choices)
{
super(id, model, choices);
}
@@ -117,7 +118,7 @@
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
* IModel,IChoiceRenderer)
*/
- public AbstractSingleSelectChoice(String id, IModel<List<T>> choices,
+ public AbstractSingleSelectChoice(String id, IModel<List< ? extends T>>
choices,
IChoiceRenderer<T> renderer)
{
super(id, choices, renderer);
@@ -128,8 +129,8 @@
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,
* IModel,IChoiceRenderer)
*/
- public AbstractSingleSelectChoice(String id, IModel<T> model,
IModel<List<T>> choices,
- IChoiceRenderer<T> renderer)
+ public AbstractSingleSelectChoice(String id, IModel<T> model,
+ IModel<List< ? extends T>> choices, IChoiceRenderer<T> renderer)
{
super(id, model, choices, renderer);
}
@@ -197,7 +198,7 @@
*/
protected T convertChoiceIdToChoice(String id)
{
- final List<T> choices = getChoices();
+ final List< ? extends T> choices = getChoices();
final IChoiceRenderer<T> renderer = getChoiceRenderer();
for (int index = 0; index < choices.size(); index++)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java?rev=648986&r1=648985&r2=648986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java
Thu Apr 17 00:10:54 2008
@@ -115,7 +115,7 @@
// check if the model collection of the group contains the
model object.
// if it does check the check box.
- Collection<T> collection = group.getModelObject();
+ Collection<? extends T> collection = group.getModelObject();
// check for npe in group's model object
if (collection == null)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java?rev=648986&r1=648985&r2=648986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
Thu Apr 17 00:10:54 2008
@@ -232,7 +232,7 @@
* @see org.apache.wicket.Component#Component(String)
* @see AbstractChoice#AbstractChoice(String,
org.apache.wicket.model.IModel)
*/
- public CheckBoxMultipleChoice(String id, IModel<List<T>> choices)
+ public CheckBoxMultipleChoice(String id, IModel<List< ? extends T>>
choices)
{
super(id, choices);
}
@@ -250,7 +250,8 @@
* org.apache.wicket.model.IModel,org.apache.wicket.model.IModel)
* @see org.apache.wicket.Component#Component(String,
org.apache.wicket.model.IModel)
*/
- public CheckBoxMultipleChoice(String id, IModel<Collection<T>> model,
IModel<List<T>> choices)
+ public CheckBoxMultipleChoice(String id, IModel<Collection<T>> model,
+ IModel<List< ? extends T>> choices)
{
super(id, model, choices);
}
@@ -268,7 +269,8 @@
*
org.apache.wicket.model.IModel,org.apache.wicket.markup.html.form.IChoiceRenderer)
* @see org.apache.wicket.Component#Component(String)
*/
- public CheckBoxMultipleChoice(String id, IModel<List<T>> choices,
IChoiceRenderer<T> renderer)
+ public CheckBoxMultipleChoice(String id, IModel<List< ? extends T>>
choices,
+ IChoiceRenderer<T> renderer)
{
super(id, choices, renderer);
}
@@ -289,8 +291,8 @@
* @see AbstractChoice#AbstractChoice(String,
org.apache.wicket.model.IModel,
*
org.apache.wicket.model.IModel,org.apache.wicket.markup.html.form.IChoiceRenderer)
*/
- public CheckBoxMultipleChoice(String id, IModel<Collection<T>> model,
IModel<List<T>> choices,
- IChoiceRenderer<T> renderer)
+ public CheckBoxMultipleChoice(String id, IModel<Collection<T>> model,
+ IModel<List< ? extends T>> choices, IChoiceRenderer<T> renderer)
{
super(id, model, choices, renderer);
}
@@ -370,7 +372,7 @@
final ComponentTag openTag)
{
// Iterate through choices
- final List<T> choices = getChoices();
+ final List< ? extends T> choices = getChoices();
// Buffer to hold generated body
final AppendingStringBuffer buffer = new
AppendingStringBuffer(70 * (choices.size() + 1));
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java?rev=648986&r1=648985&r2=648986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
Thu Apr 17 00:10:54 2008
@@ -60,7 +60,7 @@
* @param <T>
* The model object type
*/
-public class CheckGroup<T> extends FormComponent<Collection<T>> implements
IOnChangeListener
+public class CheckGroup<T> extends FormComponent<Collection<? extends T>>
implements IOnChangeListener
{
private static final long serialVersionUID = 1L;
@@ -85,7 +85,7 @@
* collection to be used as the model
*
*/
- public CheckGroup(String id, Collection<T> collection)
+ public CheckGroup(String id, Collection<? extends T> collection)
{
this(id, new Model((Serializable)collection));
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java?rev=648986&r1=648985&r2=648986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
Thu Apr 17 00:10:54 2008
@@ -79,7 +79,7 @@
/**
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, List)
*/
- public DropDownChoice(final String id, final List<T> choices)
+ public DropDownChoice(final String id, final List< ? extends T> choices)
{
super(id, choices);
}
@@ -88,7 +88,8 @@
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
* List,IChoiceRenderer)
*/
- public DropDownChoice(final String id, final List<T> data, final
IChoiceRenderer<T> renderer)
+ public DropDownChoice(final String id, final List< ? extends T> data,
+ final IChoiceRenderer<T> renderer)
{
super(id, data, renderer);
}
@@ -96,7 +97,7 @@
/**
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
IModel, List)
*/
- public DropDownChoice(final String id, IModel<T> model, final List<T>
choices)
+ public DropDownChoice(final String id, IModel<T> model, final List< ?
extends T> choices)
{
super(id, model, choices);
}
@@ -105,7 +106,7 @@
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
IModel, List,
* IChoiceRenderer)
*/
- public DropDownChoice(final String id, IModel<T> model, final List<T>
data,
+ public DropDownChoice(final String id, IModel<T> model, final List< ?
extends T> data,
final IChoiceRenderer<T> renderer)
{
super(id, model, data, renderer);
@@ -114,7 +115,7 @@
/**
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel)
*/
- public DropDownChoice(String id, IModel<List<T>> choices)
+ public DropDownChoice(String id, IModel<List< ? extends T>> choices)
{
super(id, choices);
}
@@ -122,7 +123,7 @@
/**
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
IModel,IModel)
*/
- public DropDownChoice(String id, IModel<T> model, IModel<List<T>>
choices)
+ public DropDownChoice(String id, IModel<T> model, IModel<List< ?
extends T>> choices)
{
super(id, model, choices);
}
@@ -131,7 +132,7 @@
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
* IModel,IChoiceRenderer)
*/
- public DropDownChoice(String id, IModel<List<T>> choices,
IChoiceRenderer<T> renderer)
+ public DropDownChoice(String id, IModel<List< ? extends T>> choices,
IChoiceRenderer<T> renderer)
{
super(id, choices, renderer);
}
@@ -141,7 +142,7 @@
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,
* IModel,IChoiceRenderer)
*/
- public DropDownChoice(String id, IModel<T> model, IModel<List<T>>
choices,
+ public DropDownChoice(String id, IModel<T> model, IModel<List< ?
extends T>> choices,
IChoiceRenderer<T> renderer)
{
super(id, model, choices, renderer);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListChoice.java?rev=648986&r1=648985&r2=648986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListChoice.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListChoice.java
Thu Apr 17 00:10:54 2008
@@ -167,7 +167,7 @@
/**
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel)
*/
- public ListChoice(String id, IModel<List<T>> choices)
+ public ListChoice(String id, IModel<List< ? extends T>> choices)
{
this(id, null, choices, null, defaultMaxRows);
}
@@ -175,7 +175,7 @@
/**
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
IModel,IModel)
*/
- public ListChoice(String id, IModel<T> model, IModel<List<T>> choices)
+ public ListChoice(String id, IModel<T> model, IModel<List< ? extends
T>> choices)
{
this(id, model, choices, null, defaultMaxRows);
}
@@ -184,7 +184,7 @@
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
* IModel,IChoiceRenderer)
*/
- public ListChoice(String id, IModel<List<T>> choices,
IChoiceRenderer<T> renderer)
+ public ListChoice(String id, IModel<List< ? extends T>> choices,
IChoiceRenderer<T> renderer)
{
this(id, null, choices, renderer, defaultMaxRows);
}
@@ -194,7 +194,7 @@
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,
* IModel,IChoiceRenderer)
*/
- public ListChoice(String id, IModel<T> model, IModel<List<T>> choices,
+ public ListChoice(String id, IModel<T> model, IModel<List< ? extends
T>> choices,
IChoiceRenderer<T> renderer)
{
this(id, model, choices, renderer, defaultMaxRows);
@@ -204,7 +204,7 @@
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,
* IModel,IChoiceRenderer)
*/
- public ListChoice(String id, IModel<T> model, IModel<List<T>> choices,
+ public ListChoice(String id, IModel<T> model, IModel<List< ? extends
T>> choices,
IChoiceRenderer<T> renderer, int maxRows)
{
super(id, model, choices, renderer);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java?rev=648986&r1=648985&r2=648986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
Thu Apr 17 00:10:54 2008
@@ -141,7 +141,7 @@
/**
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel)
*/
- public ListMultipleChoice(String id, IModel<List<T>> choices)
+ public ListMultipleChoice(String id, IModel<List< ? extends T>> choices)
{
super(id, choices);
}
@@ -149,7 +149,8 @@
/**
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
IModel,IModel)
*/
- public ListMultipleChoice(String id, IModel<Collection<T>> model,
IModel<List<T>> choices)
+ public ListMultipleChoice(String id, IModel<Collection<T>> model,
+ IModel<List< ? extends T>> choices)
{
super(id, model, choices);
}
@@ -158,7 +159,8 @@
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
* IModel,IChoiceRenderer)
*/
- public ListMultipleChoice(String id, IModel<List<T>> choices,
IChoiceRenderer<T> renderer)
+ public ListMultipleChoice(String id, IModel<List< ? extends T>> choices,
+ IChoiceRenderer<T> renderer)
{
super(id, choices, renderer);
}
@@ -168,8 +170,8 @@
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,
* IModel,IChoiceRenderer)
*/
- public ListMultipleChoice(String id, IModel<Collection<T>> model,
IModel<List<T>> choices,
- IChoiceRenderer<T> renderer)
+ public ListMultipleChoice(String id, IModel<Collection<T>> model,
+ IModel<List< ? extends T>> choices, IChoiceRenderer<T> renderer)
{
super(id, model, choices, renderer);
}
@@ -206,7 +208,7 @@
final AppendingStringBuffer buffer = new
AppendingStringBuffer();
if (selectedValues != null)
{
- final List<T> choices = getChoices();
+ final List< ? extends T> choices = getChoices();
for (final Iterator<T> iterator =
selectedValues.iterator(); iterator.hasNext();)
{
final T object = iterator.next();
@@ -288,7 +290,7 @@
if (ids != null && ids.length > 0 && !Strings.isEmpty(ids[0]))
{
// Get values that could be selected
- final List<T> choices = getChoices();
+ final List< ? extends T> choices = getChoices();
// Loop through selected indices
for (int i = 0; i < ids.length; i++)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java?rev=648986&r1=648985&r2=648986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
Thu Apr 17 00:10:54 2008
@@ -233,7 +233,7 @@
* @see org.apache.wicket.Component#Component(String)
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel)
*/
- public RadioChoice(String id, IModel<List<T>> choices)
+ public RadioChoice(String id, IModel<List< ? extends T>> choices)
{
super(id, choices);
}
@@ -250,7 +250,7 @@
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String,
IModel,IModel)
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public RadioChoice(String id, IModel<T> model, IModel<List<T>> choices)
+ public RadioChoice(String id, IModel<T> model, IModel<List< ? extends
T>> choices)
{
super(id, model, choices);
}
@@ -268,7 +268,7 @@
* IModel,IChoiceRenderer)
* @see org.apache.wicket.Component#Component(String)
*/
- public RadioChoice(String id, IModel<List<T>> choices,
IChoiceRenderer<T> renderer)
+ public RadioChoice(String id, IModel<List< ? extends T>> choices,
IChoiceRenderer<T> renderer)
{
super(id, choices, renderer);
}
@@ -289,7 +289,7 @@
* @see
org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel,
* IModel,IChoiceRenderer)
*/
- public RadioChoice(String id, IModel<T> model, IModel<List<T>> choices,
+ public RadioChoice(String id, IModel<T> model, IModel<List< ? extends
T>> choices,
IChoiceRenderer<T> renderer)
{
super(id, model, choices, renderer);
@@ -409,7 +409,7 @@
final ComponentTag openTag)
{
// Iterate through choices
- final List<T> choices = getChoices();
+ final List< ? extends T> choices = getChoices();
// Buffer to hold generated body
final AppendingStringBuffer buffer = new
AppendingStringBuffer((choices.size() + 1) * 70);
