svn commit: r930393 - in /wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form: CheckBoxMultipleChoice.java upload/MultiFileUploadField.java

[ivaynberg]

Author: ivaynberg
Date: Fri Apr  2 21:29:36 2010
New Revision: 930393

URL: http://svn.apache.org/viewvc?rev=930393&view=rev
Log:
WICKET-2821

Modified:
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java?rev=930393&r1=930392&r2=930393&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
 Fri Apr  2 21:29:36 2010
@@ -16,9 +16,6 @@
  */
 package org.apache.wicket.markup.html.form;
 
-import java.util.Collection;
-import java.util.List;
-
 import org.apache.wicket.Page;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.MarkupStream;
@@ -28,6 +25,9 @@ import org.apache.wicket.util.string.App
 import org.apache.wicket.util.string.Strings;
 import org.apache.wicket.version.undo.Change;
 
+import java.util.Collection;
+import java.util.List;
+
 
 /**
  * A choice subclass that shows choices via checkboxes.
@@ -196,7 +196,7 @@ public class CheckBoxMultipleChoice<T> e
         * @see org.apache.wicket.Component#Component(String, 
org.apache.wicket.model.IModel)
         * @see AbstractChoice#AbstractChoice(String, 
org.apache.wicket.model.IModel, java.util.List)
         */
-       public CheckBoxMultipleChoice(final String id, IModel<Collection<T>> 
model,
+       public CheckBoxMultipleChoice(final String id, IModel<? extends 
Collection<T>> model,
                final List<? extends T> choices)
        {
                super(id, model, choices);
@@ -217,7 +217,7 @@ public class CheckBoxMultipleChoice<T> e
         * @see AbstractChoice#AbstractChoice(String, 
org.apache.wicket.model.IModel,
         *      
java.util.List,org.apache.wicket.markup.html.form.IChoiceRenderer)
         */
-       public CheckBoxMultipleChoice(final String id, IModel<Collection<T>> 
model,
+       public CheckBoxMultipleChoice(final String id, IModel<? extends 
Collection<T>> model,
                final List<? extends T> choices, final IChoiceRenderer<? super 
T> renderer)
        {
                super(id, model, choices, renderer);
@@ -251,7 +251,7 @@ public class CheckBoxMultipleChoice<T> e
         *      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,
+       public CheckBoxMultipleChoice(String id, IModel<? extends 
Collection<T>> model,
                IModel<? extends List<? extends T>> choices)
        {
                super(id, model, choices);
@@ -292,7 +292,7 @@ public class CheckBoxMultipleChoice<T> e
         * @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,
+       public CheckBoxMultipleChoice(String id, IModel<? extends 
Collection<T>> model,
                IModel<? extends List<? extends T>> choices, IChoiceRenderer<? 
super T> renderer)
        {
                super(id, model, choices, renderer);

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java?rev=930393&r1=930392&r2=930393&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
 Fri Apr  2 21:29:36 2010
@@ -42,6 +42,13 @@ import org.apache.wicket.util.convert.Co
 import org.apache.wicket.util.string.Strings;
 import org.apache.wicket.util.upload.FileItem;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
 
 /**
  * Form component that allows the user to select multiple files to upload via 
a single &lt;input
@@ -132,7 +139,7 @@ public class MultiFileUploadField extend
         * @param id
         * @param model
         */
-       public MultiFileUploadField(String id, IModel<Collection<FileUpload>> 
model)
+       public MultiFileUploadField(String id, IModel<? extends 
Collection<FileUpload>> model)
        {
                this(id, model, UNLIMITED);
        }
@@ -146,9 +153,10 @@ public class MultiFileUploadField extend
         *            max number of files a user can upload
         * 
         */
-       public MultiFileUploadField(String id, IModel<Collection<FileUpload>> 
model, int max)
+    @SuppressWarnings("unchecked")
+       public MultiFileUploadField(String id, IModel<? extends 
Collection<FileUpload>> model, int max)
        {
-               super(id, model);
+               super(id, (IModel<Collection<FileUpload>>)model);
 
                this.max = max;