Author: ivaynberg
Date: Thu Aug 26 21:45:49 2010
New Revision: 989947
URL: http://svn.apache.org/viewvc?rev=989947&view=rev
Log:
add(ivalidator<t>)->add(ivalidator<? super t>)
Issue: WICKET-2849
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=989947&r1=989946&r2=989947&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
Thu Aug 26 21:45:49 2010
@@ -464,7 +464,7 @@ public abstract class FormComponent<T> e
* @see IValidatorAddListener
*
*/
- public final FormComponent<T> add(final IValidator<T> validator)
+ public final FormComponent<T> add(final IValidator<? super T> validator)
{
if (validator == null)
{
@@ -492,14 +492,14 @@ public abstract class FormComponent<T> e
* @see IValidator
* @see IValidatorAddListener
*/
- public final FormComponent<T> add(final IValidator<T>... validators)
+ public final FormComponent<T> add(final IValidator<? super T>...
validators)
{
if (validators == null)
{
throw new IllegalArgumentException("validator argument
cannot be null");
}
- for (IValidator<T> validator : validators)
+ for (IValidator<? super T> validator : validators)
{
add(validator);
}
@@ -772,7 +772,7 @@ public abstract class FormComponent<T> e
*
* @return List of validators
*/
- public final List<IValidator<T>> getValidators()
+ public final List<IValidator<? super T>> getValidators()
{
final int size = validators_size();
if (size == 0)
@@ -781,7 +781,7 @@ public abstract class FormComponent<T> e
}
else
{
- final List<IValidator<T>> list = new
ArrayList<IValidator<T>>(size);
+ final List<IValidator<? super T>> list = new
ArrayList<IValidator<? super T>>(size);
for (int i = 0; i < size; i++)
{
list.add(validators_get(i));
@@ -1067,7 +1067,7 @@ public abstract class FormComponent<T> e
* IValidators or a single instance, for efficiency)
*/
@SuppressWarnings("unchecked")
- private void validators_add(final IValidator<T> validator)
+ private void validators_add(final IValidator<? super T> validator)
{
if (validators == null)
{
@@ -1079,7 +1079,7 @@ public abstract class FormComponent<T> e
final int size = validators_size();
// Create array that holds size + 1 elements
- final IValidator<T>[] validators = new IValidator[size
+ 1];
+ final IValidator<? super T>[] validators = new
IValidator[size + 1];
// Loop through existing validators copying them
for (int i = 0; i < size; i++)
