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 2007/05/01 18:33:19 UTC
svn commit: r534149 -
/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
Author: ivaynberg
Date: Tue May 1 09:33:18 2007
New Revision: 534149
URL: http://svn.apache.org/viewvc?view=rev&rev=534149
Log:
changed validation to work in one pass instead of a pass for required, a pass for type conversion, and a pass for validators
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?view=diff&rev=534149&r1=534148&r2=534149
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java Tue May 1 09:33:18 2007
@@ -699,7 +699,8 @@
final IFormSubmittingComponent submit = (IFormSubmittingComponent)component;
// Check for button-name or button-name.x request string
- if (submit.getForm() != null && submit.getForm().getRootForm() == Form.this
+ if (submit.getForm() != null
+ && submit.getForm().getRootForm() == Form.this
&& (getRequest().getParameter(submit.getInputName()) != null || getRequest()
.getParameter(submit.getInputName() + ".x") != null))
{
@@ -1051,53 +1052,21 @@
*/
protected void validate()
{
- validateRequired();
-
- validateConversion();
-
- validateValidators();
-
+ validateComponents();
validateFormValidators();
}
- /**
- * Triggers input required attribute validation on all form components
- */
- protected final void validateRequired()
- {
- visitFormComponentsPostOrder(new ValidationVisitor()
- {
- public void validate(final FormComponent formComponent)
- {
- formComponent.validateRequired();
- }
- });
- }
/**
* Triggers type conversion on form components
*/
- protected final void validateConversion()
- {
- visitFormComponentsPostOrder(new ValidationVisitor()
- {
- public void validate(final FormComponent formComponent)
- {
- formComponent.convert();
- }
- });
- }
-
- /**
- * Triggers all IValidator validators added to the form components
- */
- protected final void validateValidators()
+ protected final void validateComponents()
{
visitFormComponentsPostOrder(new ValidationVisitor()
{
public void validate(final FormComponent formComponent)
{
- formComponent.validateValidators();
+ formComponent.validate();
}
});
}