Author: ivaynberg
Date: Fri Apr 2 21:30:38 2010
New Revision: 930394
URL: http://svn.apache.org/viewvc?rev=930394&view=rev
Log:
WICKET-2821
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.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/upload/MultiFileUploadField.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java?rev=930394&r1=930393&r2=930394&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
Fri Apr 2 21:30:38 2010
@@ -16,9 +16,6 @@
*/
package org.apache.wicket.extensions.markup.html.form.select;
-import java.util.Collection;
-import java.util.Iterator;
-
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
@@ -27,6 +24,9 @@ import org.apache.wicket.markup.repeater
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.util.WildcardCollectionModel;
+import java.util.Collection;
+import java.util.Iterator;
+
/**
* Component that makes it easy to produce a list of SelectOption components
@@ -55,7 +55,7 @@ public class SelectOptions<T> extends Re
* @param model
* @param renderer
*/
- public SelectOptions(String id, IModel<Collection<? extends T>> model,
+ public SelectOptions(String id, IModel<? extends Collection<? extends
T>> model,
IOptionRenderer<T> renderer)
{
super(id, model);
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=930394&r1=930393&r2=930394&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 Fri Apr
2 21:30:38 2010
@@ -884,7 +884,7 @@ public abstract class Component implemen
/**
* Used to call {...@link #onInitialize()}
*/
- final void initialize()
+ void initialize()
{
if (!getFlag(FLAG_INITIALIZED))
{
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=930394&r1=930393&r2=930394&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
Fri Apr 2 21:30:38 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;
@@ -27,6 +24,9 @@ import org.apache.wicket.util.convert.IC
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
+import java.util.Collection;
+import java.util.List;
+
/**
* A choice subclass that shows choices via checkboxes.
@@ -126,7 +126,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);
@@ -147,7 +147,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);
@@ -181,7 +181,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);
@@ -221,7 +221,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/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java?rev=930394&r1=930393&r2=930394&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
Fri Apr 2 21:30:38 2010
@@ -16,13 +16,6 @@
*/
package org.apache.wicket.markup.html.form.upload;
-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;
-
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
@@ -42,6 +35,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 <input
@@ -132,7 +132,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 +146,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;
