Author: mgrigorov
Date: Sun Jan 23 10:33:03 2011
New Revision: 1062369
URL: http://svn.apache.org/viewvc?rev=1062369&view=rev
Log:
WICKET-3366 Make all standard validators extend Behavior
All standard (form)validators now extend Behavior.
This allows them to contribute to the markup (e.g. client side validation).
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/CompoundValidator.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/validation/ValidatorBehaviorTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java?rev=1062369&r1=1062368&r2=1062369&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java
Sun Jan 23 10:33:03 2011
@@ -19,6 +19,7 @@ package org.apache.wicket.markup.html.fo
import java.util.HashMap;
import java.util.Map;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.lang.Classes;
@@ -31,7 +32,7 @@ import org.apache.wicket.validation.Vali
*
* @author Igor Vaynberg (ivaynberg)
*/
-public abstract class AbstractFormValidator implements IFormValidator
+public abstract class AbstractFormValidator extends Behavior implements
IFormValidator
{
private static final long serialVersionUID = 1L;
@@ -150,8 +151,10 @@ public abstract class AbstractFormValida
}
else
{
- args.put(arg,
formComponent.getLocalizer().getString(formComponent.getId(),
- formComponent.getParent(),
formComponent.getId()));
+ args.put(
+ arg,
+
formComponent.getLocalizer().getString(formComponent.getId(),
+
formComponent.getParent(), formComponent.getId()));
}
args.put("input" + i, formComponent.getInput());
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/CompoundValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/CompoundValidator.java?rev=1062369&r1=1062368&r2=1062369&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/CompoundValidator.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/CompoundValidator.java
Sun Jan 23 10:33:03 2011
@@ -21,6 +21,8 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import org.apache.wicket.behavior.Behavior;
+
/**
* A compound {@link IValidator}. Once an error is reported against the {@link
IValidatable} being
* checked, the rest of the validator chain is ignored.
@@ -30,7 +32,7 @@ import java.util.List;
* type of validatable
* @since 1.2.6
*/
-public class CompoundValidator<T> implements IValidator<T>
+public class CompoundValidator<T> extends Behavior implements IValidator<T>
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java?rev=1062369&r1=1062368&r2=1062369&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
Sun Jan 23 10:33:03 2011
@@ -20,6 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.wicket.IClusterable;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.validation.INullAcceptingValidator;
import org.apache.wicket.validation.IValidatable;
@@ -43,7 +44,10 @@ import org.apache.wicket.validation.Vali
* type of validatable
* @since 1.2.6
*/
-public abstract class AbstractValidator<T> implements
INullAcceptingValidator<T>, IClusterable
+public abstract class AbstractValidator<T> extends Behavior
+ implements
+ INullAcceptingValidator<T>,
+ IClusterable
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java?rev=1062369&r1=1062368&r2=1062369&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java
Sun Jan 23 10:33:03 2011
@@ -18,6 +18,7 @@ package org.apache.wicket.validation.val
import java.io.Serializable;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
@@ -28,7 +29,9 @@ import org.apache.wicket.validation.Vali
* @param <Z>
* type of validatable
*/
-public class MaximumValidator<Z extends Comparable<Z> & Serializable>
implements IValidator<Z>
+public class MaximumValidator<Z extends Comparable<Z> & Serializable> extends
Behavior
+ implements
+ IValidator<Z>
{
private static final long serialVersionUID = 1L;
private final Z maximum;
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java?rev=1062369&r1=1062368&r2=1062369&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java
Sun Jan 23 10:33:03 2011
@@ -18,6 +18,7 @@ package org.apache.wicket.validation.val
import java.io.Serializable;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
@@ -28,7 +29,9 @@ import org.apache.wicket.validation.Vali
* @param <Z>
* type of validatable
*/
-public class MinimumValidator<Z extends Comparable<Z> & Serializable>
implements IValidator<Z>
+public class MinimumValidator<Z extends Comparable<Z> & Serializable> extends
Behavior
+ implements
+ IValidator<Z>
{
private static final long serialVersionUID = 1L;
private final Z minimum;
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java?rev=1062369&r1=1062368&r2=1062369&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
Sun Jan 23 10:33:03 2011
@@ -18,6 +18,7 @@ package org.apache.wicket.validation.val
import java.io.Serializable;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
@@ -28,7 +29,9 @@ import org.apache.wicket.validation.Vali
* @param <Z>
* type of validatable
*/
-public class RangeValidator<Z extends Comparable<Z> & Serializable> implements
IValidator<Z>
+public class RangeValidator<Z extends Comparable<Z> & Serializable> extends
Behavior
+ implements
+ IValidator<Z>
{
private static final long serialVersionUID = 1L;
private Z minimum;
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/validation/ValidatorBehaviorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/validation/ValidatorBehaviorTest.java?rev=1062369&r1=1062368&r2=1062369&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/validation/ValidatorBehaviorTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/validation/ValidatorBehaviorTest.java
Sun Jan 23 10:33:03 2011
@@ -147,7 +147,7 @@ public class ValidatorBehaviorTest exten
}
}
- public static class MinLenValidator implements IValidator<String>
+ public static class MinLenValidator extends Behavior implements
IValidator<String>
{
private int len = 5;
