You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by br...@apache.org on 2004/04/28 18:34:14 UTC
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl JavaScriptValidator.java ValidationRuleValidator.java
bruno 2004/04/28 09:34:14
Modified: src/blocks/forms/java/org/apache/cocoon/forms/formmodel
AbstractContainerWidget.java AbstractWidget.java
AbstractWidgetDefinition.java Field.java Form.java
MultiValueField.java Repeater.java Union.java
Upload.java Widget.java WidgetDefinition.java
WidgetList.java
src/blocks/forms/java/org/apache/cocoon/forms/validation
WidgetValidator.java
src/blocks/forms/java/org/apache/cocoon/forms/validation/impl
JavaScriptValidator.java
ValidationRuleValidator.java
Log:
Do not pass FormContext for validation.
Revision Changes Path
1.9 +4 -4 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractContainerWidget.java
Index: AbstractContainerWidget.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractContainerWidget.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractContainerWidget.java 22 Apr 2004 08:05:27 -0000 1.8
+++ AbstractContainerWidget.java 28 Apr 2004 16:34:12 -0000 1.9
@@ -86,12 +86,12 @@
* @return <code>true</code> only if all contained widgets are valid and the
* extra validation rules on this containment level are ok.
*/
- public boolean validate(FormContext formContext) {
+ public boolean validate() {
// Validate self only if child widgets are valid
//TODO: check if we should not change this to still validating kids first
// BUT also validating the top level
- if (widgets.validate(formContext)) {
- return super.validate(formContext);
+ if (widgets.validate()) {
+ return super.validate();
} else {
return false;
}
1.14 +4 -4 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java
Index: AbstractWidget.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AbstractWidget.java 23 Apr 2004 23:34:56 -0000 1.13
+++ AbstractWidget.java 28 Apr 2004 16:34:12 -0000 1.14
@@ -197,9 +197,9 @@
}
- public boolean validate(FormContext context) {
+ public boolean validate() {
// Test validators from the widget definition
- if (!getDefinition().validate(this, context)) {
+ if (!getDefinition().validate(this)) {
// Failed
return false;
} else {
@@ -212,7 +212,7 @@
Iterator iter = this.validators.iterator();
while(iter.hasNext()) {
WidgetValidator validator = (WidgetValidator)iter.next();
- if (!validator.validate(this, context)) {
+ if (!validator.validate(this)) {
return false;
}
}
1.5 +3 -3 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinition.java
Index: AbstractWidgetDefinition.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinition.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractWidgetDefinition.java 9 Apr 2004 16:43:21 -0000 1.4
+++ AbstractWidgetDefinition.java 28 Apr 2004 16:34:12 -0000 1.5
@@ -135,7 +135,7 @@
}
}
- public boolean validate(Widget widget, FormContext context) {
+ public boolean validate(Widget widget) {
if (this.validators == null) {
// No validators
return true;
@@ -144,7 +144,7 @@
Iterator iter = this.validators.iterator();
while(iter.hasNext()) {
WidgetValidator validator = (WidgetValidator)iter.next();
- if (! validator.validate(widget, context)) {
+ if (! validator.validate(widget)) {
// Stop at the first validator that fails
return false;
}
1.12 +2 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java
Index: Field.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Field.java 28 Apr 2004 13:11:10 -0000 1.11
+++ Field.java 28 Apr 2004 16:34:12 -0000 1.12
@@ -112,7 +112,7 @@
if (this.needsValidate) {
isValidating = true;
try {
- if (super.validate(null)) {
+ if (super.validate()) {
// New-style validators were successful. Check the old-style ones.
if (this.value != null) {
this.validationError = getDatatype().validate(value, new ExpressionContextImpl(this));
1.12 +6 -6 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java
Index: Form.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Form.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Form.java 23 Apr 2004 23:33:48 -0000 1.11
+++ Form.java 28 Apr 2004 16:34:12 -0000 1.12
@@ -241,8 +241,8 @@
// Validate the form
this.phase = ProcessingPhase.VALIDATE;
- this.isValid = doValidate(formContext);
-
+ this.isValid = doValidate();
+
if (this.endProcessing != null) {
return this.endProcessing.booleanValue();
}
@@ -258,7 +258,7 @@
this.isValid = false;
return this.endProcessing.booleanValue();
}
-
+
return this.isValid;
}
@@ -293,8 +293,8 @@
throw new UnsupportedOperationException("Please use Form.process()");
}
- public boolean doValidate(FormContext formContext) {
- return super.validate(formContext);
+ public boolean doValidate() {
+ return super.validate();
}
1.8 +2 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueField.java
Index: MultiValueField.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueField.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MultiValueField.java 22 Apr 2004 14:26:48 -0000 1.7
+++ MultiValueField.java 28 Apr 2004 16:34:12 -0000 1.8
@@ -100,7 +100,7 @@
validationError = new ValidationError(new I18nMessage("multivaluefield.conversionfailed", Constants.I18N_CATALOGUE));
- return validationError == null ? super.validate(formContext) : false;
+ return validationError == null ? super.validate() : false;
}
private static final String MULTIVALUEFIELD_EL = "multivaluefield";
1.10 +3 -3 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Repeater.java
Index: Repeater.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Repeater.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Repeater.java 22 Apr 2004 14:26:48 -0000 1.9
+++ Repeater.java 28 Apr 2004 16:34:12 -0000 1.10
@@ -231,7 +231,7 @@
RepeaterRow row = (RepeaterRow)rowIt.next();
valid = valid & row.validate(formContext);
}
- return valid ? super.validate(formContext) : false;
+ return valid ? super.validate() : false;
}
@@ -351,7 +351,7 @@
public boolean validate(FormContext formContext) {
// Validate only child widtgets, as the definition's validators are those of the parent repeater
- return widgets.validate(formContext);
+ return widgets.validate();
}
private static final String ROW_EL = "repeater-row";
1.9 +2 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Union.java
Index: Union.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Union.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Union.java 23 Apr 2004 13:02:31 -0000 1.8
+++ Union.java 28 Apr 2004 16:34:12 -0000 1.9
@@ -95,7 +95,7 @@
String value = (String)getValue();
if (value != null && !value.equals(""))
if ((widget = getWidget(value)) != null)
- valid = valid & widget.validate(formContext);
+ valid = valid & widget.validate();
return valid;
}
1.8 +2 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Upload.java
Index: Upload.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Upload.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Upload.java 22 Apr 2004 14:26:48 -0000 1.7
+++ Upload.java 28 Apr 2004 16:34:12 -0000 1.8
@@ -113,7 +113,7 @@
}
}
- return validationError == null ? super.validate(formContext) : false;
+ return validationError == null ? super.validate() : false;
}
/**
1.10 +2 -2 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Widget.java
Index: Widget.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Widget.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Widget.java 28 Apr 2004 13:09:59 -0000 1.9
+++ Widget.java 28 Apr 2004 16:34:12 -0000 1.10
@@ -112,7 +112,7 @@
* @return <code>true</code> to indicate all validations were ok,
* <code>false</code> otherwise
*/
- public boolean validate(FormContext formContext);
+ public boolean validate();
public void addValidator(WidgetValidator validator);
1.4 +2 -3 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetDefinition.java
Index: WidgetDefinition.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetDefinition.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WidgetDefinition.java 9 Apr 2004 16:43:21 -0000 1.3
+++ WidgetDefinition.java 28 Apr 2004 16:34:12 -0000 1.4
@@ -54,10 +54,9 @@
* fails, the validator has set a validation error on the widget or one of its children.
*
* @param widget the widget
- * @param context the form context
* @return <code>true</code> if validation was successful.
*/
- public boolean validate(Widget widget, FormContext context);
+ public boolean validate(Widget widget);
/**
1.2 +4 -5 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetList.java
Index: WidgetList.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WidgetList.java 21 Apr 2004 20:30:49 -0000 1.1
+++ WidgetList.java 28 Apr 2004 16:34:12 -0000 1.2
@@ -91,17 +91,16 @@
/**
* Validates all contained widgets and returns the combined result.
*
- * @param formContext to pass to the {@link Widget#validate(FormContext)
* @return <code>false</code> if at least one of the contained widgets is not valid.
*
- * @see Widget#validate(FormContext)
+ * @see Widget#validate()
*/
- public boolean validate(FormContext formContext) {
+ public boolean validate() {
boolean valid = true;
Iterator widgetIt = iterator();
while (widgetIt.hasNext()) {
Widget widget = (Widget)widgetIt.next();
- valid = valid & widget.validate(formContext);
+ valid = valid & widget.validate();
}
return valid;
}
1.3 +2 -3 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation/WidgetValidator.java
Index: WidgetValidator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation/WidgetValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WidgetValidator.java 9 Mar 2004 11:31:10 -0000 1.2
+++ WidgetValidator.java 28 Apr 2004 16:34:13 -0000 1.3
@@ -44,9 +44,8 @@
* Validate a widget.
*
* @param widget the widget to validate
- * @param context the form context
* @return <code>true</code> if validation was successful. If not, the validator must have set
* a {@link ValidationError} on the widget or one of its children.
*/
- boolean validate(Widget widget, FormContext context);
+ boolean validate(Widget widget);
}
1.4 +2 -7 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/JavaScriptValidator.java
Index: JavaScriptValidator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/JavaScriptValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaScriptValidator.java 25 Apr 2004 12:12:09 -0000 1.3
+++ JavaScriptValidator.java 28 Apr 2004 16:34:13 -0000 1.4
@@ -20,8 +20,6 @@
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.context.Context;
import org.apache.cocoon.components.ContextHelper;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.forms.FormContext;
import org.apache.cocoon.forms.formmodel.Widget;
import org.apache.cocoon.forms.util.JavaScriptHelper;
import org.apache.cocoon.forms.validation.WidgetValidator;
@@ -48,10 +46,7 @@
this.avalonContext = context;
}
- /* (non-Javadoc)
- * @see org.apache.cocoon.forms.validation.Validator#validate(org.apache.cocoon.forms.formmodel.Widget, org.apache.cocoon.forms.FormContext)
- */
- public final boolean validate(Widget widget, FormContext context) {
+ public final boolean validate(Widget widget) {
Map objectModel = ContextHelper.getObjectModel(this.avalonContext);
1.3 +2 -3 cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/ValidationRuleValidator.java
Index: ValidationRuleValidator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/ValidationRuleValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ValidationRuleValidator.java 9 Mar 2004 11:31:11 -0000 1.2
+++ ValidationRuleValidator.java 28 Apr 2004 16:34:13 -0000 1.3
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.forms.validation.impl;
-import org.apache.cocoon.forms.FormContext;
import org.apache.cocoon.forms.datatype.ValidationRule;
import org.apache.cocoon.forms.formmodel.ExpressionContextImpl;
import org.apache.cocoon.forms.formmodel.Widget;
@@ -38,7 +37,7 @@
this.rule = rule;
}
- public boolean validate(Widget widget, FormContext context)
+ public boolean validate(Widget widget)
{
if (! (widget instanceof ValidationErrorAware)) {
// Invalid widget type