Author: tim Date: Wed Nov 10 13:14:53 2004 New Revision: 57372 Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractContainerWidget.java cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AggregateField.java cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Messages.java cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueField.java cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Repeater.java cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Union.java cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Upload.java cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetState.java Log: CForms: add isValidatingValues() and make the widgets' validate() methods use it instead of overloading the use of isAcceptingInputs().
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractContainerWidget.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractContainerWidget.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractContainerWidget.java Wed Nov 10 13:14:53 2004 @@ -101,7 +101,7 @@ * extra validation rules on this containment level are ok. */ public boolean validate() { - if (!getCombinedState().isAcceptingInputs()) + if (!getCombinedState().isValidatingValues()) return true; // Validate children first, then always validate self. Return combined result. Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java Wed Nov 10 13:14:53 2004 @@ -270,8 +270,8 @@ public boolean validate() { - // Consider widget valid if it doesn't accept user inputs - if (!getCombinedState().isAcceptingInputs()) { + // Consider widget valid if it is not validating values. + if (!getCombinedState().isValidatingValues()) { return true; } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AggregateField.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AggregateField.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AggregateField.java Wed Nov 10 13:14:53 2004 @@ -190,7 +190,7 @@ } public boolean validate() { - if (!getCombinedState().isAcceptingInputs()) + if (!getCombinedState().isValidatingValues()) return true; if (enteredValue != null && !fieldsHaveValues()) { Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java Wed Nov 10 13:14:53 2004 @@ -217,7 +217,7 @@ } public boolean validate() { - if (!getCombinedState().isAcceptingInputs()) + if (!getCombinedState().isValidatingValues()) return true; if (this.valueState == VALUE_UNPARSED) { Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Messages.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Messages.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Messages.java Wed Nov 10 13:14:53 2004 @@ -59,7 +59,7 @@ } public boolean validate() { - if (!getCombinedState().isAcceptingInputs()) + if (!getCombinedState().isValidatingValues()) return true; else return messages.size() == 0; Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueField.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueField.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueField.java Wed Nov 10 13:14:53 2004 @@ -109,7 +109,7 @@ } public boolean validate() { - if (!getCombinedState().isAcceptingInputs()) + if (!getCombinedState().isValidatingValues()) return true; if (values != null) Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Repeater.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Repeater.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Repeater.java Wed Nov 10 13:14:53 2004 @@ -221,7 +221,7 @@ } public boolean validate() { - if (!getCombinedState().isAcceptingInputs()) + if (!getCombinedState().isValidatingValues()) return true; boolean valid = true; Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Union.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Union.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Union.java Wed Nov 10 13:14:53 2004 @@ -111,7 +111,7 @@ // TODO: Simplify this logic. public boolean validate() { - if (!getCombinedState().isAcceptingInputs()) + if (!getCombinedState().isValidatingValues()) return true; Widget widget; Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Upload.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Upload.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Upload.java Wed Nov 10 13:14:53 2004 @@ -106,7 +106,7 @@ } public boolean validate() { - if (!getCombinedState().isAcceptingInputs()) + if (!getCombinedState().isValidatingValues()) return true; if (this.part == null) { Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetState.java ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetState.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetState.java Wed Nov 10 13:14:53 2004 @@ -109,6 +109,15 @@ return this.getValue() > INVISIBLE_VALUE; } + /** + * Does this state validate widget values? + * + * @return <code>true</code> if this state validates widget values. + */ + public boolean isValidatingValues() { + return this.getValue() == ACTIVE_VALUE; + } + // Potential features provided by ValuedEnum that don't seem to be needed now // // public static WidgetState stateForValue(int stateValue) {