You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/04/03 01:19:34 UTC
svn commit: r930431 -
/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
Author: ivaynberg
Date: Fri Apr 2 23:19:34 2010
New Revision: 930431
URL: http://svn.apache.org/viewvc?rev=930431&view=rev
Log:
ListMultipleChoice: updateModel method looses the value submitted from the select control
Issue: WICKET-2811
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
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=930431&r1=930430&r2=930431&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 Fri Apr 2 23:19:34 2010
@@ -16,6 +16,11 @@
*/
package org.apache.wicket.markup.html.form;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.StringTokenizer;
+
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
@@ -26,11 +31,6 @@ import org.apache.wicket.util.string.Str
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.StringTokenizer;
-
/**
* A multiple choice list component.
@@ -122,7 +122,8 @@ public class ListMultipleChoice<T> exten
/**
* @see org.apache.wicket.markup.html.form.AbstractChoice#AbstractChoice(String, IModel, List)
*/
- public ListMultipleChoice(final String id, IModel<? extends Collection<T>> object, final List<? extends T> choices)
+ public ListMultipleChoice(final String id, IModel<? extends Collection<T>> object,
+ final List<? extends T> choices)
{
super(id, (IModel<Collection<T>>)object, choices);
}
@@ -340,7 +341,7 @@ public class ListMultipleChoice<T> exten
}
else
{
- selectedValues = getConvertedInput();
+ selectedValues = new ArrayList<T>(getConvertedInput());
setDefaultModelObject(selectedValues);
}
}