Author: ivaynberg
Date: Fri May 30 16:02:52 2008
New Revision: 661907
URL: http://svn.apache.org/viewvc?rev=661907&view=rev
Log:
cleanupo
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java?rev=661907&r1=661906&r2=661907&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
Fri May 30 16:02:52 2008
@@ -81,7 +81,7 @@
private static final long serialVersionUID = 1L;
/** collection containing all available choices */
- private final IModel<Collection<? extends T>> choicesModel;
+ private final IModel<Collection<T>> choicesModel;
/**
* choice render used to render the choices in both available and
selected collections
@@ -147,7 +147,7 @@
* @param allowOrder
* Allow user to move selections up and down
*/
- public Palette(String id, IModel<Collection<? extends T>> choicesModel,
+ public Palette(String id, IModel<Collection<T>> choicesModel,
IChoiceRenderer<T> choiceRenderer, int rows, boolean allowOrder)
{
this(id, null, choicesModel, choiceRenderer, rows, allowOrder);
@@ -168,9 +168,8 @@
* @param allowOrder
* Allow user to move selections up and down
*/
- public Palette(String id, IModel<Collection<T>> model,
- IModel<Collection<? extends T>> choicesModel,
IChoiceRenderer<T> choiceRenderer, int rows,
- boolean allowOrder)
+ public Palette(String id, IModel<Collection<T>> model,
IModel<Collection<T>> choicesModel,
+ IChoiceRenderer<T> choiceRenderer, int rows, boolean allowOrder)
{
super(id, model);