vgritsenko 2004/01/11 12:51:16
Modified: src/blocks/woody/java/org/apache/cocoon/woody/binding
AggregateJXPathBinding.java
AggregateJXPathBindingBuilder.java Binding.java
BindingException.java BindingManager.java
CaseJXPathBinding.java
CaseJXPathBindingBuilder.java
ClassJXPathBinding.java
ClassJXPathBindingBuilder.java
ComposedJXPathBindingBase.java
ContextJXPathBinding.java
ContextJXPathBindingBuilder.java
DeleteNodeJXPathBinding.java
DeleteNodeJXPathBindingBuilder.java
InsertBeanJXPathBinding.java
InsertBeanJXPathBindingBuilder.java
InsertNodeJXPathBinding.java
InsertNodeJXPathBindingBuilder.java
JXPathBindingBase.java JXPathBindingManager.java
JXpathBindingBuilderBase.java
JavaScriptJXPathBinding.java
JavaScriptJXPathBindingBuilder.java
NewJXPathBinding.java NewJXPathBindingBuilder.java
RepeaterJXPathBinding.java
RepeaterJXPathBindingBuilder.java
SetAttributeJXPathBinding.java
SetAttributeJXPathBindingBuilder.java
SimpleRepeaterJXPathBinding.java
SimpleRepeaterJXPathBindingBuilder.java
StructJXPathBinding.java
StructJXPathBindingBuilder.java
TempRepeaterJXPathBinding.java
TempRepeaterJXPathBindingBuilder.java
UnionJXPathBinding.java
UnionJXPathBindingBuilder.java
ValueJXPathBinding.java
ValueJXPathBindingBuilder.java
Log:
Add version info.
CaseJXPathBinding: comment out unused code.
Revision Changes Path
1.6 +7 -5
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/AggregateJXPathBinding.java
Index: AggregateJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/AggregateJXPathBinding.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AggregateJXPathBinding.java 18 Dec 2003 07:57:21 -0000 1.5
+++ AggregateJXPathBinding.java 11 Jan 2004 20:51:15 -0000 1.6
@@ -55,13 +55,15 @@
import org.apache.commons.jxpath.JXPathContext;
/**
- * AggregateJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
- * that narrows the context towards provided childbindings.
+ * AggregateJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
+ * that narrows the context towards provided childbindings.
* <p>
* NOTES: <ol>
- * <li>This Binding assumes that the provided widget-id points to a widget
+ * <li>This Binding assumes that the provided widget-id points to a widget
* that contains other widgets.</li>
* </ol>
+ *
+ * @version CVS $Id$
*/
public class AggregateJXPathBinding extends ComposedJXPathBindingBase {
@@ -83,7 +85,7 @@
/**
* Narrows the scope on the form-model to the member widget-field, and
- * narrows the scope on the object-model to the member xpath-context
+ * narrows the scope on the object-model to the member xpath-context
* before continuing the binding over the child-bindings.
*/
public void doLoad(Widget frmModel, JXPathContext jxpc) {
@@ -97,7 +99,7 @@
/**
* Narrows the scope on the form-model to the member widget-field, and
- * narrows the scope on the object-model to the member xpath-context
+ * narrows the scope on the object-model to the member xpath-context
* before continuing the binding over the child-bindings.
*/
public void doSave(Widget frmModel, JXPathContext jxpc) throws
BindingException {
1.5 +6 -4
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/AggregateJXPathBindingBuilder.java
Index: AggregateJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/AggregateJXPathBindingBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AggregateJXPathBindingBuilder.java 18 Dec 2003 07:57:21 -0000
1.4
+++ AggregateJXPathBindingBuilder.java 11 Jan 2004 20:51:15 -0000
1.5
@@ -54,15 +54,17 @@
import org.w3c.dom.Element;
/**
- * AggregateJXPathBindingBuilder provides a helper class for the Factory
- * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
- * actual [EMAIL PROTECTED] AggregateJXPathBinding} out of the configuration
in the
+ * AggregateJXPathBindingBuilder provides a helper class for the Factory
+ * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
+ * actual [EMAIL PROTECTED] AggregateJXPathBinding} out of the configuration
in the
* provided configElement which looks like:
* <pre><code>
* <wb:aggregate id="<i>widget-id</i>" path="<i>xpath-expression</i>">
* <wb:field id="<i>sub-widget-id</i>" path="<i>relative-xpath</i>" />
* </wb:aggregate>
* </code></pre>
+ *
+ * @version CVS $Id$
*/
public class AggregateJXPathBindingBuilder
extends JXpathBindingBuilderBase {
@@ -70,7 +72,7 @@
public JXPathBindingBase buildBinding(Element bindingElm,
JXPathBindingManager.Assistant assistant)
throws BindingException {
try {
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
String xpath = DomHelper.getAttribute(bindingElm, "path");
String widgetId = DomHelper.getAttribute(bindingElm, "id");
1.5 +7 -5
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/Binding.java
Index: Binding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/Binding.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Binding.java 29 Dec 2003 06:14:48 -0000 1.4
+++ Binding.java 11 Jan 2004 20:51:15 -0000 1.5
@@ -53,9 +53,11 @@
import org.apache.cocoon.woody.formmodel.Widget;
/**
- * Binding declares the methods to 'bind' (i.e. 'load' and 'save')
- * information elements from some back-end model (2nd argument) to and from
+ * Binding declares the methods to 'bind' (i.e. 'load' and 'save')
+ * information elements from some back-end model (2nd argument) to and from
* a existing Woody Widget.
+ *
+ * @version CVS $Id$
*/
public interface Binding {
@@ -76,14 +78,14 @@
*/
Binding getClass(String id);
- /**
+ /**
* Loads the information-elements from the objModel to the frmModel.
- *
+ *
* @param frmModel
* @param objModel
*/
void loadFormFromModel(Widget frmModel, Object objModel);
-
+
/**
* Saves the infortmation-elements to the objModel from the frmModel.
* @param frmModel
1.2 +2 -0
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/BindingException.java
Index: BindingException.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/BindingException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BindingException.java 24 Jul 2003 12:36:21 -0000 1.1
+++ BindingException.java 11 Jan 2004 20:51:15 -0000 1.2
@@ -54,6 +54,8 @@
/**
* This exception is thrown when something goes wrong with the binding.
+ *
+ * @version CVS $Id$
*/
public class BindingException extends CascadingException {
public BindingException(String message) {
1.4 +3 -3
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/BindingManager.java
Index: BindingManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/BindingManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BindingManager.java 3 Sep 2003 12:26:23 -0000 1.3
+++ BindingManager.java 11 Jan 2004 20:51:15 -0000 1.4
@@ -54,6 +54,7 @@
/**
* BindingManager declares the factory method that produces actual Bindings.
+ * @version CVS $Id$
*/
public interface BindingManager {
@@ -63,14 +64,13 @@
String ROLE = BindingManager.class.getName();
/**
- * Constant matching the namespace used for the Binding config files.
+ * Constant matching the namespace used for the Binding config files.
*/
String NAMESPACE = "http://apache.org/cocoon/woody/binding/1.0";;
/**
* Creates a binding from the XML config found at source parameter.
*/
- Binding createBinding(Source bindingFile)
- throws BindingException;
+ Binding createBinding(Source bindingFile) throws BindingException;
}
1.4 +7 -5
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/CaseJXPathBinding.java
Index: CaseJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/CaseJXPathBinding.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CaseJXPathBinding.java 6 Jan 2004 12:31:17 -0000 1.3
+++ CaseJXPathBinding.java 11 Jan 2004 20:51:15 -0000 1.4
@@ -55,16 +55,16 @@
import org.apache.commons.jxpath.JXPathContext;
/**
- * CaseJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
- * that narrows the context towards provided childbindings.
+ * CaseJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
+ * that narrows the context towards provided childbindings.
* <p>
* NOTES: <ol>
* <li>This Binding assumes that the provided widget-id points to a
* case of a union.</li>
* </ol>
*
- * CVS $Id$
* @author Timothy Larson
+ * @version CVS $Id$
*/
public class CaseJXPathBinding extends ComposedJXPathBindingBase {
@@ -87,12 +87,13 @@
/**
* Narrows the scope on the form-model to the member widget-field, and
- * narrows the scope on the object-model to the member xpath-context
+ * narrows the scope on the object-model to the member xpath-context
* before continuing the binding over the child-bindings.
*/
public void doLoad(Widget frmModel, JXPathContext jxpc) {
Union unionWidget = (Union)frmModel;
if (widgetId.equals(unionWidget.getValue())) {
+ // JXPathContext subContext =
jxpc.getRelativeContext(jxpc.getPointer(this.xpath));
Binding[] subBindings = getChildBindings();
if (subBindings != null) {
int size = subBindings.length;
@@ -108,12 +109,13 @@
/**
* Narrows the scope on the form-model to the member widget-field, and
- * narrows the scope on the object-model to the member xpath-context
+ * narrows the scope on the object-model to the member xpath-context
* before continuing the binding over the child-bindings.
*/
public void doSave(Widget frmModel, JXPathContext jxpc) throws
BindingException {
Union unionWidget = (Union)frmModel;
if (widgetId.equals(unionWidget.getValue())) {
+ // JXPathContext subContext =
jxpc.getRelativeContext(jxpc.getPointer(this.xpath));
Binding[] subBindings = getChildBindings();
if (subBindings != null) {
int size = subBindings.length;
1.2 +6 -6
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/CaseJXPathBindingBuilder.java
Index: CaseJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/CaseJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CaseJXPathBindingBuilder.java 29 Dec 2003 06:14:48 -0000 1.1
+++ CaseJXPathBindingBuilder.java 11 Jan 2004 20:51:15 -0000 1.2
@@ -54,9 +54,9 @@
import org.w3c.dom.Element;
/**
- * CaseJXPathBindingBuilder provides a helper class for the Factory
- * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
- * actual [EMAIL PROTECTED] CaseJXPathBinding} out of the configuration in
the
+ * CaseJXPathBindingBuilder provides a helper class for the Factory
+ * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
+ * actual [EMAIL PROTECTED] CaseJXPathBinding} out of the configuration in
the
* provided configElement which looks like:
* <pre><code>
* <wb:case id="<i>widget-id</i>" path="<i>xpath-expression</i>"
@@ -65,16 +65,16 @@
* </wb:case>
* </code></pre>
*
- * CVS $Id$
* @author Timothy Larson
- */
+ * @version CVS $Id$
+s */
public class CaseJXPathBindingBuilder extends JXpathBindingBuilderBase {
public JXPathBindingBase buildBinding(Element bindingElm,
JXPathBindingManager.Assistant assistant)
throws BindingException {
try {
String widgetId = DomHelper.getAttribute(bindingElm, "id");
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
String xpath = DomHelper.getAttribute(bindingElm, "path");
JXPathBindingBase[] childBindings =
assistant.makeChildBindings(bindingElm);
1.2 +4 -4
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/ClassJXPathBinding.java
Index: ClassJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/ClassJXPathBinding.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassJXPathBinding.java 29 Dec 2003 06:14:48 -0000 1.1
+++ ClassJXPathBinding.java 11 Jan 2004 20:51:15 -0000 1.2
@@ -54,15 +54,15 @@
import org.apache.commons.jxpath.JXPathContext;
/**
- * ClassJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
+ * ClassJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
* that that allows the specification of a class of reusable bindings.
* <p>
* NOTES: <ol>
* <li>This Binding uses the provided widget-id as the name for the
class.</li>
* </ol>
*
- * CVS $Id$
* @author Timothy Larson
+ * @version CVS $Id$
*/
public class ClassJXPathBinding extends ComposedJXPathBindingBase {
@@ -88,7 +88,7 @@
/**
* Narrows the scope on the form-model to the member widget-field, and
- * narrows the scope on the object-model to the member xpath-context
+ * narrows the scope on the object-model to the member xpath-context
* before continuing the binding over the child-bindings.
*/
public void doLoad(Widget frmModel, JXPathContext jxpc) {
@@ -97,7 +97,7 @@
/**
* Narrows the scope on the form-model to the member widget-field, and
- * narrows the scope on the object-model to the member xpath-context
+ * narrows the scope on the object-model to the member xpath-context
* before continuing the binding over the child-bindings.
*/
public void doSave(Widget frmModel, JXPathContext jxpc) throws
BindingException {
1.2 +5 -5
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/ClassJXPathBindingBuilder.java
Index: ClassJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/ClassJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassJXPathBindingBuilder.java 29 Dec 2003 06:14:48 -0000 1.1
+++ ClassJXPathBindingBuilder.java 11 Jan 2004 20:51:15 -0000 1.2
@@ -54,9 +54,9 @@
import org.w3c.dom.Element;
/**
- * ClassJXPathBindingBuilder provides a helper class for the Factory
- * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
- * actual [EMAIL PROTECTED] ClassJXPathBinding} out of the configuration in
the
+ * ClassJXPathBindingBuilder provides a helper class for the Factory
+ * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
+ * actual [EMAIL PROTECTED] ClassJXPathBinding} out of the configuration in
the
* provided configElement which looks like:
* <pre><code>
* <wb:class id="<i>widget-id</i>">
@@ -65,8 +65,8 @@
* </wb:class>
* </code></pre>
*
- * CVS $Id$
* @author Timothy Larson
+ * @version CVS $Id$
*/
public class ClassJXPathBindingBuilder
extends JXpathBindingBuilderBase {
@@ -75,7 +75,7 @@
throws BindingException {
try {
String widgetId = DomHelper.getAttribute(bindingElm, "id");
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
JXPathBindingBase[] childBindings =
assistant.makeChildBindings(bindingElm);
1.6 +7 -5
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/ComposedJXPathBindingBase.java
Index: ComposedJXPathBindingBase.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/ComposedJXPathBindingBase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComposedJXPathBindingBase.java 29 Dec 2003 06:14:48 -0000 1.5
+++ ComposedJXPathBindingBase.java 11 Jan 2004 20:51:15 -0000 1.6
@@ -57,16 +57,18 @@
import org.apache.commons.jxpath.JXPathContext;
/**
- * ComposedJXPathBindingBase provides a helper base class for subclassing
- * into specific [EMAIL PROTECTED] JXPathBindingBase} implementations that
have nested
+ * ComposedJXPathBindingBase provides a helper base class for subclassing
+ * into specific [EMAIL PROTECTED] JXPathBindingBase} implementations that
have nested
* child-bindings.
+ *
+ * @version CVS $Id$
*/
public class ComposedJXPathBindingBase extends JXPathBindingBase {
private final JXPathBindingBase[] subBindings;
/**
* Constructs ComposedJXPathBindingBase
- *
+ *
* @param childBindings sets the array of childBindings
*/
protected
ComposedJXPathBindingBase(JXpathBindingBuilderBase.CommonAttributes commonAtts,
JXPathBindingBase[] childBindings) {
@@ -79,7 +81,7 @@
}
}
- /**
+ /**
* Receives the logger to use for logging activity, and hands it over to
* the nested children.
*/
@@ -132,7 +134,7 @@
}
/**
- * Actively performs the binding from the Woody-form to the ObjectModel
+ * Actively performs the binding from the Woody-form to the ObjectModel
* by passing the task onto it's children.
*/
public void doSave(Widget frmModel, JXPathContext jxpc) throws
BindingException {
1.7 +8 -6
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/ContextJXPathBinding.java
Index: ContextJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/ContextJXPathBinding.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContextJXPathBinding.java 18 Dec 2003 07:57:21 -0000 1.6
+++ ContextJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.7
@@ -55,13 +55,15 @@
import org.apache.commons.jxpath.Pointer;
/**
- * ContextJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
- * that narrows the binding scope to some xpath-context on the target
- * objectModel to load and save from.
+ * ContextJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
+ * that narrows the binding scope to some xpath-context on the target
+ * objectModel to load and save from.
+ *
+ * @version CVS $Id$
*/
public class ContextJXPathBinding extends ComposedJXPathBindingBase {
- /**
+ /**
* the relative contextPath for the sub-bindings of this context
*/
private final String xpath;
@@ -75,7 +77,7 @@
}
/**
- * Actively performs the binding from the ObjectModel wrapped in a
jxpath
+ * Actively performs the binding from the ObjectModel wrapped in a jxpath
* context to the Woody-form.
*/
public void doLoad(Widget frmModel, JXPathContext jxpc) {
@@ -93,7 +95,7 @@
}
/**
- * Actively performs the binding from the Woody-form to the ObjectModel
+ * Actively performs the binding from the Woody-form to the ObjectModel
* wrapped in a jxpath context.
*/
public void doSave(Widget frmModel, JXPathContext jxpc) throws
BindingException {
1.5 +7 -5
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/ContextJXPathBindingBuilder.java
Index: ContextJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/ContextJXPathBindingBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContextJXPathBindingBuilder.java 18 Dec 2003 07:57:21 -0000 1.4
+++ ContextJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000 1.5
@@ -54,27 +54,29 @@
import org.w3c.dom.Element;
/**
- * ContextJXPathBindingBuilder provides a helper class for the Factory
- * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
- * actual [EMAIL PROTECTED] ContextJXPathBinding} out of the configuration
in the
+ * ContextJXPathBindingBuilder provides a helper class for the Factory
+ * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
+ * actual [EMAIL PROTECTED] ContextJXPathBinding} out of the configuration
in the
* provided configElement which looks like:
* <pre><code>
* <wb:context path="<i>xpath expression</i>">
* <!-- in here come the nested child bindings on the sub-context -->
* </wb:context>
* </code></pre>
+ *
+ * @version CVS $Id$
*/
public class ContextJXPathBindingBuilder extends JXpathBindingBuilderBase {
/**
- * Creates an instance of ContextJXPathBinding with the configured
+ * Creates an instance of ContextJXPathBinding with the configured
* path and nested child bindings from the declarations in the bindingElm
*/
public JXPathBindingBase buildBinding(Element bindingElm,
JXPathBindingManager.Assistant assistant) throws BindingException {
try {
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
String xpath = DomHelper.getAttribute(bindingElm, "path");
JXPathBindingBase[] childBindings =
assistant.makeChildBindings(bindingElm);
1.4 +6 -6
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/DeleteNodeJXPathBinding.java
Index: DeleteNodeJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/DeleteNodeJXPathBinding.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeleteNodeJXPathBinding.java 18 Dec 2003 07:57:21 -0000 1.3
+++ DeleteNodeJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.4
@@ -54,16 +54,18 @@
import org.apache.commons.jxpath.JXPathContext;
/**
- * DeleteNodeJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
+ * DeleteNodeJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
* that deletes the current context-bean from the target
- * back-end model upon save.
+ * back-end model upon save.
* <p>
* NOTES: <ol>
* <li>This Binding does not perform any actions when loading.</li>
* </ol>
+ *
+ * @version CVS $Id$
*/
public class DeleteNodeJXPathBinding extends JXPathBindingBase {
-
+
public DeleteNodeJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts) {
super(commonAtts);
}
@@ -72,13 +74,11 @@
// doesn't do a thing when loading.
}
-
- /**
+ /**
* Removes the current context-bean from the jxpath context.
*/
public void doSave(Widget frmModel, JXPathContext jxpc) {
// get rid of the contextbean
jxpc.removePath(".");
}
-
}
1.5 +7 -6
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/DeleteNodeJXPathBindingBuilder.java
Index: DeleteNodeJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/DeleteNodeJXPathBindingBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeleteNodeJXPathBindingBuilder.java 18 Dec 2003 07:57:21 -0000
1.4
+++ DeleteNodeJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000
1.5
@@ -54,14 +54,15 @@
import org.w3c.dom.Element;
/**
- * DeleteNodeJXPathBindingBuilder provides a helper class for the Factory
- * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
- * actual [EMAIL PROTECTED] DeleteNodeJXPathBinding} out of the
configuration in the
+ * DeleteNodeJXPathBindingBuilder provides a helper class for the Factory
+ * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
+ * actual [EMAIL PROTECTED] DeleteNodeJXPathBinding} out of the
configuration in the
* provided configElement which looks like:
* <pre><code>
* <wb:delete-node />
* </code></pre>
- *
+ *
+ * @version CVS $Id$
*/
public class DeleteNodeJXPathBindingBuilder
extends JXpathBindingBuilderBase {
@@ -70,8 +71,8 @@
* Creates an instance of [EMAIL PROTECTED] DeleteNodeJXPathBinding}.
*/
public JXPathBindingBase buildBinding(Element bindingElm, Assistant
assistant) throws BindingException {
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
-
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+
return new DeleteNodeJXPathBinding(commonAtts);
}
}
1.5 +8 -6
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/InsertBeanJXPathBinding.java
Index: InsertBeanJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/InsertBeanJXPathBinding.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InsertBeanJXPathBinding.java 18 Dec 2003 07:57:21 -0000 1.4
+++ InsertBeanJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.5
@@ -59,13 +59,15 @@
import org.apache.avalon.framework.CascadingRuntimeException;
/**
- * InsertBeanJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
+ * InsertBeanJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
* that inserts a new instance of the specified bean (classname) into the
target
- * back-end model upon save.
+ * back-end model upon save.
* <p>
* NOTES: <ol>
* <li>This Binding does not perform any actions when loading.</li>
* </ol>
+ *
+ * @version CVS $Id$
*/
public class InsertBeanJXPathBinding extends JXPathBindingBase {
@@ -91,7 +93,7 @@
/**
* Registers a JXPath Factory on the JXPath Context.
* <p>
- * The factory will insert a new instance of the specified bean
(classname)
+ * The factory will insert a new instance of the specified bean
(classname)
* inside this object into the target objectmodel.
*/
public void doSave(Widget frmModel, JXPathContext jxpc) throws
BindingException {
@@ -101,16 +103,16 @@
try {
Object[] args = new Object[1];
Class[] argTypes = new Class[1];
-
+
// instantiate the new object
argTypes[0] =
Class.forName(InsertBeanJXPathBinding.this.className);
args[0] = argTypes[0].newInstance();
// lookup the named method on the parent
-
+
Method addMethod =
parent.getClass().getMethod(InsertBeanJXPathBinding.this.addMethodName,
argTypes);
// invoke this method with this new beast.
-
+
addMethod.invoke(parent, args);
if (getLogger().isDebugEnabled())
1.5 +11 -11
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/InsertBeanJXPathBindingBuilder.java
Index: InsertBeanJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/InsertBeanJXPathBindingBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InsertBeanJXPathBindingBuilder.java 18 Dec 2003 07:57:21 -0000
1.4
+++ InsertBeanJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000
1.5
@@ -55,26 +55,27 @@
import org.w3c.dom.Element;
/**
- * InsertBeanJXPathBindingBuilder provides a helper class for the Factory
- * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
- * actual [EMAIL PROTECTED] InsertBeanJXPathBinding} out of the
configuration in the
+ * InsertBeanJXPathBindingBuilder provides a helper class for the Factory
+ * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
+ * 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.."/>
+ * <wb:insert-bean classname="..child-bean-class.."
addmethod="..method-to-add.."/>
* </code></pre>
+ *
+ * @version CVS $Id$
*/
-public class InsertBeanJXPathBindingBuilder
- extends JXpathBindingBuilderBase {
+public class InsertBeanJXPathBindingBuilder extends JXpathBindingBuilderBase
{
/**
- * Creates an instance of [EMAIL PROTECTED] InsertBeanJXPathBinding}
configured
- * with the nested template of the bindingElm.
+ * Creates an instance of [EMAIL PROTECTED] InsertBeanJXPathBinding}
configured
+ * with the nested template of the bindingElm.
*/
public JXPathBindingBase buildBinding(Element bindingElm, Assistant
assistant) throws BindingException {
try {
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
-
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+
String className =
DomHelper.getAttribute(bindingElm, "classname");
String addMethod =
@@ -87,5 +88,4 @@
throw new BindingException("Error building a insert-bean binding
defined at " + DomHelper.getLocation(bindingElm), e);
}
}
-
}
1.5 +7 -6
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/InsertNodeJXPathBinding.java
Index: InsertNodeJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/InsertNodeJXPathBinding.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InsertNodeJXPathBinding.java 18 Dec 2003 07:57:21 -0000 1.4
+++ InsertNodeJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.5
@@ -59,19 +59,21 @@
import org.w3c.dom.Node;
/**
- * InsertNodeJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
+ * InsertNodeJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
* that inserts a clone of some 'template document-fragment' into the target
- * back-end model upon save.
+ * back-end model upon save.
* <p>
* NOTES: <ol>
* <li>This Binding does not perform any actions when loading.</li>
* <li>This expects the back-end model to be an XML file.</li>
* </ol>
+ *
+ * @version CVS $Id$
*/
public class InsertNodeJXPathBinding extends JXPathBindingBase {
private final DocumentFragment template;
-
+
/**
* Constructs InsertNodeJXPathBinding
*/
@@ -90,7 +92,7 @@
/**
* Registers a JXPath Factory on the JXPath Context.
* <p>
- * The factory will inserts a clone of the 'template' DocumentFragment
+ * The factory will inserts a clone of the 'template' DocumentFragment
* inside this object into the target objectmodel.
*/
public void doSave(Widget frmModel, JXPathContext jxpc) {
@@ -113,9 +115,8 @@
if (getLogger().isDebugEnabled())
getLogger().debug("done registered factory for inserting node --
" + toString());
}
-
+
public String toString() {
return "InsertNodeJXPathBinding [for nested template]";
}
-
}
1.7 +4 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/InsertNodeJXPathBindingBuilder.java
Index: InsertNodeJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/InsertNodeJXPathBindingBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InsertNodeJXPathBindingBuilder.java 18 Dec 2003 07:57:21 -0000
1.6
+++ InsertNodeJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000
1.7
@@ -69,6 +69,8 @@
* document -->
* </wb:insert-node>
* </code></pre>
+ *
+ * @version CVS $Id$
*/
public class InsertNodeJXPathBindingBuilder
extends JXpathBindingBuilderBase {
@@ -82,8 +84,8 @@
JXPathBindingManager.Assistant assistant) throws BindingException {
try {
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
-
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+
DocumentFragment domTemplate = null;
String src = bindingElm.getAttribute("src");
1.10 +19 -17
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXPathBindingBase.java
Index: JXPathBindingBase.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXPathBindingBase.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JXPathBindingBase.java 31 Dec 2003 12:42:33 -0000 1.9
+++ JXPathBindingBase.java 11 Jan 2004 20:51:16 -0000 1.10
@@ -61,22 +61,24 @@
import org.w3c.dom.Node;
/**
- * Provides a base class for hooking up Binding implementations that use the
+ * Provides a base class for hooking up Binding implementations that use the
* Jakarta Commons <a
href="http://jakarta.apache.org/commons/jxpath/index.html";>
* JXPath package</a>.
+ *
+ * @version CVS $Id$
*/
public abstract class JXPathBindingBase implements Binding, LogEnabled {
- /**
+ /**
* Avalon Logger to use in all subclasses.
*/
private Logger logger;
-
+
/**
* Object holding the values of the common objects on all Bindings.
*/
private final JXpathBindingBuilderBase.CommonAttributes commonAtts;
-
+
/**
* Parent binding of this binding.
*/
@@ -90,11 +92,11 @@
private JXPathBindingBase() {
this(JXpathBindingBuilderBase.CommonAttributes.DEFAULT);
}
-
+
protected JXPathBindingBase(JXpathBindingBuilderBase.CommonAttributes
commonAtts) {
this.commonAtts = commonAtts;
}
-
+
/**
* Sets parent binding.
*/
@@ -124,7 +126,7 @@
classBinding = parent.getClass(id);
// Cache result
if (classes == null)
- classes = new HashMap();
+ classes = new HashMap();
classes.put(id, classBinding);
}
return classBinding;
@@ -147,17 +149,17 @@
public abstract void doLoad(Widget frmModel, JXPathContext jxpc);
/**
- * Redefines the Binding action as working on a JXPathContext Type
rather
+ * Redefines the Binding action as working on a JXPathContext Type rather
* then on generic objects.
- * Executes the actual loading [EMAIL PROTECTED] #doLoad(Widget,
JXPathContext)}
+ * Executes the actual loading [EMAIL PROTECTED] #doLoad(Widget,
JXPathContext)}
* depending on the value of [EMAIL PROTECTED] #loadEnabled}
*/
public final void loadFormFromModel(Widget frmModel, JXPathContext jxpc)
{
- boolean inheritedLeniency = jxpc.isLenient();
+ boolean inheritedLeniency = jxpc.isLenient();
applyLeniency(jxpc);
if (this.commonAtts.loadEnabled) {
doLoad(frmModel, jxpc);
- }
+ }
jxpc.setLenient(inheritedLeniency);
}
@@ -180,22 +182,22 @@
* Abstract method that subclasses need to implement for specific
activity.
*/
public abstract void doSave(Widget frmModel, JXPathContext jxpc) throws
BindingException;
-
+
/**
- * Redefines the Binding action as working on a JXPathContext Type
rather
+ * Redefines the Binding action as working on a JXPathContext Type rather
* then on generic objects.
- * Executes the actual saving [EMAIL PROTECTED] #doSave(Widget,
JXPathContext)}
+ * Executes the actual saving [EMAIL PROTECTED] #doSave(Widget,
JXPathContext)}
* depending on the value of [EMAIL PROTECTED] #saveEnabled}
*/
public final void saveFormToModel(Widget frmModel, JXPathContext jxpc)
throws BindingException{
- boolean inheritedLeniency = jxpc.isLenient();
+ boolean inheritedLeniency = jxpc.isLenient();
applyLeniency(jxpc);
if (this.commonAtts.saveEnabled) {
doSave(frmModel, jxpc);
}
jxpc.setLenient(inheritedLeniency);
}
-
+
/**
* Hooks up with the more generic Binding of any objectModel by wrapping
* it up in a JXPathContext object and then transfering control over to
@@ -215,7 +217,7 @@
jxpc.setLenient(this.commonAtts.leniency.booleanValue());
}
}
-
+
private JXPathContext makeJXPathContext(Object objModel) {
JXPathContext jxpc;
if (!(objModel instanceof JXPathContext)) {
1.13 +10 -10
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXPathBindingManager.java
Index: JXPathBindingManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXPathBindingManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JXPathBindingManager.java 19 Nov 2003 01:39:29 -0000 1.12
+++ JXPathBindingManager.java 11 Jan 2004 20:51:16 -0000 1.13
@@ -73,14 +73,14 @@
* JXPathBindingManager provides an implementation of [EMAIL PROTECTED]
BindingManager}
* by usage of the <a
href="http://jakarta.apache.org/commons/jxpath/index.html";>
* JXPath package</a>.
- *
- * @version CVS $ID$
+ *
+ * @version CVS $Id$
*/
public class JXPathBindingManager extends AbstractLogEnabled
implements BindingManager, Serviceable, Disposable,
Initializable, Configurable, ThreadSafe {
- //TODO caching of the Bindings.
+ // TODO caching of the Bindings.
private ServiceManager serviceManager;
private DatatypeManager datatypeManager;
@@ -107,7 +107,7 @@
try {
InputSource is = new InputSource(bindSrc.getInputStream());
is.setSystemId(bindSrc.getURI());
-
+
Document doc = DomHelper.parse(is);
Element rootElm = doc.getDocumentElement();
JXPathBindingBase newBinding = null;
@@ -146,12 +146,12 @@
}
/**
- * Assistant Inner class discloses enough features to the created
- * childBindings to recursively
- *
+ * Assistant Inner class discloses enough features to the created
+ * childBindings to recursively
+ *
* This patterns was chosen to prevent Inversion Of Control between
* this factory and its builder classes (that could be provided by third
- * parties)
+ * parties)
*/
public class Assistant {
@@ -164,7 +164,7 @@
}
/**
- * Creates a [EMAIL PROTECTED] Binding} following the specification
in the
+ * Creates a [EMAIL PROTECTED] Binding} following the specification
in the
* provided config element.
*/
public JXPathBindingBase getBindingForConfigurationElement(Element
configElm) throws BindingException {
@@ -177,7 +177,7 @@
}
/**
- * Makes an array of childBindings for the child-elements of the
+ * Makes an array of childBindings for the child-elements of the
* provided configuration element.
*/
public JXPathBindingBase[] makeChildBindings(Element parentElement)
throws BindingException {
1.7 +28 -26
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXpathBindingBuilderBase.java
Index: JXpathBindingBuilderBase.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXpathBindingBuilderBase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JXpathBindingBuilderBase.java 19 Dec 2003 08:06:50 -0000 1.6
+++ JXpathBindingBuilderBase.java 11 Jan 2004 20:51:16 -0000 1.7
@@ -56,14 +56,16 @@
import org.w3c.dom.Element;
/**
- * Abstract base class enabling logging and supporting the intrepretation of
+ * Abstract base class enabling logging and supporting the intrepretation of
* common configuration settings on all specific implementations of
* [EMAIL PROTECTED] org.apache.cocoon.woody.binding.JXPathBindingBase}.
- *
+ *
* Common supported configurations:
* <ul>
* <li>Attribute direction="load|save|both": [EMAIL PROTECTED]
#getDirectionAttributes(Element)}</li>
* </ul>
+ *
+ * @version CVS $Id$
*/
public abstract class JXpathBindingBuilderBase implements LogEnabled {
@@ -109,10 +111,10 @@
* </ol>
* <br>
* <code>@lenient</code> can either be:
- * <ol><li><code>'true'</code>: This binding will set the jxpath context
to
+ * <ol><li><code>'true'</code>: This binding will set the jxpath context
to
* be lenient towards the usage of inexisting paths on the back-end
model.</li>
- * <li><code>'false'</code>: This binding will set the jxpath context to
be
- * strict and throwing exceptions for the usage of inexisting paths on
the
+ * <li><code>'false'</code>: This binding will set the jxpath context to
be
+ * strict and throwing exceptions for the usage of inexisting paths on
the
* back-end model.</li>
* <li><code>(unset)</code>: This binding will not change the leniency
behaviour
* on the jxpath this binding receives from his parent binding.</li>
@@ -126,18 +128,18 @@
//TODO: should we eventually remove this?
//throw an error if people are still using the old-style
@read-only or @readonly
if (DomHelper.getAttributeAsBoolean(bindingElm, "readonly",
false)) {
- throw new BindingException("Error in binding file " +
DomHelper.getLocation(bindingElm)
+ throw new BindingException("Error in binding file " +
DomHelper.getLocation(bindingElm)
+ "\nThe usage of the attribute @readonly has been
depricated in favour of @direction.");
}
if (DomHelper.getAttributeAsBoolean(bindingElm, "read-only",
false)) {
- throw new BindingException("Error in binding file " +
DomHelper.getLocation(bindingElm)
+ throw new BindingException("Error in binding file " +
DomHelper.getLocation(bindingElm)
+ "\nThe usage of the attribute @read-only has been
depricated in favour of @direction.");
}
-
+
String direction = DomHelper.getAttribute(bindingElm,
"direction", "both");
-
+
String leniency = DomHelper.getAttribute(bindingElm, "lenient",
null);
-
+
return new CommonAttributes(direction, leniency);
} catch (BindingException e) {
throw e;
@@ -145,19 +147,19 @@
throw new BindingException("Error building binding defined at "
+ DomHelper.getLocation(bindingElm), e);
}
}
-
+
/**
* CommonAttributes is a simple helper class for holding the distinct
data
- * member fields indicating the activity of the sepearate load and save
+ * member fields indicating the activity of the sepearate load and save
* actions of a given binding.
*/
static class CommonAttributes{
final boolean loadEnabled;
final boolean saveEnabled;
final Boolean leniency;
-
- final static CommonAttributes DEFAULT = new CommonAttributes(true,
true, null);
-
+
+ final static CommonAttributes DEFAULT = new CommonAttributes(true,
true, null);
+
CommonAttributes(String direction, String leniency){
this(isLoadEnabled(direction), isSaveEnabled(direction),
decideLeniency(leniency));
}
@@ -167,36 +169,36 @@
this.saveEnabled = saveEnabled;
this.leniency = leniency;
}
-
- /**
+
+ /**
* Interpretes the value of the direction attribute into activity of
the load action.
* @param direction
* @return true if direction is either set to "both" or "load"
*/
- private static boolean isLoadEnabled(String direction) {
+ private static boolean isLoadEnabled(String direction) {
return "both".equals(direction) || "load".equals(direction);
}
-
- /**
+
+ /**
* Interpretes the value of the direction attribute into activity of
the save action.
* @param direction value of the @direction attribute
* @return true if direction is either set to "both" or "save"
*/
- private static boolean isSaveEnabled(String direction) {
+ private static boolean isSaveEnabled(String direction) {
return "both".equals(direction) || "save".equals(direction);
- }
+ }
+
-
/**
- * Interpretes the value of the lenient attribute into a Boolean
object
+ * Interpretes the value of the lenient attribute into a Boolean
object
* allowing three-state logic (true/false/unset)
* @param leniency value of the @lenient attribute
- * @return null if the leniency parameter is String, otherwise the
+ * @return null if the leniency parameter is String, otherwise the
*/
private static Boolean decideLeniency(String leniency) {
if (leniency == null) return null;
return new Boolean(leniency);
}
-
+
}
}
1.5 +13 -14
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JavaScriptJXPathBinding.java
Index: JavaScriptJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JavaScriptJXPathBinding.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JavaScriptJXPathBinding.java 18 Dec 2003 07:57:21 -0000 1.4
+++ JavaScriptJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.5
@@ -64,18 +64,18 @@
import org.mozilla.javascript.Script;
/**
- *
+ *
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
* @version CVS $Id$
*/
public class JavaScriptJXPathBinding extends JXPathBindingBase {
-
+
private final String id;
private final String path;
private final Script loadScript;
private final Script saveScript;
-
- public JavaScriptJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts, String id, String path, Script loadScript, Script saveScript) {
+
+ public JavaScriptJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts, String id, String path, Script loadScript, Script saveScript) {
super(commonAtts);
this.id = id;
this.path = path;
@@ -84,18 +84,18 @@
}
public void doLoad(Widget frmModel, JXPathContext jctx) {
-
+
if (this.loadScript == null) return;
-
+
Widget widget = frmModel.getWidget(this.id);
-
+
// Move to widget context
Pointer pointer = jctx.getPointer(this.path);
// FIXME: remove this ugly hack and get the request from the Avalon
context once
// binding builder are real components
Request request =
ObjectModelHelper.getRequest(CocoonComponentManager.getCurrentEnvironment().getObjectModel());
-
+
try {
Map values = new HashMap(3);
values.put("widget", widget);
@@ -103,9 +103,9 @@
if (pointer.getNode() != null) {
values.put("jxpathContext",
jctx.getRelativeContext(pointer));
}
-
+
JavaScriptHelper.execScript(this.loadScript, values, request);
-
+
} catch(RuntimeException re) {
// rethrow
throw re;
@@ -116,7 +116,7 @@
public void doSave(Widget frmModel, JXPathContext jctx) throws
BindingException {
if (this.saveScript == null) return;
-
+
Widget widget = frmModel.getWidget(this.id);
// Move to widget context and create the path if needed
@@ -133,7 +133,7 @@
values.put("jxpathPointer", pointer);
JavaScriptHelper.execScript(this.saveScript, values, request);
-
+
} catch(RuntimeException re) {
// rethrow
throw re;
@@ -141,5 +141,4 @@
throw new CascadingRuntimeException("Error invoking JavaScript
event handler", e);
}
}
-
}
1.4 +6 -7
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JavaScriptJXPathBindingBuilder.java
Index: JavaScriptJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JavaScriptJXPathBindingBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaScriptJXPathBindingBuilder.java 18 Dec 2003 07:57:21 -0000
1.3
+++ JavaScriptJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000
1.4
@@ -85,7 +85,7 @@
* <li>The <wb:save-form> snippet should be ommitted if the
"direction" attribute is set to "load".</li>
* <li>The <wb:load-form> snippet should be ommitted if the
"direction" attribute is set to "save".</li>
* </ul>
- *
+ *
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
* @version CVS $Id$
*/
@@ -93,17 +93,17 @@
public JXPathBindingBase buildBinding(Element element, Assistant
assistant) throws BindingException {
try {
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(element);
-
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(element);
+
String id = DomHelper.getAttribute(element, "id");
String path = DomHelper.getAttribute(element, "path");
-
+
Script loadScript = null;
if (commonAtts.loadEnabled) {
Element loadElem = DomHelper.getChildElement(element,
BindingManager.NAMESPACE, "load-form");
loadScript = JavaScriptHelper.buildScript(loadElem);
}
-
+
Script saveScript = null;
if (commonAtts.saveEnabled) {
Element saveElem = DomHelper.getChildElement(element,
BindingManager.NAMESPACE, "save-form");
@@ -116,5 +116,4 @@
throw new BindingException("Cannot build binding at " +
DomHelper.getLocation(element), e);
}
}
-
}
1.3 +5 -5
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/NewJXPathBinding.java
Index: NewJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/NewJXPathBinding.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NewJXPathBinding.java 31 Dec 2003 05:50:12 -0000 1.2
+++ NewJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.3
@@ -54,7 +54,7 @@
import org.apache.commons.jxpath.JXPathContext;
/**
- * NewJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
+ * NewJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
* that references a class of bindings.
* <p>
* NOTES: <ol>
@@ -62,8 +62,8 @@
* class that contains other widgets.</li>
* </ol>
*
- * CVS $Id$
* @author Timothy Larson
+ * @version CVS $Id$
*/
public class NewJXPathBinding extends ComposedJXPathBindingBase {
@@ -73,7 +73,7 @@
/**
* Constructs NewJXPathBinding
- * @param commonAtts
+ * @param commonAtts
* @param widgetId
* @param childBindings
*/
@@ -89,7 +89,7 @@
/**
* Narrows the scope on the form-model to the member widget-field, and
- * narrows the scope on the object-model to the member xpath-context
+ * narrows the scope on the object-model to the member xpath-context
* before continuing the binding over the child-bindings.
*/
public void doLoad(Widget frmModel, JXPathContext jxpc) {
@@ -110,7 +110,7 @@
/**
* Narrows the scope on the form-model to the member widget-field, and
- * narrows the scope on the object-model to the member xpath-context
+ * narrows the scope on the object-model to the member xpath-context
* before continuing the binding over the child-bindings.
*/
public void doSave(Widget frmModel, JXPathContext jxpc) throws
BindingException {
1.2 +5 -5
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/NewJXPathBindingBuilder.java
Index: NewJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/NewJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewJXPathBindingBuilder.java 29 Dec 2003 06:14:48 -0000 1.1
+++ NewJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000 1.2
@@ -54,9 +54,9 @@
import org.w3c.dom.Element;
/**
- * NewJXPathBindingBuilder provides a helper class for the Factory
- * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
- * actual [EMAIL PROTECTED] NewJXPathBinding} out of the configuration in
the
+ * NewJXPathBindingBuilder provides a helper class for the Factory
+ * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
+ * actual [EMAIL PROTECTED] NewJXPathBinding} out of the configuration in the
* provided configElement which looks like:
* <pre><code>
* <wb:new id="<i>widget-id</i>">
@@ -65,8 +65,8 @@
* </wb:new>
* </code></pre>
*
- * CVS $Id$
* @author Timothy Larson
+ * @version CVS $Id$
*/
public class NewJXPathBindingBuilder
extends JXpathBindingBuilderBase {
@@ -75,7 +75,7 @@
throws BindingException {
try {
String widgetId = DomHelper.getAttribute(bindingElm, "id");
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
JXPathBindingBase[] childBindings =
assistant.makeChildBindings(bindingElm);
1.15 +24 -22
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/RepeaterJXPathBinding.java
Index: RepeaterJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/RepeaterJXPathBinding.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RepeaterJXPathBinding.java 29 Dec 2003 15:30:28 -0000 1.14
+++ RepeaterJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.15
@@ -65,9 +65,11 @@
import org.apache.commons.jxpath.Pointer;
/**
- * RepeaterJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
+ * RepeaterJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
* that allows for bidirectional binding of a repeater-widget to/from
- * repeating structures in the back-end object model.
+ * repeating structures in the back-end object model.
+ *
+ * @version CVS $Id$
*/
public class RepeaterJXPathBinding extends JXPathBindingBase {
@@ -87,10 +89,10 @@
/**
* Constructs RepeaterJXPathBinding
*/
- public RepeaterJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts,
- String repeaterId, String repeaterPath,
+ public RepeaterJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts,
+ String repeaterId, String repeaterPath,
String rowPath, String rowPathForInsert,
- String uniqueRowId, String uniqueRowPath,
+ String uniqueRowId, String uniqueRowPath,
JXPathBindingBase[] childBindings,
JXPathBindingBase insertBinding,
JXPathBindingBase[] deleteBindings) {
this(commonAtts, repeaterId, repeaterPath, rowPath,
rowPathForInsert, uniqueRowId, uniqueRowPath, null, null, childBindings,
insertBinding, deleteBindings);
@@ -99,11 +101,11 @@
/**
* Constructs RepeaterJXPathBinding
*/
- public RepeaterJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts,
- String repeaterId, String repeaterPath,
+ public RepeaterJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts,
+ String repeaterId, String repeaterPath,
String rowPath, String rowPathForInsert,
- String uniqueRowId, String uniqueRowPath,
- Convertor convertor, Locale
convertorLocale,
+ String uniqueRowId, String uniqueRowPath,
+ Convertor convertor, Locale convertorLocale,
JXPathBindingBase[] childBindings,
JXPathBindingBase insertBinding,
JXPathBindingBase[] deleteBindings) {
super(commonAtts);
@@ -125,14 +127,14 @@
}
this.deleteRowBinding = new
ComposedJXPathBindingBase(JXpathBindingBuilderBase.CommonAttributes.DEFAULT,
deleteBindings);
if (this.deleteRowBinding != null) {
- this.deleteRowBinding.setParent(this);
+ this.deleteRowBinding.setParent(this);
}
}
/**
- * Binds the unique-id of the repeated rows, and narrows the context on
- * objectModelContext and Repeater to the repeated rows before handing
+ * Binds the unique-id of the repeated rows, and narrows the context on
+ * objectModelContext and Repeater to the repeated rows before handing
* over to the actual binding-children.
*/
public void doLoad(Widget frmModel, JXPathContext jxpc) {
@@ -164,7 +166,7 @@
/**
- * Uses the mapped unique-id of each row to detect if rows have been
+ * Uses the mapped unique-id of each row to detect if rows have been
* updated, inserted or removed. Depending on what happened the
appropriate
* child-bindings are alowed to visit the narrowed contexts.
*/
@@ -178,10 +180,10 @@
// create set of updatedRowIds
Set updatedRowIds = new HashSet();
- //create list of rows to insert at end
+ //create list of rows to insert at end
List rowsToInsert = new ArrayList();
- // iterate rows...
+ // iterate rows...
int formRowCount = repeater.getSize();
for (int i = 0; i < formRowCount; i++) {
Repeater.RepeaterRow thisRow = repeater.getRow(i);
@@ -190,7 +192,7 @@
Object rowIdValue = rowIdWidget.getValue();
if (rowIdValue != null) {
- //if rowIdValue != null --> iterate nodes to find match
+ //if rowIdValue != null --> iterate nodes to find match
Iterator rowPointers =
repeaterContext.iteratePointers(this.rowPath);
boolean found = false;
@@ -205,7 +207,7 @@
matchId =
this.uniqueRowIdConvertor.convertFromString((String)matchId,
this.uniqueRowIdConvertorLocale, null);
} else {
getLogger().warn("Convertor ignored on
backend-value which isn't of type String.");
- }
+ }
}
if (rowIdValue.equals(matchId)) {
@@ -229,7 +231,7 @@
}
}
- //again iterate nodes for deletion
+ //again iterate nodes for deletion
Iterator rowPointers = repeaterContext.iteratePointers(this.rowPath);
List rowsToDelete = new ArrayList();
while (rowPointers.hasNext()) {
@@ -242,7 +244,7 @@
matchId =
this.uniqueRowIdConvertor.convertFromString((String)matchId,
this.uniqueRowIdConvertorLocale, null);
} else {
getLogger().warn("Convertor ignored on backend-value
which isn't of type String.");
- }
+ }
}
// check if matchPath was in list of updates, if not --> bind
for delete
@@ -288,13 +290,13 @@
this.rowBinding.saveFormToModel(thisRow, newRowContext);
getLogger().debug("bound new row");
indexCount++;
- }
+ }
} else {
getLogger().warn("RepeaterBinding has detected rows to
insert, " +
"but misses the <on-insert-row> binding to do it.");
}
}
-
+
if (getLogger().isDebugEnabled())
getLogger().debug("done saving rows " + toString());
@@ -311,7 +313,7 @@
this.deleteRowBinding.enableLogging(logger);
}
if (this.insertRowBinding != null) {
- this.insertRowBinding.enableLogging(logger);
+ this.insertRowBinding.enableLogging(logger);
}
this.rowBinding.enableLogging(logger);
}
1.9 +7 -5
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/RepeaterJXPathBindingBuilder.java
Index: RepeaterJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/RepeaterJXPathBindingBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RepeaterJXPathBindingBuilder.java 18 Dec 2003 07:57:21 -0000 1.8
+++ RepeaterJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000 1.9
@@ -85,6 +85,8 @@
*
* </wb:repeater>
* </code></pre>
+ *
+ * @version CVS $Id$
*/
public class RepeaterJXPathBindingBuilder
extends JXpathBindingBuilderBase {
@@ -102,8 +104,8 @@
JXPathBindingManager.Assistant assistant) throws BindingException {
try {
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
-
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+
String repeaterId = DomHelper.getAttribute(bindingElm, "id");
String parentPath =
DomHelper.getAttribute(bindingElm, "parent-path");
@@ -133,7 +135,7 @@
"on-bind");
if (childWrapElement == null) throw new
BindingException("RepeaterBinding misses '<on-bind>' child definition. " +
DomHelper.getLocation(bindingElm));
-
+
JXPathBindingBase[] childBindings =
assistant.makeChildBindings(childWrapElement);
Element deleteWrapElement =
@@ -154,7 +156,7 @@
JXPathBindingBase insertBinding = null;
if (insertWrapElement != null) {
insertBinding =
assistant.makeChildBindings(insertWrapElement)[0];
-
+
}
RepeaterJXPathBinding repeaterBinding =
@@ -162,7 +164,7 @@
commonAtts,
repeaterId, parentPath, rowPath, rowPathForInsert,
uniqueRowId, uniqueRowIdPath,
- convertor, convertorLocale,
+ convertor, convertorLocale,
childBindings, insertBinding, deleteBindings);
return repeaterBinding;
1.5 +4 -3
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/SetAttributeJXPathBinding.java
Index: SetAttributeJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/SetAttributeJXPathBinding.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SetAttributeJXPathBinding.java 18 Dec 2003 07:57:21 -0000 1.4
+++ SetAttributeJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.5
@@ -54,12 +54,14 @@
import org.apache.commons.jxpath.JXPathContext;
/**
- * SetAttributeJXPathBinding provides an implementation of a [EMAIL
PROTECTED] Binding}
- * that sets a particular attribute to a fixed value upon save.
+ * SetAttributeJXPathBinding provides an implementation of a [EMAIL
PROTECTED] Binding}
+ * that sets a particular attribute to a fixed value upon save.
* <p>
* NOTES: <ol>
* <li>This Binding does not perform any actions when loading.</li>
* </ol>
+ *
+ * @version CVS $Id$
*/
public class SetAttributeJXPathBinding extends JXPathBindingBase {
@@ -94,5 +96,4 @@
public String toString() {
return "SetAttributeJXPathBinding [attName=" + this.name + ",
attValue=" + this.value + "]";
}
-
}
1.5 +11 -10
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/SetAttributeJXPathBindingBuilder.java
Index: SetAttributeJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/SetAttributeJXPathBindingBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SetAttributeJXPathBindingBuilder.java 18 Dec 2003 07:57:21 -0000
1.4
+++ SetAttributeJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000
1.5
@@ -54,30 +54,32 @@
import org.w3c.dom.Element;
/**
- * SetAttributeJXPathBindingBuilder provides a helper class for the Factory
- * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
- * actual [EMAIL PROTECTED] SetAttributeJXPathBinding} out of the
configuration in the
+ * SetAttributeJXPathBindingBuilder provides a helper class for the Factory
+ * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
+ * 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>"
+ * <wb:set-attribute name="<i>attribute-name to set to</i>"
* value="<i>attribute-value</i>"/>
* </code></pre>
+ *
+ * @version CVS $Id$
*/
public class SetAttributeJXPathBindingBuilder
extends JXpathBindingBuilderBase {
-
+
/**
- * Creates an instance of [EMAIL PROTECTED] SetAttributeJXPathBinding}
according to
- * the attributes of the provided bindingElm.
+ * Creates an instance of [EMAIL PROTECTED] SetAttributeJXPathBinding}
according to
+ * the attributes of the provided bindingElm.
*/
public JXPathBindingBase buildBinding(
Element bindingElm,
JXPathBindingManager.Assistant assistant) throws BindingException {
try {
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
-
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+
String attName = DomHelper.getAttribute(bindingElm, "name");
String attValue = DomHelper.getAttribute(bindingElm, "value");
@@ -91,5 +93,4 @@
throw new BindingException("Error building binding defined at "
+ DomHelper.getLocation(bindingElm), e);
}
}
-
}
1.6 +7 -6
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/SimpleRepeaterJXPathBinding.java
Index: SimpleRepeaterJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/SimpleRepeaterJXPathBinding.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleRepeaterJXPathBinding.java 18 Dec 2003 07:57:21 -0000 1.5
+++ SimpleRepeaterJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.6
@@ -64,8 +64,9 @@
* <p>
* For a smarter binding that avoids deletion and recreation, consider
* [EMAIL PROTECTED] org.apache.cocoon.woody.binding.RepeaterJXPathBinding}
- *
+ *
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
+ * @version CVS $Id$
*/
public class SimpleRepeaterJXPathBinding extends JXPathBindingBase {
@@ -90,7 +91,7 @@
public void doLoad(Widget frmModel, JXPathContext jctx) {
// Find the repeater and clear it
Repeater repeater = (Repeater) frmModel.getWidget(this.repeaterId);
-
+
if (this.clearOnLoad) {
repeater.removeRows();
}
@@ -99,7 +100,7 @@
Pointer ptr = jctx.getPointer(this.repeaterPath);
if (ptr.getNode() != null) {
// There are some nodes to load from
-
+
JXPathContext repeaterContext = jctx.getRelativeContext(ptr);
// build a jxpath iterator for pointers
Iterator rowPointers =
repeaterContext.iteratePointers(this.rowPath);
@@ -115,11 +116,11 @@
thisRow = repeater.addRow();
}
rowNum++;
-
+
// make a jxpath sub context on the iterated element
Pointer jxp = (Pointer) rowPointers.next();
JXPathContext rowContext =
repeaterContext.getRelativeContext(jxp);
-
+
this.rowBinding.loadFormFromModel(thisRow, rowContext);
}
}
@@ -138,7 +139,7 @@
} else {
// Repeater is not empty
-
+
// Move to repeater context and create the path if needed
JXPathContext repeaterContext =
jctx.getRelativeContext(jctx.createPath(this.repeaterPath));
1.6 +4 -3
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/SimpleRepeaterJXPathBindingBuilder.java
Index: SimpleRepeaterJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/SimpleRepeaterJXPathBindingBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleRepeaterJXPathBindingBuilder.java 18 Dec 2003 07:57:21 -0000
1.5
+++ SimpleRepeaterJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000
1.6
@@ -63,8 +63,9 @@
* <<em>... child bindings ...</em>
* </wb:simple-repeater>
* </pre>
- *
+ *
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
+ * @version CVS $Id$
*/
public class SimpleRepeaterJXPathBindingBuilder
extends JXpathBindingBuilderBase {
@@ -74,8 +75,8 @@
JXPathBindingManager.Assistant assistant) throws BindingException {
try {
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElem);
-
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElem);
+
String repeaterId = DomHelper.getAttribute(bindingElem, "id");
String parentPath = DomHelper.getAttribute(bindingElem,
"parent-path");
String rowPath = DomHelper.getAttribute(bindingElem, "row-path");
1.3 +6 -6
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/StructJXPathBinding.java
Index: StructJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/StructJXPathBinding.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StructJXPathBinding.java 6 Jan 2004 12:31:17 -0000 1.2
+++ StructJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.3
@@ -55,16 +55,16 @@
import org.apache.commons.jxpath.JXPathContext;
/**
- * StructJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
- * that narrows the context towards provided childbindings.
+ * StructJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
+ * that narrows the context towards provided childbindings.
* <p>
* NOTES: <ol>
- * <li>This Binding assumes that the provided widget-id points to a widget
+ * <li>This Binding assumes that the provided widget-id points to a widget
* that contains other widgets.</li>
* </ol>
*
- * CVS $Id$
* @author Timothy Larson
+ * @version CVS $Id$
*/
public class StructJXPathBinding extends ComposedJXPathBindingBase {
@@ -86,7 +86,7 @@
/**
* Narrows the scope on the form-model to the member widget-field, and
- * narrows the scope on the object-model to the member xpath-context
+ * narrows the scope on the object-model to the member xpath-context
* before continuing the binding over the child-bindings.
*/
public void doLoad(Widget frmModel, JXPathContext jxpc) {
@@ -105,7 +105,7 @@
/**
* Narrows the scope on the form-model to the member widget-field, and
- * narrows the scope on the object-model to the member xpath-context
+ * narrows the scope on the object-model to the member xpath-context
* before continuing the binding over the child-bindings.
*/
public void doSave(Widget frmModel, JXPathContext jxpc) throws
BindingException {
1.2 +5 -5
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/StructJXPathBindingBuilder.java
Index: StructJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/StructJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StructJXPathBindingBuilder.java 29 Dec 2003 06:14:48 -0000 1.1
+++ StructJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000 1.2
@@ -54,9 +54,9 @@
import org.w3c.dom.Element;
/**
- * StructJXPathBindingBuilder provides a helper class for the Factory
- * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
- * actual [EMAIL PROTECTED] StructJXPathBinding} out of the configuration in
the
+ * StructJXPathBindingBuilder provides a helper class for the Factory
+ * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
+ * 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>"
@@ -65,8 +65,8 @@
* </wb:struct>
* </code></pre>
*
- * CVS $Id$
* @author Timothy Larson
+ * @version CVS $Id$
*/
public class StructJXPathBindingBuilder
extends JXpathBindingBuilderBase {
@@ -75,7 +75,7 @@
throws BindingException {
try {
String widgetId = DomHelper.getAttribute(bindingElm, "id");
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
String xpath = DomHelper.getAttribute(bindingElm, "path");
JXPathBindingBase[] childBindings =
assistant.makeChildBindings(bindingElm);
1.3 +9 -9
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/TempRepeaterJXPathBinding.java
Index: TempRepeaterJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/TempRepeaterJXPathBinding.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TempRepeaterJXPathBinding.java 6 Jan 2004 12:32:47 -0000 1.2
+++ TempRepeaterJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.3
@@ -68,15 +68,15 @@
* For a smarter binding that avoids deletion and recreation, consider
* [EMAIL PROTECTED] org.apache.cocoon.woody.binding.RepeaterJXPathBinding}
*
- * CVS $Id$
* @author Timothy Larson
+ * @version CVS $Id$
*/
public class TempRepeaterJXPathBinding extends JXPathBindingBase {
private final String repeaterId;
private final String repeaterPath;
private final String rowPath;
-// private final String rowPathInsert;
+ private final String rowPathInsert;
private final boolean clearOnLoad;
private final JXPathBindingBase rowBinding;
private final JXPathBindingBase insertRowBinding;
@@ -92,7 +92,7 @@
this.repeaterId = repeaterId;
this.repeaterPath = repeaterPath;
this.rowPath = rowPath;
-// this.rowPathInsert = rowPathInsert;
+ this.rowPathInsert = rowPathInsert;
this.rowBinding = rowBinding;
this.rowBinding.setParent(this);
this.insertRowBinding = insertBinding;
@@ -104,7 +104,7 @@
public void doLoad(Widget frmModel, JXPathContext jctx) {
// Find the repeater and clear it
Repeater repeater = (Repeater) frmModel.getWidget(this.repeaterId);
-
+
// TODO: RAD
if (repeater == null) {
throw new RuntimeException(
@@ -120,7 +120,7 @@
Pointer ptr = jctx.getPointer(this.repeaterPath);
if (ptr.getNode() != null) {
// There are some nodes to load from
-
+
JXPathContext repeaterContext = jctx.getRelativeContext(ptr);
// build a jxpath iterator for pointers
Iterator rowPointers =
repeaterContext.iteratePointers(this.rowPath);
@@ -136,11 +136,11 @@
thisRow = repeater.addRow();
}
rowNum++;
-
+
// make a jxpath sub context on the iterated element
Pointer jxp = (Pointer) rowPointers.next();
JXPathContext rowContext =
repeaterContext.getRelativeContext(jxp);
-
+
this.rowBinding.loadFormFromModel(thisRow, rowContext);
}
}
@@ -159,7 +159,7 @@
} else {
// Repeater is not empty
-
+
// Move to repeater context and create the path if needed
JXPathContext repeaterContext =
jctx.getRelativeContext(jctx.createPath(this.repeaterPath));
@@ -209,7 +209,7 @@
public void enableLogging(Logger logger) {
super.enableLogging(logger);
if (this.insertRowBinding != null) {
- this.insertRowBinding.enableLogging(logger);
+ this.insertRowBinding.enableLogging(logger);
}
this.rowBinding.enableLogging(logger);
}
1.2 +4 -4
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/TempRepeaterJXPathBindingBuilder.java
Index: TempRepeaterJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/TempRepeaterJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TempRepeaterJXPathBindingBuilder.java 29 Dec 2003 06:14:48 -0000
1.1
+++ TempRepeaterJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000
1.2
@@ -56,7 +56,7 @@
/**
* An experimental simple repeater binding that will replace
* (i.e. delete then re-add all) its content.
- * Based on SimpleRepeater code.
+ * Based on SimpleRepeater code.
* <pre>
* <wb:temp-repeater
* id="contacts"
@@ -65,8 +65,8 @@
* </wb:temp-repeater>
* </pre>
*
- * CVS $Id$
* @author Timothy Larson
+ * @version CVS $Id$
*/
public class TempRepeaterJXPathBindingBuilder
extends JXpathBindingBuilderBase {
@@ -76,8 +76,8 @@
JXPathBindingManager.Assistant assistant) throws BindingException {
try {
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElem);
-
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElem);
+
String repeaterId = DomHelper.getAttribute(bindingElem, "id");
String parentPath = DomHelper.getAttribute(bindingElem,
"parent-path");
String rowPath = DomHelper.getAttribute(bindingElem, "row-path");
1.3 +5 -5
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/UnionJXPathBinding.java
Index: UnionJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/UnionJXPathBinding.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnionJXPathBinding.java 6 Jan 2004 13:43:49 -0000 1.2
+++ UnionJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.3
@@ -55,16 +55,16 @@
import org.apache.commons.jxpath.JXPathContext;
/**
- * UnionJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
- * that narrows the context towards provided childbindings.
+ * UnionJXPathBinding provides an implementation of a [EMAIL PROTECTED]
Binding}
+ * that narrows the context towards provided childbindings.
* <p>
* NOTES: <ol>
* <li>This Binding assumes that the provided widget-id points to a
* union widget.</li>
* </ol>
*
- * CVS $Id$
* @author Timothy Larson
+ * @version CVS $Id$
*/
public class UnionJXPathBinding extends ComposedJXPathBindingBase {
@@ -87,7 +87,7 @@
/**
* Narrows the scope on the form-model to the member widget-field, and
- * narrows the scope on the object-model to the member xpath-context
+ * narrows the scope on the object-model to the member xpath-context
* before continuing the binding over the child-bindings.
*/
public void doLoad(Widget frmModel, JXPathContext jxpc) {
@@ -110,7 +110,7 @@
/**
* Narrows the scope on the form-model to the member widget-field, and
- * narrows the scope on the object-model to the member xpath-context
+ * narrows the scope on the object-model to the member xpath-context
* before continuing the binding over the child-bindings.
*/
public void doSave(Widget frmModel, JXPathContext jxpc) throws
BindingException {
1.2 +5 -5
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/UnionJXPathBindingBuilder.java
Index: UnionJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/UnionJXPathBindingBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnionJXPathBindingBuilder.java 29 Dec 2003 06:14:48 -0000 1.1
+++ UnionJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000 1.2
@@ -54,9 +54,9 @@
import org.w3c.dom.Element;
/**
- * UnionJXPathBindingBuilder provides a helper class for the Factory
- * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
- * actual [EMAIL PROTECTED] UnionJXPathBinding} out of the configuration in
the
+ * UnionJXPathBindingBuilder provides a helper class for the Factory
+ * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
+ * 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>"
@@ -65,8 +65,8 @@
* </wb:union>
* </code></pre>
*
- * CVS $Id$
* @author Timothy Larson
+ * @version CVS $Id$
*/
public class UnionJXPathBindingBuilder extends JXpathBindingBuilderBase {
@@ -74,7 +74,7 @@
throws BindingException {
try {
String widgetId = DomHelper.getAttribute(bindingElm, "id");
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
String xpath = DomHelper.getAttribute(bindingElm, "path");
JXPathBindingBase[] childBindings =
assistant.makeChildBindings(bindingElm);
1.10 +4 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/ValueJXPathBinding.java
Index: ValueJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/ValueJXPathBinding.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ValueJXPathBinding.java 31 Dec 2003 14:35:49 -0000 1.9
+++ ValueJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.10
@@ -63,6 +63,8 @@
* that loads and saves the information behind a specific xpath expresion
* (pointing to an attribute or text-node) to and from a specific Woody
* widget as identified by its id.
+ *
+ * @version CVS $Id$
*/
public class ValueJXPathBinding extends JXPathBindingBase {
@@ -120,8 +122,8 @@
if (value instanceof String) {
value = convertor.convertFromString((String)value,
convertorLocale, null);
} else {
- getLogger().warn("Convertor ignored on backend-value which
isn't of type String.");
- }
+ getLogger().warn("Convertor ignored on backend-value which
isn't of type String.");
+ }
}
widget.setValue(value);
1.5 +5 -4
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/ValueJXPathBindingBuilder.java
Index: ValueJXPathBindingBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/ValueJXPathBindingBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ValueJXPathBindingBuilder.java 18 Dec 2003 07:57:21 -0000 1.4
+++ ValueJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000 1.5
@@ -60,7 +60,7 @@
/**
* ValueJXPathBindingBuilder provides a helper class for the Factory
- * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
+ * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps
construct the
* actual [EMAIL PROTECTED] ValueJXPathBinding} out of the configuration in
the
* provided configElement which looks like:
* <pre><code>
@@ -71,10 +71,11 @@
* </wb:on-update>
* </wb:value>
* </code></pre>
+ *
+ * @version CVS $Id$
*/
public class ValueJXPathBindingBuilder extends JXpathBindingBuilderBase {
-
/**
* Creates an instance of [EMAIL PROTECTED] ValueJXPathBinding} based on
the attributes
* and nested configuration of the provided bindingElm.
@@ -82,7 +83,7 @@
public JXPathBindingBase buildBinding(Element bindingElm,
JXPathBindingManager.Assistant assistant) throws BindingException {
try {
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+ CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
String xpath = DomHelper.getAttribute(bindingElm, "path");
String widgetId = DomHelper.getAttribute(bindingElm, "id");
@@ -104,7 +105,7 @@
}
ValueJXPathBinding fieldBinding =
- new ValueJXPathBinding(commonAtts,
+ new ValueJXPathBinding(commonAtts,
widgetId, xpath, updateBindings, convertor,
convertorLocale);
return fieldBinding;
