Author: sylvain
Date: Thu Nov 4 02:12:30 2004
New Revision: 56581
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/CacheManager.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/Constants.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/DefaultCacheManager.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/DefaultFormManager.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/FormContext.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/acting/AbstractFormsAction.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/acting/MakeFormAction.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/AggregateJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/AggregateJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/Binding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/BindingException.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/CaseJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/CaseJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ClassJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ClassJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ContextJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ContextJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/CustomJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/DeleteNodeJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/DeleteNodeJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/SimpleRepeaterJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/TempRepeaterJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/UnionJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/UnionJXPathBindingBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/AbstractJavaSelectionList.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/Datatype.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DatatypeBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DatatypeManager.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultDatatypeManager.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/EmptySelectionList.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/EnumSelectionListBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/JavaSelectionListBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/SelectionList.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/SelectionListBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/StaticSelectionList.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/ValidationRule.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/ValidationRuleBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/Convertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/ConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/DefaultFormatCache.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/DummyStringConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/DummyStringConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/EnumConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/EnumConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingDecimalConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingDoubleConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingDoubleConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingFloatConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingFloatConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingIntegerConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingIntegerConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingLongConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingLongConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/LocaleMap.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/MillisDateConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/MillisDateConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainBooleanConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainBooleanConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDecimalConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDecimalConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDoubleConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDoubleConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainFloatConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainFloatConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainIntegerConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainIntegerConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainLongConvertor.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainLongConvertorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatype.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/BooleanType.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/BooleanTypeBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DateType.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DateTypeBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DecimalType.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DecimalTypeBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DoubleType.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DoubleTypeBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/EnumType.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/EnumTypeBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/FloatType.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/FloatTypeBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/IntegerType.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/IntegerTypeBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/LongType.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/LongTypeBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/StringType.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/StringTypeBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AbstractValidationRule.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AssertValidationRule.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AssertValidationRuleBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/EmailValidationRuleBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/LengthValidationRule.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/LengthValidationRuleBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/Mod10ValidationRule.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/Mod10ValidationRuleBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RangeValidationRule.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RangeValidationRuleBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RegExpValidationRule.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RegExpValidationRuleBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/ValueCountValidationRule.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/ValueCountValidationRuleBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/AbstractFormHandler.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ActionEvent.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ActionListener.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/CreateEvent.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/CreateListener.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/DeferredValueChangedEvent.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/FormHandler.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ProcessingPhaseEvent.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ValueChangedEvent.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ValueChangedListener.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/WidgetEvent.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/WidgetListener.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/WidgetListenerBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/impl/JavaClassWidgetListenerBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/DefaultExpressionManager.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/ExpressionManager.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/IsNullFunction.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/NullFunction.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/StringFunction.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractContainerDefinition.java
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/AbstractDatatypeWidgetDefinition.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinitionBuilder.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/AddRowActionDefinition.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinitionBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanField.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanFieldDefinition.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ButtonDefinitionBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/CannotYetResolveWarning.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ClassDefinition.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ContainerDefinition.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ContainerWidget.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/DataWidget.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/DuplicateIdException.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ExpressionContextImpl.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/FormDefinition.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MessagesDefinition.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/MultiValueFieldDefinition.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/NewDefinition.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/OutputDefinition.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/RepeaterAction.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RepeaterActionDefinition.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RepeaterDefinition.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RowAction.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/SelectableWidget.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/StructDefinition.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Submit.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/SubmitDefinition.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/UnionDefinition.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/UploadDefinition.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Widget.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetList.java
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/generation/FormsGenerator.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/generation/jx-macros.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Contact.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Form1Handler.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Form2Bean.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/InitForm1Action.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Sex.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/LenientBaseBean.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/LenientNotOKBean.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/LenientOKBean.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/ValuesBean.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/Team.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectPipe.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsTemplateTransformer.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/WidgetReplacingPipe.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/DomHelper.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/I18nMessage.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/JavaScriptHelper.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/StringMessage.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/XMLAdapter.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/ValidationError.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/ValidationErrorAware.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/WidgetValidator.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/WidgetValidatorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/AssertValidatorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/EmailValidatorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/JavaScriptValidator.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/JavaScriptValidatorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/LengthValidatorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/Mod10ValidatorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/RangeValidatorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/RegExpValidatorBuilder.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/ValidationRuleValidator.java
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/ValueCountValidatorBuilder.java
Log:
merging 2.1 and 2.2
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/CacheManager.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/CacheManager.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/CacheManager.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
/**
* Work interface for the component that caches objects for Cocoon Forms.
*
- * @version $Id: CacheManager.java,v 1.2 2004/03/11 02:56:33 joerg Exp $
+ * @version $Id$
*/
public interface CacheManager {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/Constants.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/Constants.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/Constants.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* Various constants used in the Cocoon Forms framework.
*
- * @version $Id: Constants.java,v 1.6 2004/03/18 21:04:41 joerg Exp $
+ * @version $Id$
*/
public final class Constants {
// TODO : see this later
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/DefaultCacheManager.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/DefaultCacheManager.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/DefaultCacheManager.java
Thu Nov 4 02:12:30 2004
@@ -34,7 +34,7 @@
/**
* Component implementing the [EMAIL PROTECTED] CacheManager} role.
*
- * @version $Id: DefaultCacheManager.java,v 1.1 2004/03/09 10:34:12 reinhard
Exp $
+ * @version $Id$
*/
public class DefaultCacheManager
extends AbstractLogEnabled
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/DefaultFormManager.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/DefaultFormManager.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/DefaultFormManager.java
Thu Nov 4 02:12:30 2004
@@ -109,7 +109,9 @@
public Form createForm(Source source) throws Exception {
FormDefinition formDefinition = getFormDefinition(source);
- return (Form)formDefinition.createInstance();
+ Form form = (Form)formDefinition.createInstance();
+ form.initialize();
+ return form;
}
public Form createForm(String uri) throws Exception {
@@ -133,7 +135,9 @@
}
public Form createForm(Element formElement) throws Exception {
- return (Form)getFormDefinition(formElement).createInstance();
+ Form form = (Form)getFormDefinition(formElement).createInstance();
+ form.initialize();
+ return form;
}
public FormDefinition createFormDefinition(Element formElement) throws
Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/FormContext.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/FormContext.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/FormContext.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
import org.apache.cocoon.environment.Request;
/**
- * @version $Id: FormContext.java,v 1.1 2004/03/09 10:34:12 reinhard Exp $
+ * @version $Id$
*
*/
public class FormContext {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/acting/AbstractFormsAction.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/acting/AbstractFormsAction.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/acting/AbstractFormsAction.java
Thu Nov 4 02:12:30 2004
@@ -26,7 +26,7 @@
/**
* Abstract base class for Cocoon Forms actions.
*
- * @version $Id: AbstractFormsAction.java,v 1.4 2004/03/28 20:51:24 antonio
Exp $
+ * @version $Id$
*/
public abstract class AbstractFormsAction
implements Action, ThreadSafe, Serviceable, Disposable {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/acting/MakeFormAction.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/acting/MakeFormAction.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/acting/MakeFormAction.java
Thu Nov 4 02:12:30 2004
@@ -40,7 +40,7 @@
* <li><strong>attribute-name</strong>: name of the request attribute in
which to store the form instance
* </ul>
*
- * @version $Id: MakeFormAction.java,v 1.1 2004/03/09 10:33:54 reinhard Exp $
+ * @version $Id$
*/
public class MakeFormAction implements Action, ThreadSafe, Serviceable {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/AggregateJXPathBinding.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/AggregateJXPathBinding.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/AggregateJXPathBinding.java
Thu Nov 4 02:12:30 2004
@@ -28,7 +28,7 @@
* that contains other widgets.</li>
* </ol>
*
- * @version CVS $Id: AggregateJXPathBinding.java,v 1.2 2004/04/23 11:42:58 mpo
Exp $
+ * @version CVS $Id$
*/
public class AggregateJXPathBinding extends ComposedJXPathBindingBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/AggregateJXPathBindingBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/AggregateJXPathBindingBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/AggregateJXPathBindingBuilder.java
Thu Nov 4 02:12:30 2004
@@ -29,7 +29,7 @@
* </fb:aggregate>
* </code></pre>
*
- * @version CVS $Id: AggregateJXPathBindingBuilder.java,v 1.2 2004/04/01
13:07:55 mpo Exp $
+ * @version CVS $Id$
*/
public class AggregateJXPathBindingBuilder
extends JXPathBindingBuilderBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/Binding.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/Binding.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/Binding.java
Thu Nov 4 02:12:30 2004
@@ -22,7 +22,7 @@
* information elements from some back-end model (2nd argument) to and from
* a existing Cocoon Form Widget.
*
- * @version CVS $Id: Binding.java,v 1.2 2004/03/11 02:56:32 joerg Exp $
+ * @version CVS $Id$
*/
public interface Binding {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/BindingException.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/BindingException.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/BindingException.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
/**
* This exception is thrown when something goes wrong with the binding.
*
- * @version CVS $Id: BindingException.java,v 1.1 2004/03/09 10:33:55 reinhard
Exp $
+ * @version CVS $Id$
*/
public class BindingException extends CascadingException {
public BindingException(String message) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/CaseJXPathBinding.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/CaseJXPathBinding.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/CaseJXPathBinding.java
Thu Nov 4 02:12:30 2004
@@ -28,7 +28,7 @@
* case of a union.</li>
* </ol>
*
- * @version CVS $Id: CaseJXPathBinding.java,v 1.2 2004/04/12 14:05:08 tim Exp $
+ * @version CVS $Id$
*/
public class CaseJXPathBinding extends ComposedJXPathBindingBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/CaseJXPathBindingBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/CaseJXPathBindingBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/CaseJXPathBindingBuilder.java
Thu Nov 4 02:12:30 2004
@@ -30,7 +30,7 @@
* </fb:case>
* </code></pre>
*
- * @version CVS $Id: CaseJXPathBindingBuilder.java,v 1.3 2004/04/12 14:05:08
tim Exp $
+ * @version CVS $Id$
*/
public class CaseJXPathBindingBuilder extends JXPathBindingBuilderBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ClassJXPathBinding.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ClassJXPathBinding.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ClassJXPathBinding.java
Thu Nov 4 02:12:30 2004
@@ -26,7 +26,7 @@
* <li>This Binding uses the provided widget-id as the name for the class.</li>
* </ol>
*
- * @version CVS $Id: ClassJXPathBinding.java,v 1.2 2004/04/12 14:05:08 tim Exp
$
+ * @version CVS $Id$
*/
public class ClassJXPathBinding extends ComposedJXPathBindingBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ClassJXPathBindingBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ClassJXPathBindingBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ClassJXPathBindingBuilder.java
Thu Nov 4 02:12:30 2004
@@ -30,7 +30,7 @@
* </fb:class>
* </code></pre>
*
- * @version CVS $Id: ClassJXPathBindingBuilder.java,v 1.3 2004/04/12 14:05:08
tim Exp $
+ * @version CVS $Id$
*/
public class ClassJXPathBindingBuilder
extends JXPathBindingBuilderBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ContextJXPathBinding.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ContextJXPathBinding.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ContextJXPathBinding.java
Thu Nov 4 02:12:30 2004
@@ -24,7 +24,7 @@
* that narrows the binding scope to some xpath-context on the target
* objectModel to load and save from.
*
- * @version CVS $Id: ContextJXPathBinding.java,v 1.2 2004/03/11 02:56:32 joerg
Exp $
+ * @version CVS $Id$
*/
public class ContextJXPathBinding extends ComposedJXPathBindingBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ContextJXPathBindingBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ContextJXPathBindingBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ContextJXPathBindingBuilder.java
Thu Nov 4 02:12:30 2004
@@ -29,7 +29,7 @@
* </fb:context>
* </code></pre>
*
- * @version CVS $Id: ContextJXPathBindingBuilder.java,v 1.2 2004/04/01
12:59:57 mpo Exp $
+ * @version CVS $Id$
*/
public class ContextJXPathBindingBuilder extends JXPathBindingBuilderBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/CustomJXPathBindingBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/CustomJXPathBindingBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/CustomJXPathBindingBuilder.java
Thu Nov 4 02:12:30 2004
@@ -46,7 +46,7 @@
* </fb:context>
* </code></pre>
*
- * @version CVS $Id: CustomJXPathBindingBuilder.java,v 1.4 2004/04/08 14:51:19
mpo Exp $
+ * @version CVS $Id$
*/
public class CustomJXPathBindingBuilder extends JXPathBindingBuilderBase {
private static final Class[] DOMELEMENT_METHODARGS;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/DeleteNodeJXPathBinding.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/DeleteNodeJXPathBinding.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/DeleteNodeJXPathBinding.java
Thu Nov 4 02:12:30 2004
@@ -27,7 +27,7 @@
* <li>This Binding does not perform any actions when loading.</li>
* </ol>
*
- * @version CVS $Id: DeleteNodeJXPathBinding.java,v 1.1 2004/03/09 10:33:55
reinhard Exp $
+ * @version CVS $Id$
*/
public class DeleteNodeJXPathBinding extends JXPathBindingBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/DeleteNodeJXPathBindingBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/DeleteNodeJXPathBindingBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/DeleteNodeJXPathBindingBuilder.java
Thu Nov 4 02:12:30 2004
@@ -27,7 +27,7 @@
* <fb:delete-node />
* </code></pre>
*
- * @version CVS $Id: DeleteNodeJXPathBindingBuilder.java,v 1.2 2004/04/01
12:59:57 mpo Exp $
+ * @version CVS $Id$
*/
public class DeleteNodeJXPathBindingBuilder
extends JXPathBindingBuilderBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBinding.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBinding.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBinding.java
Thu Nov 4 02:12:30 2004
@@ -31,7 +31,7 @@
* <li>This expects the back-end model to be a Java Bean model.</li>
* </ol>
*
- * @version CVS $Id: InsertBeanJXPathBinding.java,v 1.2 2004/04/01 12:59:57
mpo Exp $
+ * @version CVS $Id$
*/
public class InsertBeanJXPathBinding extends JXPathBindingBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java
Thu Nov 4 02:12:30 2004
@@ -28,7 +28,7 @@
* <fb:insert-bean classname="..child-bean-class.."
addmethod="..method-to-add.."/>
* </code></pre>
*
- * @version CVS $Id: InsertBeanJXPathBindingBuilder.java,v 1.2 2004/04/01
12:59:57 mpo Exp $
+ * @version CVS $Id$
*/
public class InsertBeanJXPathBindingBuilder extends JXPathBindingBuilderBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBinding.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBinding.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBinding.java
Thu Nov 4 02:12:30 2004
@@ -31,7 +31,7 @@
* <li>This expects the back-end model to be an XML file.</li>
* </ol>
*
- * @version CVS $Id: InsertNodeJXPathBinding.java,v 1.1 2004/03/09 10:33:55
reinhard Exp $
+ * @version CVS $Id$
*/
public class InsertNodeJXPathBinding extends JXPathBindingBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBindingBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBindingBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBindingBuilder.java
Thu Nov 4 02:12:30 2004
@@ -39,7 +39,7 @@
* </fb:insert-node>
* </code></pre>
*
- * @version CVS $Id: InsertNodeJXPathBindingBuilder.java,v 1.3 2004/04/01
12:59:57 mpo Exp $
+ * @version CVS $Id$
*/
public class InsertNodeJXPathBindingBuilder
extends JXPathBindingBuilderBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java
Thu Nov 4 02:12:30 2004
@@ -30,7 +30,7 @@
* Simple binding for multi fields: on save, first deletes the target data
* before recreating it from scratch.
*
- * @version CVS $Id: MultiValueJXPathBinding.java,v 1.4 2004/05/11 08:22:54
bruno Exp $
+ * @version CVS $Id$
*/
public class MultiValueJXPathBinding extends JXPathBindingBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBinding.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBinding.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBinding.java
Thu Nov 4 02:12:30 2004
@@ -27,7 +27,7 @@
* class that contains other widgets.</li>
* </ol>
*
- * @version CVS $Id: NewJXPathBinding.java,v 1.2 2004/04/12 14:05:08 tim Exp $
+ * @version CVS $Id$
*/
public class NewJXPathBinding extends ComposedJXPathBindingBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBindingBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBindingBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBindingBuilder.java
Thu Nov 4 02:12:30 2004
@@ -30,7 +30,7 @@
* </fb:new>
* </code></pre>
*
- * @version CVS $Id: NewJXPathBindingBuilder.java,v 1.3 2004/04/12 14:05:08
tim Exp $
+ * @version CVS $Id$
*/
public class NewJXPathBindingBuilder
extends JXPathBindingBuilderBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBinding.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBinding.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBinding.java
Thu Nov 4 02:12:30 2004
@@ -26,7 +26,7 @@
* <li>This Binding does not perform any actions when loading.</li>
* </ol>
*
- * @version CVS $Id: SetAttributeJXPathBinding.java,v 1.1 2004/03/09 10:33:55
reinhard Exp $
+ * @version CVS $Id$
*/
public class SetAttributeJXPathBinding extends JXPathBindingBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBindingBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBindingBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBindingBuilder.java
Thu Nov 4 02:12:30 2004
@@ -28,7 +28,7 @@
* value="<i>attribute-value</i>"/>
* </code></pre>
*
- * @version CVS $Id: SetAttributeJXPathBindingBuilder.java,v 1.2 2004/04/01
12:59:57 mpo Exp $
+ * @version CVS $Id$
*/
public class SetAttributeJXPathBindingBuilder
extends JXPathBindingBuilderBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/SimpleRepeaterJXPathBindingBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/SimpleRepeaterJXPathBindingBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/SimpleRepeaterJXPathBindingBuilder.java
Thu Nov 4 02:12:30 2004
@@ -30,7 +30,7 @@
* </pre>
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: SimpleRepeaterJXPathBindingBuilder.java,v 1.2 2004/04/01
12:59:57 mpo Exp $
+ * @version CVS $Id$
*/
public class SimpleRepeaterJXPathBindingBuilder
extends JXPathBindingBuilderBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBinding.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBinding.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBinding.java
Thu Nov 4 02:12:30 2004
@@ -28,7 +28,7 @@
* that contains other widgets.</li>
* </ol>
*
- * @version CVS $Id: StructJXPathBinding.java,v 1.3 2004/04/23 11:42:58 mpo
Exp $
+ * @version CVS $Id$
*/
public class StructJXPathBinding extends ComposedJXPathBindingBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBindingBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBindingBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBindingBuilder.java
Thu Nov 4 02:12:30 2004
@@ -30,7 +30,7 @@
* </fb:struct>
* </code></pre>
*
- * @version CVS $Id: StructJXPathBindingBuilder.java,v 1.3 2004/04/12 14:05:08
tim Exp $
+ * @version CVS $Id$
*/
public class StructJXPathBindingBuilder
extends JXPathBindingBuilderBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/TempRepeaterJXPathBindingBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/TempRepeaterJXPathBindingBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/TempRepeaterJXPathBindingBuilder.java
Thu Nov 4 02:12:30 2004
@@ -30,7 +30,7 @@
* </fb:temp-repeater>
* </pre>
*
- * @version CVS $Id: TempRepeaterJXPathBindingBuilder.java,v 1.3 2004/04/12
14:05:08 tim Exp $
+ * @version CVS $Id$
*/
public class TempRepeaterJXPathBindingBuilder
extends JXPathBindingBuilderBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/UnionJXPathBinding.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/UnionJXPathBinding.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/UnionJXPathBinding.java
Thu Nov 4 02:12:30 2004
@@ -28,7 +28,7 @@
* union widget.</li>
* </ol>
*
- * @version CVS $Id: UnionJXPathBinding.java,v 1.3 2004/04/23 11:42:58 mpo Exp
$
+ * @version CVS $Id$
*/
public class UnionJXPathBinding extends ComposedJXPathBindingBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/UnionJXPathBindingBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/UnionJXPathBindingBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/UnionJXPathBindingBuilder.java
Thu Nov 4 02:12:30 2004
@@ -30,7 +30,7 @@
* </fb:union>
* </code></pre>
*
- * @version CVS $Id: UnionJXPathBindingBuilder.java,v 1.3 2004/04/12 14:05:08
tim Exp $
+ * @version CVS $Id$
*/
public class UnionJXPathBindingBuilder extends JXPathBindingBuilderBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/binding/ValueJXPathBinding.java
Thu Nov 4 02:12:30 2004
@@ -30,7 +30,7 @@
* (pointing to an attribute or text-node) to and from a specific CForms
* widget as identified by its id.
*
- * @version CVS $Id: ValueJXPathBinding.java,v 1.7 2004/05/11 08:22:54 bruno
Exp $
+ * @version CVS $Id$
*/
public class ValueJXPathBinding extends JXPathBindingBase {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/AbstractJavaSelectionList.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/AbstractJavaSelectionList.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/AbstractJavaSelectionList.java
Thu Nov 4 02:12:30 2004
@@ -235,4 +235,4 @@
}
}
-}
\ No newline at end of file
+}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/Datatype.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/Datatype.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/Datatype.java
Thu Nov 4 02:12:30 2004
@@ -39,7 +39,7 @@
* influence on the [EMAIL PROTECTED] #validate(Object, ExpressionContext)}
method, which should in that case be passed
* an array of objects. See also [EMAIL PROTECTED] #isArrayType()}.
*
- * @version $Id: Datatype.java,v 1.4 2004/05/06 14:59:44 bruno Exp $
+ * @version $Id$
*/
public interface Datatype {
/**
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DatatypeBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DatatypeBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DatatypeBuilder.java
Thu Nov 4 02:12:30 2004
@@ -24,10 +24,10 @@
*
* <p>These builders should be threadsafe, only one instance of them will be
created.
*
- * <p>Implementations may implement Avalon's Composable interface to get
access to
+ * <p>Implementations may implement Avalon's Serviceable interface to get
access to
* other components.
*
- * @version $Id: DatatypeBuilder.java,v 1.1 2004/03/09 10:34:00 reinhard Exp $
+ * @version $Id$
*/
public interface DatatypeBuilder {
public Datatype build(Element datatypeElement, boolean arrayType,
DatatypeManager datatypeManager) throws Exception;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DatatypeManager.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DatatypeManager.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DatatypeManager.java
Thu Nov 4 02:12:30 2004
@@ -23,7 +23,7 @@
*
* <p>See also [EMAIL PROTECTED] Datatype} and [EMAIL PROTECTED]
DefaultDatatypeManager}.
*
- * @version $Id: DatatypeManager.java,v 1.1 2004/03/09 10:34:00 reinhard Exp $
+ * @version $Id$
*/
public interface DatatypeManager {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultDatatypeManager.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultDatatypeManager.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DefaultDatatypeManager.java
Thu Nov 4 02:12:30 2004
@@ -42,7 +42,7 @@
* Currently the list of datatype and validationrule builders is hardcoded,
but this will
* become externally configurable in the future.
*
- * @version $Id: DefaultDatatypeManager.java,v 1.3 2004/04/21 13:20:27 bruno
Exp $
+ * @version $Id$
*
*/
public class DefaultDatatypeManager extends AbstractLogEnabled implements
DatatypeManager, ThreadSafe, Serviceable,
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/EmptySelectionList.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/EmptySelectionList.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/EmptySelectionList.java
Thu Nov 4 02:12:30 2004
@@ -27,7 +27,7 @@
/**
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: EmptySelectionList.java,v 1.3 2004/03/09 13:17:26
cziegeler Exp $
+ * @version CVS $Id$
*/
public class EmptySelectionList implements SelectionList {
private String text;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/EnumSelectionListBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/EnumSelectionListBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/EnumSelectionListBuilder.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
/**
* Description of EnumSelectionListBuilder.
- * @version CVS $Id: EnumSelectionListBuilder.java,v 1.2 2004/03/09 11:31:11
joerg Exp $
+ * @version CVS $Id$
*/
public class EnumSelectionListBuilder implements SelectionListBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java
Thu Nov 4 02:12:30 2004
@@ -36,7 +36,7 @@
*
* @see org.apache.cocoon.forms.datatype.FlowJXPathSelectionListBuilder
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: FlowJXPathSelectionList.java,v 1.4 2004/03/09 13:17:26
cziegeler Exp $
+ * @version CVS $Id$
*/
public class FlowJXPathSelectionList implements SelectionList {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/JavaSelectionListBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/JavaSelectionListBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/JavaSelectionListBuilder.java
Thu Nov 4 02:12:30 2004
@@ -90,4 +90,4 @@
this.manager = manager;
}
-}
\ No newline at end of file
+}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/SelectionList.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/SelectionList.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/SelectionList.java
Thu Nov 4 02:12:30 2004
@@ -22,7 +22,7 @@
/**
* Interface to be implemented by selection lists.
- * @version $Id: SelectionList.java,v 1.2 2004/03/09 11:31:11 joerg Exp $
+ * @version $Id$
*/
public interface SelectionList {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/SelectionListBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/SelectionListBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/SelectionListBuilder.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
/**
* Builds [EMAIL PROTECTED] SelectionList}s from an XML description.
*
- * @version CVS $Id: SelectionListBuilder.java,v 1.2 2004/03/09 11:31:11 joerg
Exp $
+ * @version CVS $Id$
*/
public interface SelectionListBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/StaticSelectionList.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/StaticSelectionList.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/StaticSelectionList.java
Thu Nov 4 02:12:30 2004
@@ -36,7 +36,7 @@
* cached as part of this object. In contrast, the [EMAIL PROTECTED]
DynamicSelectionList}
* will retrieve its content from its source each time it's needed.
*
- * @version $Id: StaticSelectionList.java,v 1.3 2004/03/09 13:17:26 cziegeler
Exp $
+ * @version $Id$
*/
public class StaticSelectionList implements SelectionList {
/** The datatype to which this selection list belongs */
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/ValidationRule.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/ValidationRule.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/ValidationRule.java
Thu Nov 4 02:12:30 2004
@@ -23,7 +23,7 @@
* perform their validation by checking a number of these validation rules
* (though strictly spoken this is not required).
*
- * @version $Id: ValidationRule.java,v 1.2 2004/03/09 14:58:45 cziegeler Exp $
+ * @version $Id$
*/
public interface ValidationRule {
/**
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/ValidationRuleBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/ValidationRuleBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/ValidationRuleBuilder.java
Thu Nov 4 02:12:30 2004
@@ -19,11 +19,11 @@
/**
* Interface for classes that can build ValidationRules from an XML
description.
- * A ValidationRuleBuilder can be Composable.
+ * A ValidationRuleBuilder can be Serviceable.
* A ValidationRuleBuilder should be thread safe, only one instance of it
* will be created.
*
- * @version $Id: ValidationRuleBuilder.java,v 1.1 2004/03/09 10:34:00 reinhard
Exp $
+ * @version $Id$
*/
public interface ValidationRuleBuilder {
public ValidationRule build(Element validationRuleElement) throws
Exception;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/Convertor.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/Convertor.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/Convertor.java
Thu Nov 4 02:12:30 2004
@@ -32,7 +32,7 @@
* Some convertors need to build and configure parser or formatting objects,
* which can be expensive if it needs to be done repeatedly.
*
- * @version CVS $Id: Convertor.java,v 1.3 2004/05/06 14:59:44 bruno Exp $
+ * @version CVS $Id$
*/
public interface Convertor {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/ConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/ConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/ConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -26,7 +26,7 @@
* but attributes and content of the element can vary depending on the
* ConvertorBuilder implementation.
*
- * @version CVS $Id: ConvertorBuilder.java,v 1.2 2004/03/11 02:56:32 joerg Exp
$
+ * @version CVS $Id$
*/
public interface ConvertorBuilder {
/**
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/DefaultFormatCache.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/DefaultFormatCache.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/DefaultFormatCache.java
Thu Nov 4 02:12:30 2004
@@ -17,7 +17,7 @@
/**
*
- * @version CVS $Id: DefaultFormatCache.java,v 1.1 2004/03/09 10:34:06
reinhard Exp $
+ * @version CVS $Id$
*/
public class DefaultFormatCache implements Convertor.FormatCache {
private Object object;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/DummyStringConvertor.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/DummyStringConvertor.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/DummyStringConvertor.java
Thu Nov 4 02:12:30 2004
@@ -24,7 +24,7 @@
* Convertor that converts between strings and strings, in other words,
* it does nothing.
*
- * @version CVS $Id: DummyStringConvertor.java,v 1.3 2004/05/06 14:59:44 bruno
Exp $
+ * @version CVS $Id$
*/
public class DummyStringConvertor implements Convertor {
public ConversionResult convertFromString(String value, Locale locale,
Convertor.FormatCache formatCache) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/DummyStringConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/DummyStringConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/DummyStringConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
/**
* Builds [EMAIL PROTECTED] DummyStringConvertor}s.
*
- * @version CVS $Id: DummyStringConvertorBuilder.java,v 1.1 2004/03/09
10:34:06 reinhard Exp $
+ * @version CVS $Id$
*/
public class DummyStringConvertorBuilder implements ConvertorBuilder {
public Convertor build(Element configElement) throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/EnumConvertor.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/EnumConvertor.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/EnumConvertor.java
Thu Nov 4 02:12:30 2004
@@ -31,7 +31,7 @@
* typesafe enum</a> pattern.
*
* @see org.apache.cocoon.forms.datatype.typeimpl.EnumType
- * @version CVS $Id: EnumConvertor.java,v 1.4 2004/05/06 14:59:44 bruno Exp $
+ * @version CVS $Id$
*/
public class EnumConvertor implements Convertor {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/EnumConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/EnumConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/EnumConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -22,7 +22,7 @@
/**
* Builds [EMAIL PROTECTED] EnumConvertor}s.
*
- * @version CVS $Id: EnumConvertorBuilder.java,v 1.3 2004/03/11 02:56:32 joerg
Exp $
+ * @version CVS $Id$
*/
public class EnumConvertorBuilder implements ConvertorBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingDecimalConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingDecimalConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingDecimalConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
/**
* Builds [EMAIL PROTECTED] FormattingDecimalConvertor}s.
*
- * @version CVS $Id: FormattingDecimalConvertorBuilder.java,v 1.2 2004/03/09
13:08:46 cziegeler Exp $
+ * @version CVS $Id$
*/
public class FormattingDecimalConvertorBuilder implements ConvertorBuilder {
public Convertor build(Element configElement) throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingDoubleConvertor.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingDoubleConvertor.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingDoubleConvertor.java
Thu Nov 4 02:12:30 2004
@@ -27,7 +27,7 @@
* <p>This class is mostly the same as the [EMAIL PROTECTED]
FormattingDecimalConvertor},
* so see there for more information.
*
- * @version CVS $Id: FormattingDoubleConvertor.java,v 1.2 2004/05/06 14:59:44
bruno Exp $
+ * @version CVS $Id$
*/
public class FormattingDoubleConvertor extends FormattingDecimalConvertor {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingDoubleConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingDoubleConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingDoubleConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -18,10 +18,10 @@
/**
* Builds [EMAIL PROTECTED] FormattingDoubleConvertor}s.
*
- * @version CVS $Id: FormattingDoubleConvertorBuilder.java,v 1.1 2004/03/18
11:45:55 bruno Exp $
+ * @version CVS $Id$
*/
public class FormattingDoubleConvertorBuilder extends
FormattingDecimalConvertorBuilder {
protected FormattingDecimalConvertor createConvertor() {
return new FormattingDoubleConvertor();
}
-}
\ No newline at end of file
+}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingFloatConvertor.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingFloatConvertor.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingFloatConvertor.java
Thu Nov 4 02:12:30 2004
@@ -27,7 +27,7 @@
* <p>This class is mostly the same as the [EMAIL PROTECTED]
FormattingDecimalConvertor},
* so see there for more information.
*
- * @version CVS $Id: FormattingFloatConvertor.java,v 1.3 2004/05/06 14:59:44
bruno Exp $
+ * @version CVS $Id$
*/
public class FormattingFloatConvertor extends FormattingDecimalConvertor {
@@ -51,4 +51,4 @@
public Class getTypeClass() {
return Float.class;
}
-}
\ No newline at end of file
+}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingFloatConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingFloatConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingFloatConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* Builds [EMAIL PROTECTED] FormattingFloatConvertor}s.
*
- * @version CVS $Id: FormattingFloatConvertorBuilder.java,v 1.4 2004/03/18
15:47:18 joerg Exp $
+ * @version CVS $Id$
*/
public class FormattingFloatConvertorBuilder extends
FormattingDecimalConvertorBuilder {
protected FormattingDecimalConvertor createConvertor() {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingIntegerConvertor.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingIntegerConvertor.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingIntegerConvertor.java
Thu Nov 4 02:12:30 2004
@@ -28,7 +28,7 @@
* so see there for more information.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Antonio Gallardo</a>
- * @version CVS $Id: FormattingIntegerConvertor.java,v 1.2 2004/05/06 14:59:44
bruno Exp $
+ * @version CVS $Id$
*/
public class FormattingIntegerConvertor extends FormattingDecimalConvertor {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingIntegerConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingIntegerConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingIntegerConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -19,7 +19,7 @@
* Builds [EMAIL PROTECTED] FormattingIntegerConvertor}s.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Antonio Gallardo</a>
- * @version CVS $Id: FormattingIntegerConvertorBuilder.java,v 1.1 2004/03/09
10:34:06 reinhard Exp $
+ * @version CVS $Id$
*/
public class FormattingIntegerConvertorBuilder extends
FormattingDecimalConvertorBuilder {
protected FormattingDecimalConvertor createConvertor() {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingLongConvertor.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingLongConvertor.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingLongConvertor.java
Thu Nov 4 02:12:30 2004
@@ -27,7 +27,7 @@
* <p>This class is mostly the same as the [EMAIL PROTECTED]
FormattingDecimalConvertor},
* so see there for more information.
*
- * @version CVS $Id: FormattingLongConvertor.java,v 1.2 2004/05/06 14:59:44
bruno Exp $
+ * @version CVS $Id$
*/
public class FormattingLongConvertor extends FormattingDecimalConvertor {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingLongConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingLongConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/FormattingLongConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* Builds [EMAIL PROTECTED] FormattingLongConvertor}s.
*
- * @version CVS $Id: FormattingLongConvertorBuilder.java,v 1.1 2004/03/09
10:34:06 reinhard Exp $
+ * @version CVS $Id$
*/
public class FormattingLongConvertorBuilder extends
FormattingDecimalConvertorBuilder {
protected FormattingDecimalConvertor createConvertor() {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/LocaleMap.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/LocaleMap.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/LocaleMap.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* <p>This map should be filled once using calls to [EMAIL PROTECTED]
#put(Locale, Object)},
* before any calls are made to [EMAIL PROTECTED] #get(Locale)}.
*
- * @version CVS $Id: LocaleMap.java,v 1.1 2004/03/09 10:34:06 reinhard Exp $
+ * @version CVS $Id$
*/
public class LocaleMap {
private FastHashMap map = new FastHashMap();
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/MillisDateConvertor.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/MillisDateConvertor.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/MillisDateConvertor.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* A Convertor for Date objects which uses the number of milliseconds since
* January 1, 1970, 00:00:00 GMT as string representation.
*
- * @version CVS $Id: MillisDateConvertor.java,v 1.3 2004/05/06 14:59:44 bruno
Exp $
+ * @version CVS $Id$
*/
public class MillisDateConvertor implements Convertor {
public ConversionResult convertFromString(String value, Locale locale,
Convertor.FormatCache formatCache) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/MillisDateConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/MillisDateConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/MillisDateConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
/**
* Builds [EMAIL PROTECTED] MillisDateConvertor}s.
*
- * @version CVS $Id: MillisDateConvertorBuilder.java,v 1.1 2004/03/09 10:34:06
reinhard Exp $
+ * @version CVS $Id$
*/
public class MillisDateConvertorBuilder implements ConvertorBuilder {
public Convertor build(Element configElement) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainBooleanConvertor.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainBooleanConvertor.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainBooleanConvertor.java
Thu Nov 4 02:12:30 2004
@@ -23,7 +23,7 @@
/**
* Convertor for java.lang.Boolean's.
*
- * @version CVS $Id: PlainBooleanConvertor.java,v 1.3 2004/05/06 14:59:44
bruno Exp $
+ * @version CVS $Id$
*/
public class PlainBooleanConvertor implements Convertor {
public ConversionResult convertFromString(String value, Locale locale,
Convertor.FormatCache formatCache) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainBooleanConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainBooleanConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainBooleanConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
/**
* Builds {PlainBooleanConvertor}s.
*
- * @version CVS $Id: PlainBooleanConvertorBuilder.java,v 1.1 2004/03/09
10:34:06 reinhard Exp $
+ * @version CVS $Id$
*/
public class PlainBooleanConvertorBuilder implements ConvertorBuilder {
public Convertor build(Element configElement) throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDecimalConvertor.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDecimalConvertor.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDecimalConvertor.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* Convertor for [EMAIL PROTECTED] java.math.BigDecimal}s that does not do any
* (locale-dependent) formatting.
*
- * @version CVS $Id: PlainDecimalConvertor.java,v 1.3 2004/05/06 14:59:44
bruno Exp $
+ * @version CVS $Id$
*/
public class PlainDecimalConvertor implements Convertor {
public ConversionResult convertFromString(String value, Locale locale,
Convertor.FormatCache formatCache) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDecimalConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDecimalConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDecimalConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -19,7 +19,7 @@
/**
*
- * @version CVS $Id: PlainDecimalConvertorBuilder.java,v 1.1 2004/03/09
10:34:06 reinhard Exp $
+ * @version CVS $Id$
*/
public class PlainDecimalConvertorBuilder implements ConvertorBuilder {
public Convertor build(Element configElement) throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDoubleConvertor.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDoubleConvertor.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDoubleConvertor.java
Thu Nov 4 02:12:30 2004
@@ -24,7 +24,7 @@
* Convertor for java.lang.Doubles that does not do any (Locale-dependent)
* formatting. It simply uses String.valueOf() and Long.parseLong().
*
- * @version CVS $Id: PlainDoubleConvertor.java,v 1.3 2004/05/06 14:59:44 bruno
Exp $
+ * @version CVS $Id$
*/
public class PlainDoubleConvertor implements Convertor {
public ConversionResult convertFromString(String value, Locale locale,
Convertor.FormatCache formatCache) {
@@ -46,4 +46,4 @@
public void generateSaxFragment(ContentHandler contentHandler, Locale
locale) throws SAXException {
// intentionally empty
}
-}
\ No newline at end of file
+}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDoubleConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDoubleConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainDoubleConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -19,10 +19,10 @@
/**
*
- * @version CVS $Id: PlainDoubleConvertorBuilder.java,v 1.1 2004/03/18
11:45:55 bruno Exp $
+ * @version CVS $Id$
*/
public class PlainDoubleConvertorBuilder implements ConvertorBuilder {
public Convertor build(Element configElement) throws Exception {
return new PlainDoubleConvertor();
}
-}
\ No newline at end of file
+}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainFloatConvertor.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainFloatConvertor.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainFloatConvertor.java
Thu Nov 4 02:12:30 2004
@@ -24,7 +24,7 @@
* Convertor for [EMAIL PROTECTED] Float}s that does not do any
(locale-dependent)
* formatting.
*
- * @version CVS $Id: PlainFloatConvertor.java,v 1.3 2004/05/06 14:59:44 bruno
Exp $
+ * @version CVS $Id$
*/
public class PlainFloatConvertor implements Convertor {
public ConversionResult convertFromString(String value, Locale locale,
Convertor.FormatCache formatCache) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainFloatConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainFloatConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainFloatConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -19,7 +19,7 @@
/**
*
- * @version CVS $Id: PlainFloatConvertorBuilder.java,v 1.1 2004/03/09 10:34:06
reinhard Exp $
+ * @version CVS $Id$
*/
public class PlainFloatConvertorBuilder implements ConvertorBuilder {
public Convertor build(Element configElement) throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainIntegerConvertor.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainIntegerConvertor.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainIntegerConvertor.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* formatting. It simply uses String.valueOf() and Long.parseLong().
*
* @author <a href="mailto:[EMAIL PROTECTED]">Antonio Gallardo</a>
- * @version CVS $Id: PlainIntegerConvertor.java,v 1.3 2004/05/06 14:59:44
bruno Exp $
+ * @version CVS $Id$
*/
public class PlainIntegerConvertor implements Convertor {
public ConversionResult convertFromString(String value, Locale locale,
Convertor.FormatCache formatCache) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainIntegerConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainIntegerConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainIntegerConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
* Builds [EMAIL PROTECTED] PlainIntegerConvertor}s.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Antonio Gallardo</a>
- * @version CVS $Id: PlainIntegerConvertorBuilder.java,v 1.1 2004/03/09
10:34:06 reinhard Exp $
+ * @version CVS $Id$
*/
public class PlainIntegerConvertorBuilder implements ConvertorBuilder {
public Convertor build(Element configElement) throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainLongConvertor.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainLongConvertor.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainLongConvertor.java
Thu Nov 4 02:12:30 2004
@@ -24,7 +24,7 @@
* Convertor for java.lang.Longs that does not do any (Locale-dependent)
* formatting. It simply uses String.valueOf() and Long.parseLong().
*
- * @version CVS $Id: PlainLongConvertor.java,v 1.3 2004/05/06 14:59:44 bruno
Exp $
+ * @version CVS $Id$
*/
public class PlainLongConvertor implements Convertor {
public ConversionResult convertFromString(String value, Locale locale,
Convertor.FormatCache formatCache) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainLongConvertorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainLongConvertorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor/PlainLongConvertorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
/**
* Builds [EMAIL PROTECTED] PlainLongConvertor}s.
*
- * @version CVS $Id: PlainLongConvertorBuilder.java,v 1.1 2004/03/09 10:34:06
reinhard Exp $
+ * @version CVS $Id$
*/
public class PlainLongConvertorBuilder implements ConvertorBuilder {
public Convertor build(Element configElement) throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatype.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatype.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatype.java
Thu Nov 4 02:12:30 2004
@@ -35,7 +35,7 @@
/**
* Abstract base class for Datatype implementations. Most concreate datatypes
* will derive from this class.
- * @version $Id: AbstractDatatype.java,v 1.5 2004/05/06 14:59:44 bruno Exp $
+ * @version $Id$
*/
public abstract class AbstractDatatype implements Datatype {
private List validationRules = new ArrayList();
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java
Thu Nov 4 02:12:30 2004
@@ -38,7 +38,7 @@
/**
* Abstract base class for datatype builders, most concrete datatype builders
* will derive from this class.
- * @version $Id: AbstractDatatypeBuilder.java,v 1.4 2004/04/21 13:20:27 bruno
Exp $
+ * @version $Id$
*/
public abstract class AbstractDatatypeBuilder extends AbstractLogEnabled
implements DatatypeBuilder, Serviceable, Configurable, Contextualizable {
protected ServiceManager serviceManager;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/BooleanType.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/BooleanType.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/BooleanType.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* A [EMAIL PROTECTED] org.apache.cocoon.forms.datatype.Datatype Datatype}
implementation for
* java.lang.Boolean's.
- * @version $Id: BooleanType.java,v 1.2 2004/03/09 11:31:11 joerg Exp $
+ * @version $Id$
*/
public class BooleanType extends AbstractDatatype {
public Class getTypeClass() {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/BooleanTypeBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/BooleanTypeBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/BooleanTypeBuilder.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
/**
* Builds [EMAIL PROTECTED] BooleanType}s.
- * @version $Id: BooleanTypeBuilder.java,v 1.1 2004/03/09 10:33:57 reinhard
Exp $
+ * @version $Id$
*/
public class BooleanTypeBuilder extends AbstractDatatypeBuilder {
public Datatype build(Element datatypeElement, boolean arrayType,
DatatypeManager datatypeManager) throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DateType.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DateType.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DateType.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
/**
* A [EMAIL PROTECTED] org.apache.cocoon.forms.datatype.Datatype Datatype}
implementation for
* java.util.Date's (so includes a time-component).
- * @version $Id: DateType.java,v 1.2 2004/03/09 11:31:11 joerg Exp $
+ * @version $Id$
*/
public class DateType extends AbstractDatatype {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DateTypeBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DateTypeBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DateTypeBuilder.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
/**
* Builds [EMAIL PROTECTED] DateType}s.
- * @version $Id: DateTypeBuilder.java,v 1.1 2004/03/09 10:33:57 reinhard Exp $
+ * @version $Id$
*/
public class DateTypeBuilder extends AbstractDatatypeBuilder {
public Datatype build(Element datatypeElement, boolean arrayType,
DatatypeManager datatypeManager) throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DecimalType.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DecimalType.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DecimalType.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* A [EMAIL PROTECTED] org.apache.cocoon.forms.datatype.Datatype Datatype}
implementation
* for decimal numbers (backed by the java.math.BigDecimal class).
- * @version $Id: DecimalType.java,v 1.2 2004/03/09 11:31:11 joerg Exp $
+ * @version $Id$
*/
public class DecimalType extends AbstractDatatype {
public Class getTypeClass() {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DecimalTypeBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DecimalTypeBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DecimalTypeBuilder.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
/**
* Builds [EMAIL PROTECTED] DecimalType}s.
- * @version $Id: DecimalTypeBuilder.java,v 1.1 2004/03/09 10:33:57 reinhard
Exp $
+ * @version $Id$
*/
public class DecimalTypeBuilder extends AbstractDatatypeBuilder {
public Datatype build(Element datatypeElement, boolean arrayType,
DatatypeManager datatypeManager) throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DoubleType.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DoubleType.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DoubleType.java
Thu Nov 4 02:12:30 2004
@@ -19,7 +19,7 @@
* A [EMAIL PROTECTED] org.apache.cocoon.forms.datatype.Datatype Datatype}
implementation
* for double numbers (backed by the java.lang.Double class).
*
- * @version $Id: DoubleType.java,v 1.1 2004/03/18 11:45:55 bruno Exp $
+ * @version $Id$
*/
public class DoubleType extends AbstractDatatype {
public Class getTypeClass() {
@@ -29,4 +29,4 @@
public String getDescriptiveName() {
return "double";
}
-}
\ No newline at end of file
+}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DoubleTypeBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DoubleTypeBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/DoubleTypeBuilder.java
Thu Nov 4 02:12:30 2004
@@ -22,7 +22,7 @@
/**
* Builds [EMAIL PROTECTED] DoubleType}s.
*
- * @version $Id: DoubleTypeBuilder.java,v 1.1 2004/03/18 11:45:55 bruno Exp $
+ * @version $Id$
*/
public class DoubleTypeBuilder extends AbstractDatatypeBuilder {
public Datatype build(Element datatypeElement, boolean arrayType,
DatatypeManager datatypeManager) throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/EnumType.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/EnumType.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/EnumType.java
Thu Nov 4 02:12:30 2004
@@ -41,7 +41,7 @@
* different, you should also provide a fromString(String, Locale)
* method to convert those strings back to instances.
*
- * @version CVS $Id: EnumType.java,v 1.2 2004/03/09 11:31:11 joerg Exp $
+ * @version CVS $Id$
*/
public class EnumType extends AbstractDatatype {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/EnumTypeBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/EnumTypeBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/EnumTypeBuilder.java
Thu Nov 4 02:12:30 2004
@@ -22,7 +22,7 @@
/**
* Builds [EMAIL PROTECTED] EnumType}s.
*
- * @version CVS $Id: EnumTypeBuilder.java,v 1.2 2004/03/09 11:31:11 joerg Exp $
+ * @version CVS $Id$
*/
public class EnumTypeBuilder extends AbstractDatatypeBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/FloatType.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/FloatType.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/FloatType.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* A [EMAIL PROTECTED] org.apache.cocoon.forms.datatype.Datatype Datatype}
implementation
* for float numbers (backed by the java.lang.Float class).
- * @version $Id: FloatType.java,v 1.2 2004/03/09 11:31:11 joerg Exp $
+ * @version $Id$
*/
public class FloatType extends AbstractDatatype {
public Class getTypeClass() {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/FloatTypeBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/FloatTypeBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/FloatTypeBuilder.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
/**
* Builds [EMAIL PROTECTED] FloatType}s.
- * @version $Id: FloatTypeBuilder.java,v 1.1 2004/03/09 10:33:57 reinhard Exp $
+ * @version $Id$
*/
public class FloatTypeBuilder extends AbstractDatatypeBuilder {
public Datatype build(Element datatypeElement, boolean arrayType,
DatatypeManager datatypeManager) throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/IntegerType.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/IntegerType.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/IntegerType.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
* for whole numbers.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Antonio Gallardo</a>
- * @version CVS $Id: IntegerType.java,v 1.2 2004/03/09 11:31:11 joerg Exp $
+ * @version CVS $Id$
*/
public class IntegerType extends AbstractDatatype {
public Class getTypeClass() {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/IntegerTypeBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/IntegerTypeBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/IntegerTypeBuilder.java
Thu Nov 4 02:12:30 2004
@@ -23,7 +23,7 @@
* Builds [EMAIL PROTECTED] IntegerType}s.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Antonio Gallardo</a>
- * @version CVS $Id: IntegerTypeBuilder.java,v 1.1 2004/03/09 10:33:57
reinhard Exp $
+ * @version CVS $Id$
*/
public class IntegerTypeBuilder extends AbstractDatatypeBuilder {
public Datatype build(Element datatypeElement, boolean arrayType,
DatatypeManager datatypeManager) throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/LongType.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/LongType.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/LongType.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* A [EMAIL PROTECTED] org.apache.cocoon.forms.datatype.Datatype Datatype}
implementation
* for whole numbers.
- * @version $Id: LongType.java,v 1.2 2004/03/09 11:31:11 joerg Exp $
+ * @version $Id$
*/
public class LongType extends AbstractDatatype {
public Class getTypeClass() {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/LongTypeBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/LongTypeBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/LongTypeBuilder.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
/**
* Builds [EMAIL PROTECTED] LongType}s.
- * @version $Id: LongTypeBuilder.java,v 1.1 2004/03/09 10:33:57 reinhard Exp $
+ * @version $Id$
*/
public class LongTypeBuilder extends AbstractDatatypeBuilder {
public Datatype build(Element datatypeElement, boolean arrayType,
DatatypeManager datatypeManager) throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/StringType.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/StringType.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/StringType.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* A [EMAIL PROTECTED] org.apache.cocoon.forms.datatype.Datatype Datatype}
implementation
* for strings.
- * @version $Id: StringType.java,v 1.2 2004/03/09 11:31:11 joerg Exp $
+ * @version $Id$
*/
public class StringType extends AbstractDatatype {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/StringTypeBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/StringTypeBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/StringTypeBuilder.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
/**
* Builds [EMAIL PROTECTED] StringType}s.
- * @version $Id: StringTypeBuilder.java,v 1.1 2004/03/09 10:33:57 reinhard Exp
$
+ * @version $Id$
*/
public class StringTypeBuilder extends AbstractDatatypeBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AbstractValidationRule.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AbstractValidationRule.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AbstractValidationRule.java
Thu Nov 4 02:12:30 2004
@@ -29,7 +29,7 @@
* Abstract base class providing common functionality for many [EMAIL
PROTECTED] ValidationRule}
* implementations.
*
- * @version $Id: AbstractValidationRule.java,v 1.2 2004/03/09 14:58:45
cziegeler Exp $
+ * @version $Id$
*/
public abstract class AbstractValidationRule implements ValidationRule {
private XMLizable failMessage;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AssertValidationRule.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AssertValidationRule.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AssertValidationRule.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* Generic validation rule that evaluates an expression. If the outcome of the
expression is true,
* the validation is successful, otherwise not.
*
- * @version $Id: AssertValidationRule.java,v 1.2 2004/03/09 14:58:45 cziegeler
Exp $
+ * @version $Id$
*/
public class AssertValidationRule extends AbstractValidationRule {
private Expression testExpression;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AssertValidationRuleBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AssertValidationRuleBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AssertValidationRuleBuilder.java
Thu Nov 4 02:12:30 2004
@@ -23,7 +23,7 @@
/**
* Builds [EMAIL PROTECTED] AssertValidationRule}s.
*
- * @version $Id: AssertValidationRuleBuilder.java,v 1.1 2004/03/09 10:34:10
reinhard Exp $
+ * @version $Id$
*/
public class AssertValidationRuleBuilder extends AbstractValidationRuleBuilder
{
public ValidationRule build(Element validationRuleElement) throws
Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/EmailValidationRuleBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/EmailValidationRuleBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/EmailValidationRuleBuilder.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
/**
* Builds [EMAIL PROTECTED] EmailValidationRule}s.
*
- * @version $Id: EmailValidationRuleBuilder.java,v 1.1 2004/03/09 10:34:10
reinhard Exp $
+ * @version $Id$
*/
public class EmailValidationRuleBuilder extends AbstractValidationRuleBuilder {
public ValidationRule build(Element validationRuleElement) throws
Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/LengthValidationRule.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/LengthValidationRule.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/LengthValidationRule.java
Thu Nov 4 02:12:30 2004
@@ -35,7 +35,7 @@
* <li>check min and max string length
* </ul>
*
- * @version $Id: LengthValidationRule.java,v 1.3 2004/03/28 20:51:24 antonio
Exp $
+ * @version $Id$
*/
public class LengthValidationRule extends AbstractValidationRule {
private Expression exactExpr;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/LengthValidationRuleBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/LengthValidationRuleBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/LengthValidationRuleBuilder.java
Thu Nov 4 02:12:30 2004
@@ -23,7 +23,7 @@
/**
* Builds [EMAIL PROTECTED] LengthValidationRule}s.
*
- * @version $Id: LengthValidationRuleBuilder.java,v 1.1 2004/03/09 10:34:10
reinhard Exp $
+ * @version $Id$
*/
public class LengthValidationRuleBuilder extends AbstractValidationRuleBuilder
{
public ValidationRule build(Element validationRuleElement) throws
Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/Mod10ValidationRule.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/Mod10ValidationRule.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/Mod10ValidationRule.java
Thu Nov 4 02:12:30 2004
@@ -28,7 +28,7 @@
* and prefix, but those properties are depended on the credit card type and
such validation
* is not performed by this validation rule.
*
- * @version $Id: Mod10ValidationRule.java,v 1.2 2004/03/09 14:58:45 cziegeler
Exp $
+ * @version $Id$
*/
public class Mod10ValidationRule extends AbstractValidationRule {
public ValidationError validate(Object value, ExpressionContext
expressionContext) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/Mod10ValidationRuleBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/Mod10ValidationRuleBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/Mod10ValidationRuleBuilder.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
/**
* Builds [EMAIL PROTECTED] Mod10ValidationRule}s.
*
- * @version $Id: Mod10ValidationRuleBuilder.java,v 1.1 2004/03/09 10:34:10
reinhard Exp $
+ * @version $Id$
*/
public class Mod10ValidationRuleBuilder extends AbstractValidationRuleBuilder {
public ValidationRule build(Element validationRuleElement) throws
Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RangeValidationRule.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RangeValidationRule.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RangeValidationRule.java
Thu Nov 4 02:12:30 2004
@@ -36,7 +36,7 @@
* <li>check min and max values (range check)
* </ul>
*
- * @version $Id: RangeValidationRule.java,v 1.3 2004/03/28 20:51:24 antonio
Exp $
+ * @version $Id$
*/
public class RangeValidationRule extends AbstractValidationRule {
private Expression minExpr;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RangeValidationRuleBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RangeValidationRuleBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RangeValidationRuleBuilder.java
Thu Nov 4 02:12:30 2004
@@ -23,7 +23,7 @@
/**
* Builds [EMAIL PROTECTED] RangeValidationRule}s.
*
- * @version $Id: RangeValidationRuleBuilder.java,v 1.1 2004/03/09 10:34:10
reinhard Exp $
+ * @version $Id$
*/
public class RangeValidationRuleBuilder extends AbstractValidationRuleBuilder {
public ValidationRule build(Element validationRuleElement) throws
Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RegExpValidationRule.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RegExpValidationRule.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RegExpValidationRule.java
Thu Nov 4 02:12:30 2004
@@ -30,7 +30,7 @@
* <p>The <a href="http://jakarta.apache.org/oro/";>Jakarta ORO</a> library
* is used as regexp engine.
*
- * @version $Id: RegExpValidationRule.java,v 1.2 2004/03/09 14:58:45 cziegeler
Exp $
+ * @version $Id$
*/
public class RegExpValidationRule extends AbstractValidationRule {
/** Compiled regular expression. */
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RegExpValidationRuleBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RegExpValidationRuleBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RegExpValidationRuleBuilder.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
/**
* Builds [EMAIL PROTECTED] RegExpValidationRule}s.
*
- * @version $Id: RegExpValidationRuleBuilder.java,v 1.1 2004/03/09 10:34:10
reinhard Exp $
+ * @version $Id$
*/
public class RegExpValidationRuleBuilder extends AbstractValidationRuleBuilder
{
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/ValueCountValidationRule.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/ValueCountValidationRule.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/ValueCountValidationRule.java
Thu Nov 4 02:12:30 2004
@@ -37,7 +37,7 @@
* <li>check min and max array size
* </ul>
*
- * @version $Id: ValueCountValidationRule.java,v 1.4 2004/03/28 20:51:24
antonio Exp $
+ * @version $Id$
*/
public class ValueCountValidationRule extends AbstractValidationRule {
private Expression exactExpr;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/ValueCountValidationRuleBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/ValueCountValidationRuleBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/ValueCountValidationRuleBuilder.java
Thu Nov 4 02:12:30 2004
@@ -23,7 +23,7 @@
/**
* Builds [EMAIL PROTECTED] ValueCountValidationRule}s.
*
- * @version $Id: ValueCountValidationRuleBuilder.java,v 1.1 2004/03/09
10:34:10 reinhard Exp $
+ * @version $Id$
*/
public class ValueCountValidationRuleBuilder extends
AbstractValidationRuleBuilder {
public ValidationRule build(Element validationRuleElement) throws
Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/AbstractFormHandler.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/AbstractFormHandler.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/AbstractFormHandler.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
* of the WidgetEvent and calls the more specific [EMAIL PROTECTED]
#handleActionEvent(ActionEvent)}
* or [EMAIL PROTECTED] #handleValueChangedEvent(ValueChangedEvent)} methods.
*
- * @version CVS $Id: AbstractFormHandler.java,v 1.1 2004/03/09 10:33:45
reinhard Exp $
+ * @version CVS $Id$
*/
public abstract class AbstractFormHandler implements FormHandler {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ActionEvent.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ActionEvent.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ActionEvent.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
* Currently this event originates from a [EMAIL PROTECTED]
org.apache.cocoon.forms.formmodel.Action Button}
* widget.
*
- * @version CVS $Id: ActionEvent.java,v 1.2 2004/03/09 11:31:12 joerg Exp $
+ * @version CVS $Id$
*/
public class ActionEvent extends WidgetEvent {
String actionCommand;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ActionListener.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ActionListener.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ActionListener.java
Thu Nov 4 02:12:30 2004
@@ -19,7 +19,7 @@
* Listeners for [EMAIL PROTECTED] ActionEvent}s
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: ActionListener.java,v 1.1 2004/03/09 10:33:45 reinhard
Exp $
+ * @version CVS $Id$
*/
public interface ActionListener extends WidgetListener {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/CreateEvent.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/CreateEvent.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/CreateEvent.java
Thu Nov 4 02:12:30 2004
@@ -22,7 +22,7 @@
* An event raised when a widget is created, once it has been fully set up. For
* container widgets, this occurs after child widgets, if any, have been
created.
*
- * @version CVS $Id: CreateEvent.java 30941 2004-07-29 19:56:58Z vgritsenko $
+ * @version CVS $Id$
*/
public class CreateEvent extends WidgetEvent {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/CreateListener.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/CreateListener.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/CreateListener.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* Listeners for [EMAIL PROTECTED] CreateEvent}s
*
- * @version CVS $Id: CreateListener.java 30941 2004-07-29 19:56:58Z vgritsenko
$
+ * @version CVS $Id$
*/
public interface CreateListener extends WidgetListener {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/DeferredValueChangedEvent.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/DeferredValueChangedEvent.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/DeferredValueChangedEvent.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* value, thus avoiding unnecessary validation warnings when a user clicks an
action.
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: DeferredValueChangedEvent.java,v 1.1 2004/03/09 10:33:45
reinhard Exp $
+ * @version CVS $Id$
*/
public class DeferredValueChangedEvent extends ValueChangedEvent {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/FormHandler.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/FormHandler.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/FormHandler.java
Thu Nov 4 02:12:30 2004
@@ -27,7 +27,7 @@
* you want the event handler to have access to objects it would not be able
to get access
* to if they were part of the form definition.
*
- * @version CVS $Id: FormHandler.java,v 1.2 2004/03/09 11:31:12 joerg Exp $
+ * @version CVS $Id$
*/
public interface FormHandler {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ProcessingPhaseEvent.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ProcessingPhaseEvent.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ProcessingPhaseEvent.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
* Event raised when a form processing phase is finished.
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: ProcessingPhaseEvent.java,v 1.1 2004/03/09 10:33:45
reinhard Exp $
+ * @version CVS $Id$
*/
public class ProcessingPhaseEvent extends WidgetEvent {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ValueChangedEvent.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ValueChangedEvent.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ValueChangedEvent.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
* Event raised when a field value changes.
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: ValueChangedEvent.java,v 1.1 2004/03/09 10:33:45 reinhard
Exp $
+ * @version CVS $Id$
*/
public class ValueChangedEvent extends WidgetEvent {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ValueChangedListener.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ValueChangedListener.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/ValueChangedListener.java
Thu Nov 4 02:12:30 2004
@@ -19,7 +19,7 @@
* Listener invoked when a field value changes.
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: ValueChangedListener.java,v 1.1 2004/03/09 10:33:45
reinhard Exp $
+ * @version CVS $Id$
*/
public interface ValueChangedListener extends WidgetListener {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/WidgetEvent.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/WidgetEvent.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/WidgetEvent.java
Thu Nov 4 02:12:30 2004
@@ -23,7 +23,7 @@
* Base class for events sent by form widgets.
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: WidgetEvent.java,v 1.1 2004/03/09 10:33:45 reinhard Exp $
+ * @version CVS $Id$
*/
public abstract class WidgetEvent extends EventObject {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/WidgetListener.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/WidgetListener.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/WidgetListener.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
* Base interface for all widget event listeners.
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: WidgetListener.java,v 1.1 2004/03/09 10:33:45 reinhard
Exp $
+ * @version CVS $Id$
*/
public interface WidgetListener extends EventListener {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/WidgetListenerBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/WidgetListenerBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/WidgetListenerBuilder.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
* A component that build widget event listeners.
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: WidgetListenerBuilder.java,v 1.1 2004/03/09 10:33:45
reinhard Exp $
+ * @version CVS $Id$
*/
public interface WidgetListenerBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/impl/JavaClassWidgetListenerBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/impl/JavaClassWidgetListenerBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/event/impl/JavaClassWidgetListenerBuilder.java
Thu Nov 4 02:12:30 2004
@@ -31,7 +31,7 @@
* </pre>
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: JavaClassWidgetListenerBuilder.java,v 1.2 2004/04/27
12:02:13 bruno Exp $
+ * @version CVS $Id$
*/
public class JavaClassWidgetListenerBuilder implements WidgetListenerBuilder,
ThreadSafe {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/DefaultExpressionManager.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/DefaultExpressionManager.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/DefaultExpressionManager.java
Thu Nov 4 02:12:30 2004
@@ -36,7 +36,7 @@
* <function name="MyFunction" class="net.foo.MyFunction"/>
* </pre>
*
- * @version CVS $Id: DefaultExpressionManager.java,v 1.1 2004/03/09 10:34:08
reinhard Exp $
+ * @version CVS $Id$
*/
public class DefaultExpressionManager
implements ExpressionManager, Component, Configurable, ThreadSafe {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/ExpressionManager.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/ExpressionManager.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/ExpressionManager.java
Thu Nov 4 02:12:30 2004
@@ -24,7 +24,7 @@
* The reason for centralising the creation of expressions is so that
* new functions can be registered in one place.
*
- * @version $Id: ExpressionManager.java,v 1.1 2004/03/09 10:34:08 reinhard Exp
$
+ * @version $Id$
*/
public interface ExpressionManager {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/IsNullFunction.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/IsNullFunction.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/IsNullFunction.java
Thu Nov 4 02:12:30 2004
@@ -24,7 +24,7 @@
* Returns true if argument is null.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Id: IsNullFunction.java,v 1.1 2004/03/09 10:34:08 reinhard
Exp $
+ * @version CVS $Id$
*/
public class IsNullFunction extends AbstractExpression {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/NullFunction.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/NullFunction.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/NullFunction.java
Thu Nov 4 02:12:30 2004
@@ -23,7 +23,7 @@
* Returns null constant.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Id: NullFunction.java,v 1.1 2004/03/09 10:34:08 reinhard Exp $
+ * @version CVS $Id$
*/
public class NullFunction extends AbstractExpression {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/StringFunction.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/StringFunction.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/expression/StringFunction.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* values, such as numbers.
*
* @author <a href="http://cocoon.apache.org/";>The Apache Cocoon Team</a>
- * @version CVS $Id: StringFunction.java,v 1.1 2004/03/09 10:34:08 reinhard
Exp $
+ * @version CVS $Id$
*/
public class StringFunction extends AbstractExpression {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/Form.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
/**
* cforms flowscript integration helper class.
- * @version $Id: Form.java,v 1.1 2004/03/11 02:56:32 joerg Exp $
+ * @version $Id$
*/
public class Form extends ScriptableObject {
FOM_Cocoon cocoon;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2/ScriptableWidget.java
Thu Nov 4 02:12:30 2004
@@ -462,7 +462,7 @@
public String jsFunction_getId() {
return delegate.getId();
}
-
+
public WidgetState jsGet_state() {
return delegate.getState();
}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractContainerDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractContainerDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractContainerDefinition.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
/**
* The [EMAIL PROTECTED] AbstractContainerDefinition} corresponding to an
[EMAIL PROTECTED] AbstractContainerWidget}.
*
- * @version $Id: AbstractContainerDefinition.java,v 1.3 2004/04/21 20:30:49
mpo Exp $
+ * @version $Id$
*/
public abstract class AbstractContainerDefinition
extends AbstractWidgetDefinition implements ContainerDefinition {
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
Thu Nov 4 02:12:30 2004
@@ -37,14 +37,27 @@
/**
* Constructs AbstractContainerWidget
*/
- public AbstractContainerWidget(AbstractWidgetDefinition definition) {
+ public AbstractContainerWidget(AbstractContainerDefinition definition) {
super(definition);
widgets = new WidgetList();
}
+ /**
+ * Called after widget's environment has been setup,
+ * to allow for any contextual initalization such as
+ * looking up case widgets for union widgets.
+ */
+ public void initialize() {
+ Iterator it = this.getChildren();
+ while(it.hasNext()) {
+ ((Widget)it.next()).initialize();
+ }
+ }
+
public void addChild(Widget widget) {
- widget.setParent(this);
+ // order is important
widgets.addWidget(widget);
+ widget.setParent(this);
}
public boolean hasChild(String id) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinition.java
Thu Nov 4 02:12:30 2004
@@ -50,7 +50,7 @@
}
public void setSelectionList(SelectionList selectionList) {
- if (selectionList.getDatatype() != getDatatype())
+ if (selectionList != null && selectionList.getDatatype() !=
getDatatype())
throw new RuntimeException("Tried to assign a SelectionList that
is not associated with this widget's datatype.");
this.selectionList = selectionList;
}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinitionBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinitionBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinitionBuilder.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
/**
* Abstract base class for WidgetDefinitionBuilders that build widgets that
have datatypes/selection lists.
*
- * @version $Id: AbstractDatatypeWidgetDefinitionBuilder.java,v 1.2 2004/03/09
13:08:45 cziegeler Exp $
+ * @version $Id$
*/
public abstract class AbstractDatatypeWidgetDefinitionBuilder extends
AbstractWidgetDefinitionBuilder {
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
Thu Nov 4 02:12:30 2004
@@ -63,12 +63,21 @@
* Storage for the widget allocated attributes
*/
private Map attributes;
-
+
protected AbstractWidget(AbstractWidgetDefinition definition) {
this.state = definition.getState();
}
/**
+ * Called after widget's environment has been setup,
+ * to allow for any contextual initalization, such as
+ * looking up case widgets for union widgets.
+ */
+ public void initialize() {
+ // Do nothing.
+ }
+
+ /**
* Gets the id of this widget.
*/
public String getId() {
@@ -165,7 +174,7 @@
public Widget lookupWidget(String path) {
- if (path == null && path.equals(""))
+ if (path == null || path.equals(""))
return this;
Widget relativeWidget;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AddRowActionDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AddRowActionDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AddRowActionDefinition.java
Thu Nov 4 02:12:30 2004
@@ -22,7 +22,7 @@
* The definition for a repeater action that adds a row to a sibling repeater.
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: AddRowActionDefinition.java,v 1.1 2004/03/09 10:33:50
reinhard Exp $
+ * @version CVS $Id$
*/
public class AddRowActionDefinition extends RepeaterActionDefinition {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinitionBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinitionBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinitionBuilder.java
Thu Nov 4 02:12:30 2004
@@ -29,7 +29,7 @@
/**
* Builds [EMAIL PROTECTED] AggregateFieldDefinition}s.
*
- * @version $Id: AggregateFieldDefinitionBuilder.java,v 1.2 2004/03/09
13:08:45 cziegeler Exp $
+ * @version $Id$
*/
public class AggregateFieldDefinitionBuilder extends FieldDefinitionBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanField.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanField.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanField.java
Thu Nov 4 02:12:30 2004
@@ -40,6 +40,11 @@
* @version $Id$
*/
public class BooleanField extends AbstractWidget implements
ValidationErrorAware, ValueChangedListenerEnabled {
+
+ private static final String BOOLEAN_FIELD_EL = "booleanfield";
+ private static final String VALUE_EL = "value";
+ private static final String VALIDATION_MSG_EL = "validation-message";
+
// FIXME(SW) : should the initial value be false or null ? This would allow
// event listeners to be triggered at bind time.
private Boolean value = Boolean.FALSE;
@@ -102,10 +107,6 @@
public void setValidationError(ValidationError error) {
this.validationError = error;
}
-
- private static final String BOOLEAN_FIELD_EL = "booleanfield";
- private static final String VALUE_EL = "value";
- private static final String VALIDATION_MSG_EL = "validation-message";
/**
* @return "booleanfield"
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanFieldDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanFieldDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanFieldDefinition.java
Thu Nov 4 02:12:30 2004
@@ -22,7 +22,7 @@
/**
* The [EMAIL PROTECTED] WidgetDefinition} part of a BooleanField widget, see
[EMAIL PROTECTED] BooleanField} for more information.
*
- * @version $Id: BooleanFieldDefinition.java,v 1.2 2004/04/22 14:44:31 mpo Exp
$
+ * @version $Id$
*/
public class BooleanFieldDefinition extends AbstractWidgetDefinition {
private ValueChangedListener listener;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ButtonDefinitionBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ButtonDefinitionBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ButtonDefinitionBuilder.java
Thu Nov 4 02:12:30 2004
@@ -22,7 +22,7 @@
* The ButtonDefinitionBuilder has been replaced by [EMAIL PROTECTED]
ActionDefinitionBuilder}. This implementation
* is only left here to give a warning to users.
*
- * @version $Id: ButtonDefinitionBuilder.java,v 1.1 2004/03/09 10:33:50
reinhard Exp $
+ * @version $Id$
*/
public class ButtonDefinitionBuilder implements WidgetDefinitionBuilder {
public WidgetDefinition buildWidgetDefinition(Element widgetElement)
throws Exception {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/CannotYetResolveWarning.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/CannotYetResolveWarning.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/CannotYetResolveWarning.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
* the value of a required field, when that required field does not yet have
* a value.
*
- * @version $Id: CannotYetResolveWarning.java,v 1.1 2004/03/09 10:33:50
reinhard Exp $
+ * @version $Id$
*/
public class CannotYetResolveWarning extends RuntimeException {
public String getMessage() {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ClassDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ClassDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ClassDefinition.java
Thu Nov 4 02:12:30 2004
@@ -19,7 +19,7 @@
* A [EMAIL PROTECTED] WidgetDefinition} which holds a collection of [EMAIL
PROTECTED] Widget}s
* and which can be instantiated with a [EMAIL PROTECTED] NewDefinition}.
*
- * @version $Id: ClassDefinition.java,v 1.2 2004/04/12 14:05:09 tim Exp $
+ * @version $Id$
*/
public class ClassDefinition extends AbstractContainerDefinition {
public Widget createInstance() {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ContainerDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ContainerDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ContainerDefinition.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
/**
* Interface to be implemented by WidgetDefinitions for Widgets which contain
other widgets.
*
- * @version $Id: ContainerDefinition.java,v 1.2 2004/04/12 14:05:09 tim Exp $
+ * @version $Id$
*/
public interface ContainerDefinition extends WidgetDefinition {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ContainerWidget.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ContainerWidget.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ContainerWidget.java
Thu Nov 4 02:12:30 2004
@@ -22,7 +22,7 @@
* widget, the [EMAIL PROTECTED] ContainerWidget}s being the branches/forks,
and the
* [EMAIL PROTECTED] Widget}s with values being the leaves.
*
- * @version $Id: ContainerWidget.java,v 1.5 2004/05/07 16:43:42 mpo Exp $
+ * @version $Id$
*/
public interface ContainerWidget extends Widget {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/DataWidget.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/DataWidget.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/DataWidget.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
import org.apache.cocoon.forms.datatype.Datatype;
/**
- * @version $Id: DataWidget.java,v 1.1 2004/03/09 10:33:50 reinhard Exp $
+ * @version $Id$
*
*/
public interface DataWidget extends Widget {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/DuplicateIdException.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/DuplicateIdException.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/DuplicateIdException.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
* one tries to add a WidgetDefinition that has the same id as another,
* previously added, WidgetDefinition.
*
- * @version $Id: DuplicateIdException.java,v 1.1 2004/03/09 10:33:50 reinhard
Exp $
+ * @version $Id$
*/
public class DuplicateIdException extends Exception {
public DuplicateIdException(String message) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ExpressionContextImpl.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ExpressionContextImpl.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/ExpressionContextImpl.java
Thu Nov 4 02:12:30 2004
@@ -23,7 +23,7 @@
* Implementation of the ExpressionContext required for the evaluation of
* expressions by xReporter expression interpreter.
*
- * @version $Id: ExpressionContextImpl.java,v 1.3 2004/05/07 16:43:42 mpo Exp $
+ * @version $Id$
*/
public class ExpressionContextImpl implements ExpressionContext {
private Widget widget;
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
Thu Nov 4 02:12:30 2004
@@ -46,6 +46,11 @@
*/
public class Field extends AbstractWidget implements ValidationErrorAware,
DataWidget, SelectableWidget,
ValueChangedListenerEnabled {
+
+ private static final String FIELD_EL = "field";
+ private static final String VALUE_EL = "value";
+ private static final String VALIDATION_MSG_EL = "validation-message";
+
/** Overrides selection list defined in FieldDefinition, if any. */
protected SelectionList selectionList;
/** Additional listeners to those defined as part of the widget definition
(if any). */
@@ -198,13 +203,15 @@
if (!(newEnteredValue == null ? "" :
newEnteredValue).equals((enteredValue == null ? "" : enteredValue))) {
enteredValue = newEnteredValue;
validationError = null;
+ Object oldValue = value;
value = null;
this.valueState = VALUE_UNPARSED;
if (hasValueChangedListeners()) {
// Throw an event that will parse the value only if needed.
- getForm().addWidgetEvent(new DeferredValueChangedEvent(this,
value));
- }
+ // This event holds the old value and will lazily compute the
new one if needed
+ getForm().addWidgetEvent(new DeferredValueChangedEvent(this,
oldValue));
+ }
}
}
@@ -319,11 +326,6 @@
public boolean isRequired() {
return getFieldDefinition().isRequired();
}
-
-
- private static final String FIELD_EL = "field";
- private static final String VALUE_EL = "value";
- private static final String VALIDATION_MSG_EL = "validation-message";
/**
* @return "field"
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/FormDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/FormDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/FormDefinition.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
/**
* The [EMAIL PROTECTED] WidgetDefinition} part of a Form widget, see [EMAIL
PROTECTED] Form} for more information.
*
- * @version $Id: FormDefinition.java,v 1.1 2004/03/09 10:33:50 reinhard Exp $
+ * @version $Id$
*/
public class FormDefinition extends AbstractContainerDefinition {
private ProcessingPhaseListener listener;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MessagesDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MessagesDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MessagesDefinition.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* The [EMAIL PROTECTED] WidgetDefinition} part of a Messages widget, see
[EMAIL PROTECTED] Messages} for more information.
*
- * @version $Id: MessagesDefinition.java,v 1.1 2004/03/09 10:33:50 reinhard
Exp $
+ * @version $Id$
*/
public class MessagesDefinition extends AbstractWidgetDefinition {
public Widget createInstance() {
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
Thu Nov 4 02:12:30 2004
@@ -50,6 +50,12 @@
* @version $Id$
*/
public class MultiValueField extends AbstractWidget implements
ValidationErrorAware, SelectableWidget {
+
+ private static final String MULTIVALUEFIELD_EL = "multivaluefield";
+ private static final String VALUES_EL = "values";
+ private static final String VALUE_EL = "value";
+ private static final String VALIDATION_MSG_EL = "validation-message";
+
private final MultiValueFieldDefinition definition;
private SelectionList selectionList;
@@ -113,11 +119,6 @@
return validationError == null ? super.validate() : false;
}
-
- private static final String MULTIVALUEFIELD_EL = "multivaluefield";
- private static final String VALUES_EL = "values";
- private static final String VALUE_EL = "value";
- private static final String VALIDATION_MSG_EL = "validation-message";
/**
* @return "multivaluefield"
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueFieldDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueFieldDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/MultiValueFieldDefinition.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* The [EMAIL PROTECTED] WidgetDefinition} part of a MultiValueField widget,
see [EMAIL PROTECTED] MultiValueField} for more information.
*
- * @version $Id: MultiValueFieldDefinition.java,v 1.2 2004/04/22 14:44:31 mpo
Exp $
+ * @version $Id$
*/
public class MultiValueFieldDefinition extends FieldDefinition {
public Widget createInstance() {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/NewDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/NewDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/NewDefinition.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* [EMAIL PROTECTED] ClassDefinition}. The resolve step replaces this
definition with
* the definitions contained in the referenced [EMAIL PROTECTED]
ClassDefinition}.
*
- * @version $Id: NewDefinition.java,v 1.2 2004/04/12 14:05:09 tim Exp $
+ * @version $Id$
*/
public class NewDefinition extends AbstractWidgetDefinition {
private boolean resolving;
@@ -72,7 +72,9 @@
if (definition instanceof ContainerDefinition) {
((ContainerDefinition)definition).resolve(parents, parent);
}
- if (!(definition instanceof NewDefinition)) {
+ if (definition instanceof NewDefinition) {
+ ((NewDefinition)definition).resolve(parents, parent);
+ } else {
((ContainerDefinition)parent).addWidgetDefinition(definition);
}
}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/OutputDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/OutputDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/OutputDefinition.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* The [EMAIL PROTECTED] WidgetDefinition} part of a [EMAIL PROTECTED] Output}
widget.
*
- * @version $Id: OutputDefinition.java,v 1.1 2004/03/09 10:33:50 reinhard Exp $
+ * @version $Id$
*/
public class OutputDefinition extends AbstractDatatypeWidgetDefinition {
public Widget createInstance() {
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
Thu Nov 4 02:12:30 2004
@@ -65,6 +65,7 @@
public RepeaterRow addRow() {
RepeaterRow repeaterRow = new RepeaterRow(definition);
rows.add(repeaterRow);
+ repeaterRow.initialize();
return repeaterRow;
}
@@ -75,6 +76,7 @@
} else {
rows.add(index, repeaterRow);
}
+ repeaterRow.initialize();
return repeaterRow;
}
@@ -309,7 +311,7 @@
public class RepeaterRow extends AbstractContainerWidget {
- public RepeaterRow(AbstractWidgetDefinition definition) {
+ public RepeaterRow(RepeaterDefinition definition) {
super(definition);
setParent(Repeater.this);
((ContainerDefinition)definition).createWidgets(this);
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RepeaterAction.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RepeaterAction.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RepeaterAction.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
*
* @see RepeaterActionDefinitionBuilder
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: RepeaterAction.java,v 1.4 2004/05/07 16:43:42 mpo Exp $
+ * @version CVS $Id$
*/
public class RepeaterAction extends Action {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RepeaterActionDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RepeaterActionDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RepeaterActionDefinition.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
*
* @see RepeaterActionDefinitionBuilder
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: RepeaterActionDefinition.java,v 1.1 2004/03/09 10:33:50
reinhard Exp $
+ * @version CVS $Id$
*/
public abstract class RepeaterActionDefinition extends ActionDefinition {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RepeaterDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RepeaterDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RepeaterDefinition.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* The [EMAIL PROTECTED] WidgetDefinition} part of a Repeater widget, see
[EMAIL PROTECTED] Repeater} for more information.
*
- * @version $Id: RepeaterDefinition.java,v 1.1 2004/03/09 10:33:50 reinhard
Exp $
+ * @version $Id$
*/
public class RepeaterDefinition extends AbstractContainerDefinition {
private int initialSize = 0;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RowAction.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RowAction.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/RowAction.java
Thu Nov 4 02:12:30 2004
@@ -23,7 +23,7 @@
/**
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: RowAction.java,v 1.1 2004/03/09 10:33:50 reinhard Exp $
+ * @version CVS $Id$
*/
public class RowAction extends Action {
public RowAction(RowActionDefinition definition) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/SelectableWidget.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/SelectableWidget.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/SelectableWidget.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
import org.apache.cocoon.forms.datatype.SelectionList;
/**
- * @version $Id: SelectableWidget.java,v 1.1 2004/03/09 10:33:50 reinhard Exp $
+ * @version $Id$
*
*/
public interface SelectableWidget extends Widget {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/StructDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/StructDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/StructDefinition.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* The [EMAIL PROTECTED] WidgetDefinition} corresponding to a [EMAIL
PROTECTED] Struct} widget.
*
- * @version $Id: StructDefinition.java,v 1.2 2004/04/12 14:05:09 tim Exp $
+ * @version $Id$
*/
public class StructDefinition extends AbstractContainerDefinition {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Submit.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Submit.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Submit.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
*
* @see SubmitDefinitionBuilder
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: Submit.java,v 1.2 2004/04/09 16:43:21 mpo Exp $
+ * @version CVS $Id$
*/
public class Submit extends Action {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/SubmitDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/SubmitDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/SubmitDefinition.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
*
* @see SubmitDefinitionBuilder
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: SubmitDefinition.java,v 1.1 2004/03/09 10:33:50 reinhard
Exp $
+ * @version CVS $Id$
*/
public class SubmitDefinition extends ActionDefinition {
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
Thu Nov 4 02:12:30 2004
@@ -16,6 +16,7 @@
package org.apache.cocoon.forms.formmodel;
import org.apache.cocoon.forms.FormContext;
+import org.apache.cocoon.forms.event.*;
/**
* A discriminated union that references a discriminant value in another
@@ -48,20 +49,25 @@
return definition;
}
- // TODO: This whole union mess is too dependent on undefined sequences of
execution.
- // These need to be ordered into a contract of sequences.
-
- public void setParent(Widget widget) {
- super.setParent(widget);
- resolve();
- }
-
- // TODO: The "resolve" step currently expands each "New" into the list of
widgets in the corresponding "Class".
- // "resolve" should be changed to "expand", and a new step, "resolve"
should be introduced which patches up any
- // *widget* (not definition) references after the expansion has put all of
the widgets in place.
- public void resolve() {
+ /**
+ * Called after widget's environment has been setup,
+ * to allow for any contextual initalization such as
+ * looking up case widgets for union widgets.
+ */
+ public void initialize() {
String caseWidgetId = definition.getCaseWidgetId();
- caseWidget = ((ContainerWidget)getParent()).getChild(caseWidgetId);
+ this.caseWidget = getParent().lookupWidget(caseWidgetId);
+ if(this.caseWidget == null) {
+ throw new RuntimeException("Could not find case widget \""
+ + caseWidgetId + "\" for union \"" + getId() + "\" at " +
getLocation());
+ }
+ ((ValueChangedListenerEnabled)caseWidget).addValueChangedListener(
+ new ValueChangedListener() {
+ public void valueChanged(ValueChangedEvent event) {
+ Union.this.caseValue = (String)event.getNewValue();
+ }
+ }
+ );
}
/**
@@ -72,7 +78,7 @@
}
public Object getValue() {
- return caseWidget.getValue();
+ return this.caseWidget.getValue();
}
public void readFromRequest(FormContext formContext) {
@@ -80,18 +86,18 @@
return;
// Ensure the case widget has read its value
- caseWidget.readFromRequest(formContext);
+ this.caseWidget.readFromRequest(formContext);
Widget widget;
// Read current case from request
String newValue = (String)getValue();
if (newValue != null && !newValue.equals("")) {
- if (getForm().getSubmitWidget() == caseWidget &&
!newValue.equals(caseValue)) {
+ if (getForm().getSubmitWidget() == this.caseWidget &&
!newValue.equals(this.caseValue)) {
// If submitted by the case widget and its value has changed,
read the values
- // for the previous case values. This allows to keep any
entered values
+ // for the previous case value. This allows to keep any
already entered values
// despite the case change.
- widget = getChild(caseValue);
+ widget = getChild(this.caseValue);
} else {
// Get the corresponding widget (will create it if needed)
widget = getChild(newValue);
@@ -101,7 +107,7 @@
widget.readFromRequest(formContext);
}
}
- caseValue = newValue;
+ this.caseValue = newValue;
}
// TODO: Simplify this logic.
@@ -120,8 +126,12 @@
}
public Widget getChild(String id) {
- if (!widgets.hasWidget(id) &&
((ContainerDefinition)definition).hasWidget(id))
+ if (!widgets.hasWidget(id) &&
((ContainerDefinition)definition).hasWidget(id)) {
((ContainerDefinition)definition).createWidget(this, id);
+ Widget child = super.getChild(id);
+ child.initialize();
+ return child;
+ }
return super.getChild(id);
}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/UnionDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/UnionDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/UnionDefinition.java
Thu Nov 4 02:12:30 2004
@@ -19,7 +19,7 @@
/**
* The [EMAIL PROTECTED] WidgetDefinition} corresponding to a [EMAIL
PROTECTED] Union} widget.
*
- * @version $Id: UnionDefinition.java,v 1.2 2004/04/12 14:05:09 tim Exp $
+ * @version $Id$
*/
public class UnionDefinition extends AbstractContainerDefinition {
private String caseWidgetId;
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
Thu Nov 4 02:12:30 2004
@@ -38,6 +38,11 @@
* @version CVS $Id$
*/
public class Upload extends AbstractWidget implements ValidationErrorAware {
+
+ private static final String UPLOAD_EL = "upload";
+ private static final String VALUE_EL = "value";
+ private static final String VALIDATION_MSG_EL = "validation-message";
+
private final UploadDefinition uploadDefinition;
private Part part;
private ValidationError validationError;
@@ -144,10 +149,6 @@
public void setValidationError(ValidationError error) {
this.validationError = error;
}
-
- private static final String UPLOAD_EL = "upload";
- private static final String VALUE_EL = "value";
- private static final String VALIDATION_MSG_EL = "validation-message";
/**
* @return "upload"
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/UploadDefinition.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/UploadDefinition.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/UploadDefinition.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Upayavira</a>
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: UploadDefinition.java,v 1.1 2004/03/09 10:33:50 reinhard
Exp $
+ * @version CVS $Id$
*/
public class UploadDefinition extends AbstractWidgetDefinition {
private boolean required;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Widget.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Widget.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Widget.java
Thu Nov 4 02:12:30 2004
@@ -60,6 +60,13 @@
public static final char PATH_SEPARATOR = '/';
/**
+ * Called after widget's environment has been setup,
+ * to allow for any contextual initalization such as
+ * looking up case widgets for union widgets.
+ */
+ public void initialize();
+
+ /**
* @return the source location of this widget.
*/
public String getLocation();
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionBuilder.java
Thu Nov 4 02:12:30 2004
@@ -23,10 +23,10 @@
* <p>These builder classes should be thread safe, only a single instance of
them
* will be created.
*
- * <p>Implementations may implement Avalon's Composable interface to gain
access
+ * <p>Implementations may implement Avalon's Serviceable interface to gain
access
* to other components.
*
- * @version CVS $Id: WidgetDefinitionBuilder.java,v 1.1 2004/03/09 10:33:50
reinhard Exp $
+ * @version CVS $Id$
*/
public interface WidgetDefinitionBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetList.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetList.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetList.java
Thu Nov 4 02:12:30 2004
@@ -33,7 +33,7 @@
* This implements a type-aware List of Widgets that automatically can
distribute
* the common Widget operations over the contained Widgets.
*
- * @version $Id: WidgetList.java,v 1.2 2004/04/28 16:34:12 bruno Exp $
+ * @version $Id$
*/
public class WidgetList {
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
Thu Nov 4 02:12:30 2004
@@ -127,4 +127,4 @@
// return iterator(WidgetState.class);
// }
-}
\ No newline at end of file
+}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/generation/FormsGenerator.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/generation/FormsGenerator.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/generation/FormsGenerator.java
Thu Nov 4 02:12:30 2004
@@ -43,7 +43,7 @@
* <li> Or else at its default-location in the flow context-object.</li>
* </ol>
*
- * @version $Id: FormsGenerator.java,v 1.6 2004/04/09 16:26:04 mpo Exp $
+ * @version $Id$
*/
public class FormsGenerator extends AbstractGenerator {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java
Thu Nov 4 02:12:30 2004
@@ -104,18 +104,14 @@
* @param currentWidget
* @param id
*/
- public Widget getWidget(Widget currentWidget, String id) {
- Widget result = null;
-
- if (currentWidget instanceof ContainerWidget) {
- result = ((ContainerWidget)currentWidget).getChild(id);
- }
+ public Widget getWidget(Widget currentWidget, String path) {
+ Widget result = currentWidget.lookupWidget(path);
if (result != null) {
return result;
} else {
throw new IllegalArgumentException("Widget '" + currentWidget +
- "' has no child named '" + id +
"'");
+ "' has no child named '" + path
+ "'");
}
}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/generation/jx-macros.xml
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/generation/jx-macros.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/generation/jx-macros.xml
Thu Nov 4 02:12:30 2004
@@ -1,12 +1,12 @@
<!-- An implementation of the CForms template engine as a JXTemplate tag
library -->
-
+
<jx:template xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance";>
<!--
ft:form-template
-->
- <jx:macro name="form-template"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
- <jx:set var="cformsHelper"
value="${Packages.org.apache.cocoon.forms.generation.JXMacrosHelper.createHelper(cocoon.consumer)}"/>
+ <jx:macro name="form-template"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
+ <jx:set var="cformsHelper"
value="${Packages.org.apache.cocoon.forms.generation.JXMacrosHelper.createHelper(cocoon.consumer)}"/>
<jx:set var="form" value="${CocoonFormsInstance}"/>
<jx:if test="${cformsHelper.isVisible(form)}">
<jx:set var="cformsDummy" value="${cformsHelper.startForm(form,
macro.arguments)}"/>
@@ -15,13 +15,13 @@
<jx:evalBody/>
<jx:set var="cformsDummy" value="${cformsHelper.endForm()}"/>
</jx:if>
- </jx:macro>
-
+ </jx:macro>
+
<!--
ft:widget
-->
- <jx:macro name="widget"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
- <jx:parameter name="id"/>
+ <jx:macro name="widget"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
+ <jx:parameter name="id"/>
<jx:set var="widget" value="${cformsHelper.getWidget(widget, id)}"/>
<jx:if test="${cformsHelper.isVisible(widget)}">
@@ -30,41 +30,41 @@
<jx:set var="cformsDummy" value="${cformsHelper.flushRoot(widget)}"/>
</jx:if>
</jx:macro>
-
+
<!--
ft:repeater-widget-label
-->
- <jx:macro name="repeater-widget-label"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
- <jx:parameter name="id"/>
- <jx:parameter name="widget-id"/>
-
- <jx:set var="cformsDummy"
value="${cformsHelper.generateRepeaterWidgetLabel(widget, id,
this['widget-id'])}"/>
- </jx:macro>
-
+ <jx:macro name="repeater-widget-label"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
+ <jx:parameter name="id"/>
+ <jx:parameter name="widget-id"/>
+
+ <jx:set var="cformsDummy"
value="${cformsHelper.generateRepeaterWidgetLabel(widget, id,
this['widget-id'])}"/>
+ </jx:macro>
+
<!--
ft:widget-label
-->
- <jx:macro name="widget-label"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
- <jx:parameter name="id"/>
+ <jx:macro name="widget-label"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
+ <jx:parameter name="id"/>
- <jx:set var="cformsDummy"
value="${cformsHelper.generateWidgetLabel(widget, id)}"/>
- </jx:macro>
-
+ <jx:set var="cformsDummy"
value="${cformsHelper.generateWidgetLabel(widget, id)}"/>
+ </jx:macro>
+
<!--
ft:repeater-size
-->
- <jx:macro name="repeater-size"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
- <jx:parameter name="id"/>
+ <jx:macro name="repeater-size"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
+ <jx:parameter name="id"/>
- <jx:set var="cformsDummy"
value="${cformsHelper.generateRepeaterSize(widget, id)}"/>
- </jx:macro>
-
+ <jx:set var="cformsDummy"
value="${cformsHelper.generateRepeaterSize(widget, id)}"/>
+ </jx:macro>
+
<!--
ft:repeater-widget
-->
- <jx:macro name="repeater-widget"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
- <jx:parameter name="id"/>
-
+ <jx:macro name="repeater-widget"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
+ <jx:parameter name="id"/>
+
<jx:set var="repeater" value="${cformsHelper.getRepeater(widget, id)}"/>
<jx:if test="${cformsHelper.isVisible(repeater)}">
<jx:forEach varStatus="repeaterLoop" begin="0"
end="${repeater.getSize() - 1}">
@@ -74,14 +74,14 @@
</jx:if>
</jx:forEach>
</jx:if>
- </jx:macro>
-
+ </jx:macro>
+
<!--
ft:continuation-id
-->
- <jx:macro name="continuation-id"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
- <fi:continuation-id>${cocoon.continuation.id}</fi:continuation-id>
- </jx:macro>
+ <jx:macro name="continuation-id"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
+ <fi:continuation-id>${cocoon.continuation.id}</fi:continuation-id>
+ </jx:macro>
<!--
ft:class
@@ -89,7 +89,7 @@
<jx:macro name="class"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
<jx:parameter name="id"/>
- <jx:set var="cformsDummy" value="${cformsHelper.defineClassBody(form,
id, macro.body)}"/>
+ <jx:set var="cformsDummy" value="${cformsHelper.defineClassBody(form,
id, macro.body)}"/>
</jx:macro>
<!--
@@ -104,8 +104,8 @@
<!--
ft:struct : just increase the nesting level
-->
- <jx:macro name="struct"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
- <jx:parameter name="id"/>
+ <jx:macro name="struct"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
+ <jx:parameter name="id"/>
<jx:set var="widget" value="${cformsHelper.getWidget(widget, id)}"/>
<jx:if test="${cformsHelper.isVisible(widget)}">
@@ -120,7 +120,7 @@
-->
<jx:macro name="union"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
<jx:parameter name="id"/>
-
+
<jx:set var="widget" value="${cformsHelper.getWidget(widget, id)}"/>
<jx:if test="${cformsHelper.isVisible(widget)}">
<fi:union id="${widget.getRequestParameterName()}">
@@ -136,7 +136,7 @@
<jx:parameter name="id"/>
<jx:if test="${cformsHelper.isSelectedCase(widget, id)}">
- <jx:set widget="${cformsHelper.getWidget(widget, id)}"/>
+ <jx:set widget="${cformsHelper.getWidget(widget, id)}"/>
<jx:evalBody/>
</jx:if>
</jx:macro>
@@ -150,9 +150,11 @@
<jx:set var="widget" value="${cformsHelper.getWidget(widget, id)}"/>
<jx:set var="validationError" value="${widget.getValidationError()}"/>
<jx:if test="${validationError != null}">
- <jx:set var="cformsDummy"
value="${cformsHelper.generateValidationError(validationError)}"/>
- <jx:evalBody/>
- <jx:set var="cformsDummy"
value="${cformsHelper.flushRoot(validationError)}"/>
+ <fi:validation-error>
+ <jx:set var="cformsDummy"
value="${cformsHelper.generateValidationError(validationError)}"/>
+ <jx:evalBody/>
+ <jx:set var="cformsDummy"
value="${cformsHelper.flushRoot(validationError)}"/>
+ </fi:validation-error>
</jx:if>
</jx:macro>
@@ -160,8 +162,8 @@
<!--
ft:aggregate-widget
-->
- <jx:macro name="aggregate-widget"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
- <jx:parameter name="id"/>
+ <jx:macro name="aggregate-widget"
targetNamespace="http://apache.org/cocoon/forms/1.0#template";>
+ <jx:parameter name="id"/>
<jx:set var="widget" value="${cformsHelper.getWidget(widget, id)}"/>
<jx:if test="${cformsHelper.isVisible(widget)}">
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Contact.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Contact.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Contact.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* Contact belongs to the [EMAIL PROTECTED] Form2Bean} demo.
*
- * @version $Id: Contact.java,v 1.1 2004/03/09 10:34:08 reinhard Exp $
+ * @version $Id$
*/
public class Contact {
private long id;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Form1Handler.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Form1Handler.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Form1Handler.java
Thu Nov 4 02:12:30 2004
@@ -23,7 +23,7 @@
* Example FormHandler for the "Form1" sample form.
* This implementation currently doesn't do anything interesting.
*
- * @version $Id: Form1Handler.java,v 1.1 2004/03/09 10:34:08 reinhard Exp $
+ * @version $Id$
*/
public class Form1Handler extends AbstractFormHandler {
public void handleActionEvent(ActionEvent actionEvent) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Form2Bean.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Form2Bean.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Form2Bean.java
Thu Nov 4 02:12:30 2004
@@ -22,7 +22,7 @@
/**
* Sample bean used in the form2 binding demo.
*
- * @version $Id: Form2Bean.java,v 1.1 2004/03/09 10:34:08 reinhard Exp $
+ * @version $Id$
*/
public class Form2Bean {
private String email;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/InitForm1Action.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/InitForm1Action.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/InitForm1Action.java
Thu Nov 4 02:12:30 2004
@@ -34,7 +34,7 @@
* meant to illustrate how you can prepopulate a Form instance before its
* initial display.
*
- * @version $Id: InitForm1Action.java,v 1.4 2004/05/07 16:43:43 mpo Exp $
+ * @version $Id$
*/
public class InitForm1Action extends AbstractFormsAction {
public Map act(Redirector redirector, SourceResolver resolver, Map
objectModel, String source, Parameters parameters)
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Sex.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Sex.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/Sex.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* Description of Sex.
- * @version CVS $Id: Sex.java,v 1.1 2004/03/09 10:34:08 reinhard Exp $
+ * @version CVS $Id$
*/
public class Sex {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/LenientBaseBean.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/LenientBaseBean.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/LenientBaseBean.java
Thu Nov 4 02:12:30 2004
@@ -19,7 +19,7 @@
/**
* LenientBaseBean
* @author Marc Portier
- * @version $Id: LenientBaseBean.java,v 1.1 2004/03/09 10:34:08 reinhard Exp $
+ * @version $Id$
*/
public class LenientBaseBean {
protected String breakingField;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/LenientNotOKBean.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/LenientNotOKBean.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/LenientNotOKBean.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* LenientNotOKBean
* @author Marc Portier
- * @version $Id: LenientNotOKBean.java,v 1.1 2004/03/09 10:34:08 reinhard Exp $
+ * @version $Id$
*/
public class LenientNotOKBean extends LenientBaseBean{
public LenientNotOKBean(String initVal) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/LenientOKBean.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/LenientOKBean.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/LenientOKBean.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* LenientOKBean
* @author Marc Portier
- * @version $Id: LenientOKBean.java,v 1.1 2004/03/09 10:34:08 reinhard Exp $
+ * @version $Id$
*/
public class LenientOKBean extends LenientBaseBean{
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/ValuesBean.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/ValuesBean.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/bindings/ValuesBean.java
Thu Nov 4 02:12:30 2004
@@ -18,7 +18,7 @@
/**
* ValuesBean used in the 01values test.
* @author Marc Portier
- * @version $Id: ValuesBean.java,v 1.1 2004/03/09 10:34:08 reinhard Exp $
+ * @version $Id$
*/
public class ValuesBean {
private String simple = "Simple";
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/Team.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/Team.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/Team.java
Thu Nov 4 02:12:30 2004
@@ -54,4 +54,4 @@
}
return null;
}
-}
\ No newline at end of file
+}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java
Thu Nov 4 02:12:30 2004
@@ -78,4 +78,4 @@
return result;
}
-}
\ No newline at end of file
+}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectPipe.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectPipe.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectPipe.java
Thu Nov 4 02:12:30 2004
@@ -33,7 +33,7 @@
* Base class for XMLPipe's. Allows the structure of the source code of
* the XMLPipe to match the structure of the data being transformed.
*
- * @version $Id: EffectPipe.java,v 1.8 2004/04/29 08:46:19 cziegeler Exp $
+ * @version $Id$
*/
public class EffectPipe extends AbstractXMLPipe {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java
Thu Nov 4 02:12:30 2004
@@ -19,7 +19,6 @@
import org.apache.cocoon.forms.Constants;
import org.apache.cocoon.forms.formmodel.AggregateField;
import org.apache.cocoon.forms.formmodel.ContainerWidget;
-import org.apache.cocoon.forms.formmodel.DataWidget;
import org.apache.cocoon.forms.formmodel.Repeater;
import org.apache.cocoon.forms.formmodel.Struct;
import org.apache.cocoon.forms.formmodel.Union;
@@ -89,14 +88,11 @@
protected Widget contextWidget;
protected LinkedList contextWidgets;
- protected LinkedList chooseWidgets;
protected String widgetPath;
protected Widget widget;
protected Map classes;
private final AggregateWidgetHandler aggregateWidgetHandler = new
AggregateWidgetHandler();
- private final ChooseHandler chooseHandler = new
ChooseHandler();
- private final ChoosePassThruHandler choosePassThruHandler = new
ChoosePassThruHandler();
private final ClassHandler classHandler = new
ClassHandler();
private final ContinuationIdHandler continuationIdHandler = new
ContinuationIdHandler();
private final DocHandler docHandler = new
DocHandler();
@@ -136,7 +132,6 @@
public EffectWidgetReplacingPipe() {
// Setup map of templates.
templates.put(AGGREGATE_WIDGET, aggregateWidgetHandler);
- templates.put(CHOOSE, chooseHandler);
templates.put(CLASS, classHandler);
templates.put(CONTINUATION_ID, continuationIdHandler);
templates.put(NEW, newHandler);
@@ -163,7 +158,6 @@
// Initialize widget related variables
contextWidgets = new LinkedList();
- chooseWidgets = new LinkedList();
classes = new HashMap();
}
@@ -175,14 +169,6 @@
return widgetId;
}
- protected String getWidgetPath(Attributes attributes) throws SAXException {
- String widgetPath = attributes.getValue("path");
- if (widgetPath == null || widgetPath.equals("")) {
- throwSAXException("Missing required widget \"path\" attribute.");
- }
- return widgetPath;
- }
-
protected Widget getWidget(String widgetPath) throws SAXException {
Widget widget =
((ContainerWidget)contextWidget).lookupWidget(widgetPath);
if (widget == null) {
@@ -534,6 +520,7 @@
if (!(widget instanceof AggregateField)) {
throwWrongWidgetType("AggregateWidgetHandler", input.loc,
"aggregate");
}
+
if (isVisible(widget)) {
contextWidgets.addFirst(contextWidget);
contextWidget = widget;
@@ -565,13 +552,19 @@
if (isVisible(widget)) {
contextWidgets.addFirst(contextWidget);
contextWidget = widget;
- return this;
+ //Don't output fi:struct
+ // out.element(Constants.INSTANCE_PREFIX,
Constants.INSTANCE_NS, "union");
+ // out.attributes();
+ // out.startElement();
+ return this;
} else {
return nullHandler;
}
case EVENT_ELEMENT:
return nestedTemplate();
case EVENT_END_ELEMENT:
+ // don't output fi:struct
+ // out.endElement();
contextWidget = (Widget)contextWidgets.removeFirst();
return this;
default:
@@ -581,80 +574,6 @@
}
}
- protected class ChooseHandler extends Handler {
- public Handler process() throws SAXException {
- switch(event) {
- case EVENT_START_ELEMENT:
- widgetPath = getWidgetPath(input.attrs);
- widget = getWidget(widgetPath);
- // TODO: Should instead check for datatype convertable to
String.
- if (!(widget instanceof DataWidget)) {
- throwWrongWidgetType("ChooseHandler", input.loc,
"DataWidget");
- }
- contextWidgets.addFirst(contextWidget);
- // Choose does not change the context widget like Union does:
- // contextWidget = widget;
- chooseWidgets.addFirst(widget);
- return this;
- case EVENT_ELEMENT:
- if (Constants.TEMPLATE_NS.equals(input.uri)) {
- if ("when".equals(input.loc)) {
- String testValue = input.attrs.getValue("value");
- if (testValue == null) throwSAXException("Element
\"when\" missing required \"value\" attribute.");
- String value =
(String)((Widget)chooseWidgets.get(0)).getValue();
- if (testValue.equals(value)) {
- return skipHandler;
- } else {
- return nullHandler;
- }
- } else if (FORM_TEMPLATE_EL.equals(input.loc)) {
- throwSAXException("Element \"form-template\" must not
be nested.");
- } else {
- throwSAXException("Unrecognized template: " +
input.loc);
- }
- } else {
- return choosePassThruHandler;
- }
- case EVENT_END_ELEMENT:
- chooseWidgets.removeFirst();
- contextWidget = (Widget)contextWidgets.removeFirst();
- return this;
- default:
- out.copy();
- return this;
- }
- }
- }
-
- protected class ChoosePassThruHandler extends Handler {
- public Handler process() throws SAXException {
- switch(event) {
- case EVENT_ELEMENT:
- if (Constants.TEMPLATE_NS.equals(input.uri)) {
- if ("when".equals(input.loc)) {
- String testValue = input.attrs.getValue("value");
- if (testValue == null) throwSAXException("Element
\"when\" missing required \"value\" attribute.");
- String value =
(String)((Widget)chooseWidgets.get(0)).getValue();
- if (testValue.equals(value)) {
- return skipHandler;
- } else {
- return nullHandler;
- }
- } else if (FORM_TEMPLATE_EL.equals(input.loc)) {
- throwSAXException("Element \"form-template\" must not
be nested.");
- } else {
- throwSAXException("Unrecognized template: " +
input.loc);
- }
- } else {
- return this;
- }
- default:
- out.copy();
- return this;
- }
- }
- }
-
protected class UnionHandler extends Handler {
public Handler process() throws SAXException {
switch(event) {
@@ -667,6 +586,9 @@
if (isVisible(widget)) {
contextWidgets.addFirst(contextWidget);
contextWidget = widget;
+ // Don't output fi:union
+ //out.element(Constants.INSTANCE_PREFIX,
Constants.INSTANCE_NS, "union");
+ //out.startElement();
return this;
} else {
return nullHandler;
@@ -691,6 +613,8 @@
return unionPassThruHandler;
}
case EVENT_END_ELEMENT:
+ // don't output fi:union
+ //out.endElement();
contextWidget = (Widget)contextWidgets.removeFirst();
return this;
default:
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsPipelineConfig.java
Thu Nov 4 02:12:30 2004
@@ -36,7 +36,7 @@
import org.xml.sax.SAXException;
/**
- * @version CVS $Id: FormsPipelineConfig.java,v 1.4 2004/04/09 16:25:18 mpo
Exp $
+ * @version CVS $Id$
*/
public class FormsPipelineConfig {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsTemplateTransformer.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsTemplateTransformer.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/FormsTemplateTransformer.java
Thu Nov 4 02:12:30 2004
@@ -29,7 +29,7 @@
/**
* See description of [EMAIL PROTECTED] WidgetReplacingPipe}.
*
- * @version CVS $Id: FormsTemplateTransformer.java,v 1.3 2004/03/18 21:04:39
joerg Exp $
+ * @version CVS $Id$
*/
public class FormsTemplateTransformer extends EffectWidgetReplacingPipe
implements Transformer {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/WidgetReplacingPipe.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/WidgetReplacingPipe.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/WidgetReplacingPipe.java
Thu Nov 4 02:12:30 2004
@@ -44,7 +44,7 @@
* <p>For more information about the supported tags and their function, see
the user documentation
* for the forms template transformer.</p>
*
- * @version CVS $Id: WidgetReplacingPipe.java,v 1.8 2004/05/07 16:43:43 mpo
Exp $
+ * @version CVS $Id$
*/
public class WidgetReplacingPipe extends AbstractXMLPipe {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/DomHelper.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/DomHelper.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/DomHelper.java
Thu Nov 4 02:12:30 2004
@@ -51,7 +51,7 @@
* able to provide information about the location of elements in their source
* XML file. See the [EMAIL PROTECTED] #getLocation(Element)} method.
*
- * @version CVS $Id: DomHelper.java,v 1.4 2004/03/28 21:29:37 antonio Exp $
+ * @version CVS $Id$
*/
public class DomHelper {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/I18nMessage.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/I18nMessage.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/I18nMessage.java
Thu Nov 4 02:12:30 2004
@@ -30,7 +30,7 @@
* <p>This generates an autonomous SAX-blurb, i.e. all necessary namespace
* declarations will be made, and no start/endDocument events will be
generated.
*
- * @version CVS $Id: I18nMessage.java,v 1.2 2004/03/09 13:17:27 cziegeler Exp $
+ * @version CVS $Id$
*/
public class I18nMessage implements XMLizable {
private String key;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/JavaScriptHelper.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/JavaScriptHelper.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/JavaScriptHelper.java
Thu Nov 4 02:12:30 2004
@@ -35,7 +35,7 @@
* such as event listeners and bindings.
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: JavaScriptHelper.java,v 1.4 2004/04/29 08:46:19 cziegeler
Exp $
+ * @version CVS $Id$
*/
public class JavaScriptHelper {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/StringMessage.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/StringMessage.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/StringMessage.java
Thu Nov 4 02:12:30 2004
@@ -24,7 +24,7 @@
*
* Will produce exactly one characters call, no start/endDocument calls.
*
- * @version $Id: StringMessage.java,v 1.1 2004/03/09 10:34:09 reinhard Exp $
+ * @version $Id$
*/
public class StringMessage implements XMLizable {
private char[] ch;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/XMLAdapter.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/XMLAdapter.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/util/XMLAdapter.java
Thu Nov 4 02:12:30 2004
@@ -56,7 +56,7 @@
* the single value rather than the fields as XML. For population of the
* form both forms are however allowed.
*
- * @version CVS $Id: XMLAdapter.java 30941 2004-07-29 19:56:58Z vgritsenko $
+ * @version CVS $Id$
*/
public class XMLAdapter extends AbstractXMLConsumer implements XMLizable {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/ValidationError.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/ValidationError.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/ValidationError.java
Thu Nov 4 02:12:30 2004
@@ -26,7 +26,7 @@
* be a simple string or a piece of XML.
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: ValidationError.java,v 1.1 2004/03/09 10:34:09 reinhard
Exp $
+ * @version CVS $Id$
*/
public class ValidationError {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/ValidationErrorAware.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/ValidationErrorAware.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/ValidationErrorAware.java
Thu Nov 4 02:12:30 2004
@@ -20,7 +20,7 @@
* can hold a validation error.
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: ValidationErrorAware.java,v 1.2 2004/03/09 11:31:10 joerg
Exp $
+ * @version CVS $Id$
*/
public interface ValidationErrorAware {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/WidgetValidator.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/WidgetValidator.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/WidgetValidator.java
Thu Nov 4 02:12:30 2004
@@ -35,7 +35,7 @@
* traversal of the widget tree).
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: WidgetValidator.java,v 1.4 2004/04/29 08:46:19 cziegeler
Exp $
+ * @version CVS $Id$
*/
public interface WidgetValidator {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/WidgetValidatorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/WidgetValidatorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/WidgetValidatorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -21,7 +21,7 @@
/**
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: WidgetValidatorBuilder.java,v 1.1 2004/03/09 10:34:09
reinhard Exp $
+ * @version CVS $Id$
*/
public interface WidgetValidatorBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/AssertValidatorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/AssertValidatorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/AssertValidatorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* Adapter for [EMAIL PROTECTED]
org.apache.cocoon.forms.datatype.validationruleimpl.AssertValidationRuleBuilder}
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: AssertValidatorBuilder.java,v 1.2 2004/03/09 11:31:11
joerg Exp $
+ * @version CVS $Id$
*/
public class AssertValidatorBuilder extends AssertValidationRuleBuilder
implements WidgetValidatorBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/EmailValidatorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/EmailValidatorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/EmailValidatorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* Adapter for [EMAIL PROTECTED]
org.apache.cocoon.forms.datatype.validationruleimpl.EmailValidationRuleBuilder}
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: EmailValidatorBuilder.java,v 1.2 2004/03/09 11:31:11
joerg Exp $
+ * @version CVS $Id$
*/
public class EmailValidatorBuilder extends EmailValidationRuleBuilder
implements WidgetValidatorBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/JavaScriptValidator.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/JavaScriptValidator.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/JavaScriptValidator.java
Thu Nov 4 02:12:30 2004
@@ -34,7 +34,7 @@
* flowscript, can use the flow's global values and fonctions and the
<code>cocoon</code> object.
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: JavaScriptValidator.java,v 1.4 2004/04/28 16:34:13 bruno
Exp $
+ * @version CVS $Id$
*/
public class JavaScriptValidator implements WidgetValidator {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/JavaScriptValidatorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/JavaScriptValidatorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/JavaScriptValidatorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -31,7 +31,7 @@
*
* @see org.apache.cocoon.forms.validation.impl.JavaScriptValidator
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: JavaScriptValidatorBuilder.java,v 1.2 2004/03/09 11:31:11
joerg Exp $
+ * @version CVS $Id$
*/
public class JavaScriptValidatorBuilder implements WidgetValidatorBuilder,
Contextualizable, ThreadSafe {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/LengthValidatorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/LengthValidatorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/LengthValidatorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* Adapter for [EMAIL PROTECTED]
org.apache.cocoon.forms.datatype.validationruleimpl.LengthValidationRuleBuilder}
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: LengthValidatorBuilder.java,v 1.2 2004/03/09 11:31:11
joerg Exp $
+ * @version CVS $Id$
*/
public class LengthValidatorBuilder extends LengthValidationRuleBuilder
implements WidgetValidatorBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/Mod10ValidatorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/Mod10ValidatorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/Mod10ValidatorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* Adapter for [EMAIL PROTECTED]
org.apache.cocoon.forms.datatype.validationruleimpl.Mod10ValidationRuleBuilder}
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: Mod10ValidatorBuilder.java,v 1.2 2004/03/09 11:31:11
joerg Exp $
+ * @version CVS $Id$
*/
public class Mod10ValidatorBuilder extends Mod10ValidationRuleBuilder
implements WidgetValidatorBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/RangeValidatorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/RangeValidatorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/RangeValidatorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* Adapter for [EMAIL PROTECTED]
org.apache.cocoon.forms.datatype.validationruleimpl.RangeValidationRuleBuilder}
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: RangeValidatorBuilder.java,v 1.2 2004/03/09 11:31:11
joerg Exp $
+ * @version CVS $Id$
*/
public class RangeValidatorBuilder extends RangeValidationRuleBuilder
implements WidgetValidatorBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/RegExpValidatorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/RegExpValidatorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/RegExpValidatorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* Adapter for [EMAIL PROTECTED]
org.apache.cocoon.forms.datatype.validationruleimpl.RegExpValidationRuleBuilder}
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: RegExpValidatorBuilder.java,v 1.2 2004/03/09 11:31:11
joerg Exp $
+ * @version CVS $Id$
*/
public class RegExpValidatorBuilder extends RegExpValidationRuleBuilder
implements WidgetValidatorBuilder {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/ValidationRuleValidator.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/ValidationRuleValidator.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/ValidationRuleValidator.java
Thu Nov 4 02:12:30 2004
@@ -27,7 +27,7 @@
* [EMAIL PROTECTED] org.apache.cocoon.forms.validation.WidgetValidator}.
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: ValidationRuleValidator.java,v 1.4 2004/05/07 13:42:09
mpo Exp $
+ * @version CVS $Id$
*/
public class ValidationRuleValidator implements WidgetValidator {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/ValueCountValidatorBuilder.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/ValueCountValidatorBuilder.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/validation/impl/ValueCountValidatorBuilder.java
Thu Nov 4 02:12:30 2004
@@ -25,7 +25,7 @@
* Adapter for [EMAIL PROTECTED]
org.apache.cocoon.forms.datatype.validationruleimpl.ValueCountValidationRuleBuilder}
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
- * @version CVS $Id: ValueCountValidatorBuilder.java,v 1.2 2004/03/09 11:31:11
joerg Exp $
+ * @version CVS $Id$
*/
public class ValueCountValidatorBuilder extends
ValueCountValidationRuleBuilder implements WidgetValidatorBuilder {
