mpo 2004/04/01 04:59:57
Modified: src/blocks/forms/java/org/apache/cocoon/forms/binding
JXPathBindingBuilderBase.java
DeleteNodeJXPathBindingBuilder.java
MultiValueJXPathBindingBuilder.java
SetAttributeJXPathBindingBuilder.java
NewJXPathBindingBuilder.java
SimpleRepeaterJXPathBindingBuilder.java
ContextJXPathBindingBuilder.java
ValueJXPathBindingBuilder.java
RepeaterJXPathBindingBuilder.java
UnionJXPathBindingBuilder.java
TempRepeaterJXPathBindingBuilder.java
StructJXPathBindingBuilder.java
InsertBeanJXPathBindingBuilder.java
InsertBeanJXPathBinding.java
InsertNodeJXPathBindingBuilder.java
Log:
Javadoc cleanup
- mainly switching wb to fb to sync with the Woody -> Cocoon Forms change
- some clarifications and corrections
- some mental notes (//TODO flags)
Revision Changes Path
1.3 +5 -3
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBuilderBase.java
Index: JXPathBindingBuilderBase.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/JXPathBindingBuilderBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JXPathBindingBuilderBase.java 9 Mar 2004 11:31:12 -0000 1.2
+++ JXPathBindingBuilderBase.java 1 Apr 2004 12:59:57 -0000 1.3
@@ -25,9 +25,11 @@
* common configuration settings on all specific implementations of
* [EMAIL PROTECTED] org.apache.cocoon.forms.binding.JXPathBindingBase}.
*
- * Common supported configurations:
+ * Common supported configurations: [EMAIL PROTECTED]
#getCommonAttributes(Element)}
* <ul>
- * <li>Attribute direction="load|save|both": [EMAIL PROTECTED]
#getCommonAttributes(Element)}</li>
+ * <li>Attribute direction="load|save|both": defaults to 'both'</li>
+ * <li>Attribute lenient="true|false|[undefined]": defaults to [undefined]
+ * which means: "continue in same leniency-mode as parent" </li>
* </ul>
*
* @version CVS $Id$
1.2 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/DeleteNodeJXPathBindingBuilder.java
Index: DeleteNodeJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/DeleteNodeJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeleteNodeJXPathBindingBuilder.java 9 Mar 2004 10:33:55 -0000
1.1
+++ DeleteNodeJXPathBindingBuilder.java 1 Apr 2004 12:59:57 -0000
1.2
@@ -24,7 +24,7 @@
* actual [EMAIL PROTECTED] DeleteNodeJXPathBinding} out of the
configuration in the
* provided configElement which looks like:
* <pre><code>
- * <wb:delete-node />
+ * <fb:delete-node />
* </code></pre>
*
* @version CVS $Id$
1.3 +5 -5
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/MultiValueJXPathBindingBuilder.java
Index: MultiValueJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/MultiValueJXPathBindingBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultiValueJXPathBindingBuilder.java 9 Mar 2004 13:08:46 -0000
1.2
+++ MultiValueJXPathBindingBuilder.java 1 Apr 2004 12:59:57 -0000
1.3
@@ -27,14 +27,14 @@
* A simple multi field binding that will replace (i.e. delete then re-add
all) its
* content.
* <pre><code>
- * <wb:multi-value id="<i>widget-id</i>"
+ * <fb:multi-value id="<i>widget-id</i>"
* parent-path="<i>xpath-expression</i>">
* row-path="<i>xpath-expression</i>">
* <!-- optional child binding to be executed upon 'save' of changed
value -->
- * <wb:on-update>
+ * <fb:on-update>
* <!-- any childbinding -->
- * </wb:on-update>
- * </wb:multi-value>
+ * </fb:on-update>
+ * </fb:multi-value>
* </code></pre>
*
* @version CVS $Id$
1.2 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBindingBuilder.java
Index: SetAttributeJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/SetAttributeJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetAttributeJXPathBindingBuilder.java 9 Mar 2004 10:33:55 -0000
1.1
+++ SetAttributeJXPathBindingBuilder.java 1 Apr 2004 12:59:57 -0000
1.2
@@ -24,7 +24,7 @@
* actual [EMAIL PROTECTED] SetAttributeJXPathBinding} out of the
configuration in the
* provided configElement which looks like:
* <pre><code>
- * <wb:set-attribute name="<i>attribute-name to set to</i>"
+ * <fb:set-attribute name="<i>attribute-name to set to</i>"
* value="<i>attribute-value</i>"/>
* </code></pre>
*
1.2 +4 -4
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBindingBuilder.java
Index: NewJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/NewJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewJXPathBindingBuilder.java 9 Mar 2004 10:33:55 -0000 1.1
+++ NewJXPathBindingBuilder.java 1 Apr 2004 12:59:57 -0000 1.2
@@ -24,10 +24,10 @@
* actual [EMAIL PROTECTED] NewJXPathBinding} out of the configuration in the
* provided configElement which looks like:
* <pre><code>
- * <wb:new id="<i>widget-id</i>">
- * <wb:field id="<i>sub-widget-id</i>" path="<i>relative-xpath</i>"
+ * <fb:new id="<i>widget-id</i>">
+ * <fb:field id="<i>sub-widget-id</i>" path="<i>relative-xpath</i>"
* direction="<i>load|save</i>" lenient="<i>true/false</i>" />
- * </wb:new>
+ * </fb:new>
* </code></pre>
*
* @author Timothy Larson
1.2 +4 -4
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/SimpleRepeaterJXPathBindingBuilder.java
Index: SimpleRepeaterJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/SimpleRepeaterJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleRepeaterJXPathBindingBuilder.java 9 Mar 2004 10:33:55 -0000
1.1
+++ SimpleRepeaterJXPathBindingBuilder.java 1 Apr 2004 12:59:57 -0000
1.2
@@ -22,11 +22,11 @@
* A simple repeater binding that will replace (i.e. delete then re-add all)
its
* content.
* <pre>
- * <wb:simple-repeater
+ * <fb:simple-repeater
* id="contacts"
* parent-path="contacts">
- * <<em>... child bindings ...</em>
- * </wb:simple-repeater>
+ * <<em>... child bindings ...</em>>
+ * </fb:simple-repeater>
* </pre>
*
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
1.2 +3 -3
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/ContextJXPathBindingBuilder.java
Index: ContextJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/ContextJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContextJXPathBindingBuilder.java 9 Mar 2004 10:33:55 -0000 1.1
+++ ContextJXPathBindingBuilder.java 1 Apr 2004 12:59:57 -0000 1.2
@@ -24,9 +24,9 @@
* actual [EMAIL PROTECTED] ContextJXPathBinding} out of the configuration
in the
* provided configElement which looks like:
* <pre><code>
- * <wb:context path="<i>xpath expression</i>">
+ * <fb:context path="<i>xpath expression</i>">
* <!-- in here come the nested child bindings on the sub-context -->
- * </wb:context>
+ * </fb:context>
* </code></pre>
*
* @version CVS $Id$
1.3 +5 -5
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/ValueJXPathBindingBuilder.java
Index: ValueJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/ValueJXPathBindingBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ValueJXPathBindingBuilder.java 9 Mar 2004 13:08:46 -0000 1.2
+++ ValueJXPathBindingBuilder.java 1 Apr 2004 12:59:57 -0000 1.3
@@ -29,12 +29,12 @@
* actual [EMAIL PROTECTED] ValueJXPathBinding} out of the configuration in
the
* provided configElement which looks like:
* <pre><code>
- * <wb:value id="<i>widget-id</i>" path="<i>xpath-expression</i>">
+ * <fb:value id="<i>widget-id</i>" path="<i>xpath-expression</i>">
* <!-- optional child binding to be executed upon 'save' of changed
value -->
- * <wb:on-update>
+ * <fb:on-update>
* <!-- any childbinding -->
- * </wb:on-update>
- * </wb:value>
+ * </fb:on-update>
+ * </fb:value>
* </code></pre>
*
* @version CVS $Id$
1.4 +17 -11
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterJXPathBindingBuilder.java
Index: RepeaterJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterJXPathBindingBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RepeaterJXPathBindingBuilder.java 12 Mar 2004 03:31:39 -0000 1.3
+++ RepeaterJXPathBindingBuilder.java 1 Apr 2004 12:59:57 -0000 1.4
@@ -24,26 +24,29 @@
* actual [EMAIL PROTECTED] RepeaterJXPathBinding} out of the configuration
in the
* provided configElement which looks like:
* <pre><code>
- * <wb:repeater
+ * <fb:repeater
* id="contacts"
* parent-path="contacts"
* row-path="contact"
- * unique-row-id="id"
- * unique-path="@id" >
+ * row-path-insert="new-contact" >
*
- * <wb:on-bind>
+ * <fb:identity>
+ * <!-- nested bindings that map the 'identity' of the items -->
+ * </fb:identity>
+ *
+ * <fb:on-bind>
* <!-- nested bindings executed on updates AND right after the
insert -->
- * </wb:on-bind>
+ * </fb:on-bind>
*
- * <wb:on-delete-row>
+ * <fb:on-delete-row>
* <!-- nested bindings executed on deletion of row -->
- * </wb:on-delete-row>
+ * </fb:on-delete-row>
*
- * <wb:on-insert-row>
+ * <fb:on-insert-row>
* <!-- nested bindings executed to prepare the insertion of a row
-->
- * </wb:on-insert-row>
+ * </fb:on-insert-row>
*
- * </wb:repeater>
+ * </fb:repeater>
* </code></pre>
*
* @version CVS $Id$
@@ -96,6 +99,9 @@
if (insertWrapElement != null) {
insertBinding =
assistant.makeChildBindings(insertWrapElement)[0];
+ // TODO: we now safely take only the first element here,
+ // but we should in fact send out a warning to the log
+ // if more were available!
}
Element identityWrapElement =
DomHelper.getChildElement(bindingElm,
1.2 +4 -4
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/UnionJXPathBindingBuilder.java
Index: UnionJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/UnionJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnionJXPathBindingBuilder.java 9 Mar 2004 10:33:55 -0000 1.1
+++ UnionJXPathBindingBuilder.java 1 Apr 2004 12:59:57 -0000 1.2
@@ -24,10 +24,10 @@
* actual [EMAIL PROTECTED] UnionJXPathBinding} out of the configuration in
the
* provided configElement which looks like:
* <pre><code>
- * <wb:union id="<i>widget-id</i>" path="<i>xpath-expression</i>"
+ * <fb:union id="<i>widget-id</i>" path="<i>xpath-expression</i>"
* direction="<i>load|save</i>" lenient="<i>true|false</i>" >
- * <wb:field id="<i>sub-widget-id</i>" path="<i>relative-xpath</i>" />
- * </wb:union>
+ * <fb:field id="<i>sub-widget-id</i>" path="<i>relative-xpath</i>" />
+ * </fb:union>
* </code></pre>
*
* @author Timothy Larson
1.2 +4 -4
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/TempRepeaterJXPathBindingBuilder.java
Index: TempRepeaterJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/TempRepeaterJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TempRepeaterJXPathBindingBuilder.java 9 Mar 2004 10:33:55 -0000
1.1
+++ TempRepeaterJXPathBindingBuilder.java 1 Apr 2004 12:59:57 -0000
1.2
@@ -23,11 +23,11 @@
* (i.e. delete then re-add all) its content.
* Based on SimpleRepeater code.
* <pre>
- * <wb:temp-repeater
+ * <fb:temp-repeater
* id="contacts"
* parent-path="contacts">
- * <<em>... child bindings ...</em>
- * </wb:temp-repeater>
+ * <<em>... child bindings ...</em>>
+ * </fb:temp-repeater>
* </pre>
*
* @author Timothy Larson
1.2 +4 -4
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBindingBuilder.java
Index: StructJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/StructJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StructJXPathBindingBuilder.java 9 Mar 2004 10:33:55 -0000 1.1
+++ StructJXPathBindingBuilder.java 1 Apr 2004 12:59:57 -0000 1.2
@@ -24,10 +24,10 @@
* actual [EMAIL PROTECTED] StructJXPathBinding} out of the configuration in
the
* provided configElement which looks like:
* <pre><code>
- * <wb:struct id="<i>widget-id</i>" path="<i>xpath-expression</i>"
+ * <fb:struct id="<i>widget-id</i>" path="<i>xpath-expression</i>"
* direction="<i>load|save</i>" lenient="<i>true|false</i>" >
- * <wb:field id="<i>sub-widget-id</i>" path="<i>relative-xpath</i>" />
- * </wb:struct>
+ * <fb:field id="<i>sub-widget-id</i>" path="<i>relative-xpath</i>" />
+ * </fb:struct>
* </code></pre>
*
* @author Timothy Larson
1.2 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java
Index: InsertBeanJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InsertBeanJXPathBindingBuilder.java 9 Mar 2004 10:33:55 -0000
1.1
+++ InsertBeanJXPathBindingBuilder.java 1 Apr 2004 12:59:57 -0000
1.2
@@ -25,7 +25,7 @@
* actual [EMAIL PROTECTED] InsertBeanJXPathBinding} out of the
configuration in the
* provided configElement which looks like:
* <pre><code>
- * <wb:insert-bean classname="..child-bean-class.."
addmethod="..method-to-add.."/>
+ * <fb:insert-bean classname="..child-bean-class.."
addmethod="..method-to-add.."/>
* </code></pre>
*
* @version CVS $Id$
1.2 +2 -1
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBinding.java
Index: InsertBeanJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertBeanJXPathBinding.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InsertBeanJXPathBinding.java 9 Mar 2004 10:33:55 -0000 1.1
+++ InsertBeanJXPathBinding.java 1 Apr 2004 12:59:57 -0000 1.2
@@ -28,6 +28,7 @@
* <p>
* NOTES: <ol>
* <li>This Binding does not perform any actions when loading.</li>
+ * <li>This expects the back-end model to be a Java Bean model.</li>
* </ol>
*
* @version CVS $Id$
1.3 +3 -3
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBindingBuilder.java
Index: InsertNodeJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/InsertNodeJXPathBindingBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InsertNodeJXPathBindingBuilder.java 28 Mar 2004 20:51:24 -0000
1.2
+++ InsertNodeJXPathBindingBuilder.java 1 Apr 2004 12:59:57 -0000
1.3
@@ -33,10 +33,10 @@
* actual [EMAIL PROTECTED] InsertNodeJXPathBinding} out of the
configuration in the
* provided configElement which looks like:
* <pre><code>
- * <wb:insert-node>
+ * <fb:insert-node>
* <!-- in here comes a template that will be inserted in the target
* document -->
- * </wb:insert-node>
+ * </fb:insert-node>
* </code></pre>
*
* @version CVS $Id$
