Author: ivaynberg
Date: Fri May 30 16:03:56 2008
New Revision: 661908
URL: http://svn.apache.org/viewvc?rev=661908&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=661908&r1=661907&r2=661908&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:03:56 2008
@@ -18,6 +18,7 @@
import java.util.Collection;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import org.apache.wicket.Component;
@@ -72,7 +73,7 @@
* Type of model object
*
*/
-public class Palette<T> extends Panel<Collection<T>> implements
IHeaderContributor
+public class Palette<T> extends Panel<List<T>> implements IHeaderContributor
{
private static final String SELECTED_HEADER_ID = "selectedHeader";
@@ -168,7 +169,7 @@
* @param allowOrder
* Allow user to move selections up and down
*/
- public Palette(String id, IModel<Collection<T>> model,
IModel<Collection<T>> choicesModel,
+ public Palette(String id, IModel<List<T>> model, IModel<Collection<T>>
choicesModel,
IChoiceRenderer<T> choiceRenderer, int rows, boolean allowOrder)
{
super(id, model);
@@ -512,7 +513,7 @@
protected final void updateModel()
{
// prepare model
- Collection<T> model = getModelObject();
+ List<T> model = getModelObject();
model.clear();
// update model