joerg 2004/02/03 04:26:23
Modified: src/blocks/woody/java/org/apache/cocoon/woody/binding
SetAttributeJXPathBindingBuilder.java
ContextJXPathBindingBuilder.java
SimpleRepeaterJXPathBinding.java
CaseJXPathBindingBuilder.java
InsertNodeJXPathBinding.java
ContextJXPathBinding.java
InsertBeanJXPathBindingBuilder.java
InsertNodeJXPathBindingBuilder.java
AggregateJXPathBinding.java NewJXPathBinding.java
UnionJXPathBindingBuilder.java
SetAttributeJXPathBinding.java
ClassJXPathBinding.java
InsertBeanJXPathBinding.java
ClassJXPathBindingBuilder.java
TempRepeaterJXPathBinding.java
DeleteNodeJXPathBinding.java
JXPathBindingManager.java
RepeaterJXPathBinding.java
JavaScriptJXPathBindingBuilder.java
TempRepeaterJXPathBindingBuilder.java
ComposedJXPathBindingBase.java
StructJXPathBinding.java
NewJXPathBindingBuilder.java
JavaScriptJXPathBinding.java
UnionJXPathBinding.java CaseJXPathBinding.java
SimpleRepeaterJXPathBindingBuilder.java
StructJXPathBindingBuilder.java
RepeaterJXPathBindingBuilder.java
DeleteNodeJXPathBindingBuilder.java
ValueJXPathBindingBuilder.java
ValueJXPathBinding.java
AggregateJXPathBindingBuilder.java
JXPathBindingBase.java
Added: src/blocks/woody/java/org/apache/cocoon/woody/binding
JXPathBindingBuilderBase.java
Removed: src/blocks/woody/java/org/apache/cocoon/woody/binding
JXpathBindingBuilderBase.java
Log:
renamed JXpathBindingBuilderBase to JXPathBindingBuilderBase for more
consistency
Revision Changes Path
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SetAttributeJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000
1.5
+++ SetAttributeJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000
1.6
@@ -66,7 +66,7 @@
* @version CVS $Id$
*/
public class SetAttributeJXPathBindingBuilder
- extends JXpathBindingBuilderBase {
+ extends JXPathBindingBuilderBase {
/**
@@ -78,7 +78,7 @@
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");
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContextJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000 1.5
+++ ContextJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000 1.6
@@ -66,7 +66,7 @@
*
* @version CVS $Id$
*/
-public class ContextJXPathBindingBuilder extends JXpathBindingBuilderBase {
+public class ContextJXPathBindingBuilder extends JXPathBindingBuilderBase {
/**
* Creates an instance of ContextJXPathBinding with the configured
@@ -76,7 +76,7 @@
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.8 +2 -2
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SimpleRepeaterJXPathBinding.java 3 Feb 2004 12:22:08 -0000 1.7
+++ SimpleRepeaterJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.8
@@ -78,7 +78,7 @@
private final boolean deleteIfEmpty;
public SimpleRepeaterJXPathBinding(
- JXpathBindingBuilderBase.CommonAttributes commonAtts, String
repeaterId, String repeaterPath, String rowPath, boolean clearOnLoad, boolean
deleteIfEmpty, JXPathBindingBase rowBinding) {
+ JXPathBindingBuilderBase.CommonAttributes commonAtts, String
repeaterId, String repeaterPath, String rowPath, boolean clearOnLoad, boolean
deleteIfEmpty, JXPathBindingBase rowBinding) {
super(commonAtts);
this.repeaterId = repeaterId;
this.repeaterPath = repeaterPath;
1.4 +3 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CaseJXPathBindingBuilder.java 11 Jan 2004 23:55:47 -0000 1.3
+++ CaseJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000 1.4
@@ -68,13 +68,13 @@
* @author Timothy Larson
* @version CVS $Id$
*/
-public class CaseJXPathBindingBuilder extends JXpathBindingBuilderBase {
+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.8 +2 -2
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InsertNodeJXPathBinding.java 27 Jan 2004 11:43:28 -0000 1.7
+++ InsertNodeJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.8
@@ -75,7 +75,7 @@
/**
* Constructs InsertNodeJXPathBinding
*/
- public InsertNodeJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts, DocumentFragment domTemplate) {
+ public InsertNodeJXPathBinding(JXPathBindingBuilderBase.CommonAttributes
commonAtts, DocumentFragment domTemplate) {
super(commonAtts);
this.template = domTemplate;
}
1.9 +2 -2
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ContextJXPathBinding.java 3 Feb 2004 12:22:08 -0000 1.8
+++ ContextJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.9
@@ -71,7 +71,7 @@
/**
* Constructs ContextJXPathBinding for the specified xpath sub-context
*/
- public ContextJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts, String contextPath, JXPathBindingBase[] childBindings) {
+ public ContextJXPathBinding(JXPathBindingBuilderBase.CommonAttributes
commonAtts, String contextPath, JXPathBindingBase[] childBindings) {
super(commonAtts, childBindings);
this.xpath = contextPath;
}
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InsertBeanJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000
1.5
+++ InsertBeanJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000
1.6
@@ -65,7 +65,7 @@
*
* @version CVS $Id$
*/
-public class InsertBeanJXPathBindingBuilder extends JXpathBindingBuilderBase
{
+public class InsertBeanJXPathBindingBuilder extends JXPathBindingBuilderBase
{
/**
* Creates an instance of [EMAIL PROTECTED] InsertBeanJXPathBinding}
configured
@@ -74,7 +74,7 @@
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");
1.8 +3 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InsertNodeJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000
1.7
+++ InsertNodeJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000
1.8
@@ -73,7 +73,7 @@
* @version CVS $Id$
*/
public class InsertNodeJXPathBindingBuilder
- extends JXpathBindingBuilderBase {
+ extends JXPathBindingBuilderBase {
/**
* Creates an instance of [EMAIL PROTECTED] InsertNodeJXPathBinding}
configured
@@ -84,7 +84,7 @@
JXPathBindingManager.Assistant assistant) throws BindingException {
try {
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+ CommonAttributes commonAtts =
JXPathBindingBuilderBase.getCommonAttributes(bindingElm);
DocumentFragment domTemplate = null;
1.8 +2 -2
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AggregateJXPathBinding.java 3 Feb 2004 12:22:08 -0000 1.7
+++ AggregateJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.8
@@ -77,7 +77,7 @@
* @param xpath
* @param childBindings
*/
- public AggregateJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts, String widgetId, String xpath, JXPathBindingBase[] childBindings) {
+ public AggregateJXPathBinding(JXPathBindingBuilderBase.CommonAttributes
commonAtts, String widgetId, String xpath, JXPathBindingBase[] childBindings) {
super(commonAtts, childBindings);
this.widgetId = widgetId;
this.xpath = xpath;
1.5 +2 -2
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NewJXPathBinding.java 3 Feb 2004 12:22:08 -0000 1.4
+++ NewJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.5
@@ -77,7 +77,7 @@
* @param widgetId
* @param childBindings
*/
- public NewJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts, String widgetId, JXPathBindingBase[] childBindings) {
+ public NewJXPathBinding(JXPathBindingBuilderBase.CommonAttributes
commonAtts, String widgetId, JXPathBindingBase[] childBindings) {
super(commonAtts, childBindings);
this.widgetId = widgetId;
this.classBinding = null;
1.3 +3 -3
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnionJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000 1.2
+++ UnionJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000 1.3
@@ -68,13 +68,13 @@
* @author Timothy Larson
* @version CVS $Id$
*/
-public class UnionJXPathBindingBuilder extends JXpathBindingBuilderBase {
+public class UnionJXPathBindingBuilder 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.6 +2 -2
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SetAttributeJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.5
+++ SetAttributeJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.6
@@ -71,7 +71,7 @@
/**
* Constructs SetAttributeJXPathBinding
*/
- public
SetAttributeJXPathBinding(JXpathBindingBuilderBase.CommonAttributes commonAtts,
String attName, String attValue) {
+ public
SetAttributeJXPathBinding(JXPathBindingBuilderBase.CommonAttributes commonAtts,
String attName, String attValue) {
super(commonAtts);
this.name = attName;
this.value = attValue;
1.3 +2 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClassJXPathBinding.java 11 Jan 2004 20:51:15 -0000 1.2
+++ ClassJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.3
@@ -74,7 +74,7 @@
* @param widgetId
* @param childBindings
*/
- public ClassJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts, String widgetId, JXPathBindingBase[] childBindings) {
+ public ClassJXPathBinding(JXPathBindingBuilderBase.CommonAttributes
commonAtts, String widgetId, JXPathBindingBase[] childBindings) {
super(commonAtts, childBindings);
this.widgetId = widgetId;
}
1.8 +2 -2
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InsertBeanJXPathBinding.java 27 Jan 2004 11:43:29 -0000 1.7
+++ InsertBeanJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.8
@@ -75,7 +75,7 @@
/**
* Constructs InsertBeanJXPathBinding
*/
- public InsertBeanJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts, String className, String addMethod) {
+ public InsertBeanJXPathBinding(JXPathBindingBuilderBase.CommonAttributes
commonAtts, String className, String addMethod) {
super(commonAtts);
this.className = className;
this.addMethodName = addMethod;
1.3 +3 -3
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClassJXPathBindingBuilder.java 11 Jan 2004 20:51:15 -0000 1.2
+++ ClassJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000 1.3
@@ -69,13 +69,13 @@
* @version CVS $Id$
*/
public class ClassJXPathBindingBuilder
- extends JXpathBindingBuilderBase {
+ 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);
JXPathBindingBase[] childBindings =
assistant.makeChildBindings(bindingElm);
1.6 +2 -2
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TempRepeaterJXPathBinding.java 3 Feb 2004 12:22:08 -0000 1.5
+++ TempRepeaterJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.6
@@ -84,7 +84,7 @@
private final boolean virtualRows;
public TempRepeaterJXPathBinding(
- JXpathBindingBuilderBase.CommonAttributes commonAtts,
+ JXPathBindingBuilderBase.CommonAttributes commonAtts,
String repeaterId, String repeaterPath,
String rowPath, String rowPathInsert,
boolean virtualRows, boolean clearOnLoad, boolean deleteIfEmpty,
1.5 +2 -2
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeleteNodeJXPathBinding.java 11 Jan 2004 20:51:16 -0000 1.4
+++ DeleteNodeJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.5
@@ -66,7 +66,7 @@
*/
public class DeleteNodeJXPathBinding extends JXPathBindingBase {
- public DeleteNodeJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts) {
+ public DeleteNodeJXPathBinding(JXPathBindingBuilderBase.CommonAttributes
commonAtts) {
super(commonAtts);
}
1.17 +5 -5
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JXPathBindingManager.java 3 Feb 2004 12:22:08 -0000 1.16
+++ JXPathBindingManager.java 3 Feb 2004 12:26:21 -0000 1.17
@@ -100,7 +100,7 @@
}
public void initialize() throws Exception {
- bindingBuilderSelector = new SimpleServiceSelector("binding",
JXpathBindingBuilderBase.class);
+ bindingBuilderSelector = new SimpleServiceSelector("binding",
JXPathBindingBuilderBase.class);
bindingBuilderSelector.enableLogging(getLogger());
bindingBuilderSelector.configure(configuration.getChild("bindings"));
}
@@ -207,9 +207,9 @@
*/
public class Assistant {
- private JXpathBindingBuilderBase getBindingBuilder(String
bindingType) throws BindingException {
+ private JXPathBindingBuilderBase getBindingBuilder(String
bindingType) throws BindingException {
try {
- return (JXpathBindingBuilderBase)
bindingBuilderSelector.select(bindingType);
+ return (JXPathBindingBuilderBase)
bindingBuilderSelector.select(bindingType);
} catch (ServiceException e) {
throw new BindingException("Cannot handle binding element
with name \"" + bindingType + "\".", e);
}
@@ -221,7 +221,7 @@
*/
public JXPathBindingBase getBindingForConfigurationElement(Element
configElm) throws BindingException {
String bindingType = configElm.getLocalName();
- JXpathBindingBuilderBase bindingBuilder =
getBindingBuilder(bindingType);
+ JXPathBindingBuilderBase bindingBuilder =
getBindingBuilder(bindingType);
JXPathBindingBase childBinding =
bindingBuilder.buildBinding(configElm, this);
return childBinding;
}
1.19 +6 -6
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- RepeaterJXPathBinding.java 3 Feb 2004 12:22:08 -0000 1.18
+++ RepeaterJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.19
@@ -89,7 +89,7 @@
/**
* Constructs RepeaterJXPathBinding
*/
- public RepeaterJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts,
+ public RepeaterJXPathBinding(JXPathBindingBuilderBase.CommonAttributes
commonAtts,
String repeaterId, String repeaterPath,
String rowPath, String rowPathForInsert,
String uniqueRowId, String uniqueRowPath,
@@ -101,7 +101,7 @@
/**
* Constructs RepeaterJXPathBinding
*/
- public RepeaterJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts,
+ public RepeaterJXPathBinding(JXPathBindingBuilderBase.CommonAttributes
commonAtts,
String repeaterId, String repeaterPath,
String rowPath, String rowPathForInsert,
String uniqueRowId, String uniqueRowPath,
@@ -116,16 +116,16 @@
this.uniqueRowId = uniqueRowId;
this.uniqueRowIdPath = uniqueRowPath;
this.uniqueFieldBinding =
- new
ValueJXPathBinding(JXpathBindingBuilderBase.CommonAttributes.DEFAULT,
uniqueRowId, uniqueRowPath, null, convertor, convertorLocale);
+ new
ValueJXPathBinding(JXPathBindingBuilderBase.CommonAttributes.DEFAULT,
uniqueRowId, uniqueRowPath, null, convertor, convertorLocale);
this.uniqueRowIdConvertor = convertor;
this.uniqueRowIdConvertorLocale = convertorLocale;
- this.rowBinding = new
ComposedJXPathBindingBase(JXpathBindingBuilderBase.CommonAttributes.DEFAULT,
childBindings);
+ this.rowBinding = new
ComposedJXPathBindingBase(JXPathBindingBuilderBase.CommonAttributes.DEFAULT,
childBindings);
this.rowBinding.setParent(this);
this.insertRowBinding = insertBinding;
if (this.insertRowBinding != null) {
this.insertRowBinding.setParent(this);
}
- this.deleteRowBinding = new
ComposedJXPathBindingBase(JXpathBindingBuilderBase.CommonAttributes.DEFAULT,
deleteBindings);
+ this.deleteRowBinding = new
ComposedJXPathBindingBase(JXPathBindingBuilderBase.CommonAttributes.DEFAULT,
deleteBindings);
if (this.deleteRowBinding != null) {
this.deleteRowBinding.setParent(this);
}
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JavaScriptJXPathBindingBuilder.java 21 Jan 2004 21:03:16 -0000
1.5
+++ JavaScriptJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000
1.6
@@ -89,11 +89,11 @@
* @author <a href="http://www.apache.org/~sylvain/";>Sylvain Wallez</a>
* @version CVS $Id$
*/
-public class JavaScriptJXPathBindingBuilder extends JXpathBindingBuilderBase
{
+public class JavaScriptJXPathBindingBuilder extends JXPathBindingBuilderBase
{
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");
1.4 +5 -5
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TempRepeaterJXPathBindingBuilder.java 27 Jan 2004 05:50:08 -0000
1.3
+++ TempRepeaterJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000
1.4
@@ -69,14 +69,14 @@
* @version CVS $Id$
*/
public class TempRepeaterJXPathBindingBuilder
- extends JXpathBindingBuilderBase {
+ extends JXPathBindingBuilderBase {
public JXPathBindingBase buildBinding(
Element bindingElem,
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");
@@ -101,8 +101,8 @@
return new TempRepeaterJXPathBinding(
commonAtts, repeaterId, parentPath, rowPath, rowPathInsert,
virtualRows, clearOnLoad, deleteIfEmpty,
- new
ComposedJXPathBindingBase(JXpathBindingBuilderBase.CommonAttributes.DEFAULT,
childBindings),
- new
ComposedJXPathBindingBase(JXpathBindingBuilderBase.CommonAttributes.DEFAULT,
insertBindings));
+ new
ComposedJXPathBindingBase(JXPathBindingBuilderBase.CommonAttributes.DEFAULT,
childBindings),
+ new
ComposedJXPathBindingBase(JXPathBindingBuilderBase.CommonAttributes.DEFAULT,
insertBindings));
} catch (BindingException e) {
throw e;
} catch (Exception e) {
1.8 +2 -2
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ComposedJXPathBindingBase.java 3 Feb 2004 12:22:08 -0000 1.7
+++ ComposedJXPathBindingBase.java 3 Feb 2004 12:26:21 -0000 1.8
@@ -71,7 +71,7 @@
*
* @param childBindings sets the array of childBindings
*/
- protected
ComposedJXPathBindingBase(JXpathBindingBuilderBase.CommonAttributes commonAtts,
JXPathBindingBase[] childBindings) {
+ protected
ComposedJXPathBindingBase(JXPathBindingBuilderBase.CommonAttributes commonAtts,
JXPathBindingBase[] childBindings) {
super(commonAtts);
this.subBindings = childBindings;
if (this.subBindings != null) {
1.6 +2 -2
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StructJXPathBinding.java 3 Feb 2004 12:22:08 -0000 1.5
+++ StructJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.6
@@ -78,7 +78,7 @@
* @param xpath
* @param childBindings
*/
- public StructJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts, String widgetId, String xpath, JXPathBindingBase[] childBindings) {
+ public StructJXPathBinding(JXPathBindingBuilderBase.CommonAttributes
commonAtts, String widgetId, String xpath, JXPathBindingBase[] childBindings) {
super(commonAtts, childBindings);
this.widgetId = widgetId;
this.xpath = xpath;
1.3 +3 -3
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NewJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000 1.2
+++ NewJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000 1.3
@@ -69,13 +69,13 @@
* @version CVS $Id$
*/
public class NewJXPathBindingBuilder
- extends JXpathBindingBuilderBase {
+ 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);
JXPathBindingBase[] childBindings =
assistant.makeChildBindings(bindingElm);
1.7 +2 -2
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JavaScriptJXPathBinding.java 17 Jan 2004 14:55:17 -0000 1.6
+++ JavaScriptJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.7
@@ -75,7 +75,7 @@
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;
1.6 +2 -2
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UnionJXPathBinding.java 3 Feb 2004 12:22:08 -0000 1.5
+++ UnionJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.6
@@ -79,7 +79,7 @@
* @param xpath
* @param childBindings
*/
- public UnionJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts, String widgetId, String xpath, JXPathBindingBase[] childBindings) {
+ public UnionJXPathBinding(JXPathBindingBuilderBase.CommonAttributes
commonAtts, String widgetId, String xpath, JXPathBindingBase[] childBindings) {
super(commonAtts, childBindings);
this.widgetId = widgetId;
this.xpath = xpath;
1.6 +2 -2
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CaseJXPathBinding.java 3 Feb 2004 12:22:08 -0000 1.5
+++ CaseJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.6
@@ -79,7 +79,7 @@
* @param xpath
* @param childBindings
*/
- public CaseJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts, String widgetId, String xpath, JXPathBindingBase[] childBindings) {
+ public CaseJXPathBinding(JXPathBindingBuilderBase.CommonAttributes
commonAtts, String widgetId, String xpath, JXPathBindingBase[] childBindings) {
super(commonAtts, childBindings);
this.widgetId = widgetId;
this.xpath = xpath;
1.7 +4 -4
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SimpleRepeaterJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000
1.6
+++ SimpleRepeaterJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000
1.7
@@ -68,14 +68,14 @@
* @version CVS $Id$
*/
public class SimpleRepeaterJXPathBindingBuilder
- extends JXpathBindingBuilderBase {
+ extends JXPathBindingBuilderBase {
public JXPathBindingBase buildBinding(
Element bindingElem,
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");
@@ -86,7 +86,7 @@
JXPathBindingBase[] childBindings =
assistant.makeChildBindings(bindingElem);
return new SimpleRepeaterJXPathBinding( commonAtts, repeaterId,
parentPath, rowPath, clearOnLoad, deleteIfEmpty,
- new
ComposedJXPathBindingBase(JXpathBindingBuilderBase.CommonAttributes.DEFAULT,
childBindings));
+ new
ComposedJXPathBindingBase(JXPathBindingBuilderBase.CommonAttributes.DEFAULT,
childBindings));
} catch (BindingException e) {
throw e;
} catch (Exception e) {
1.3 +3 -3
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StructJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000 1.2
+++ StructJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000 1.3
@@ -69,13 +69,13 @@
* @version CVS $Id$
*/
public class StructJXPathBindingBuilder
- extends JXpathBindingBuilderBase {
+ 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.11 +3 -3
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RepeaterJXPathBindingBuilder.java 13 Jan 2004 01:40:46 -0000 1.10
+++ RepeaterJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000 1.11
@@ -89,7 +89,7 @@
* @version CVS $Id$
*/
public class RepeaterJXPathBindingBuilder
- extends JXpathBindingBuilderBase {
+ extends JXPathBindingBuilderBase {
/**
* Creates an instance of [EMAIL PROTECTED] RepeaterJXPathBinding}
according to the
@@ -104,7 +104,7 @@
JXPathBindingManager.Assistant assistant) throws BindingException {
try {
- CommonAttributes commonAtts =
JXpathBindingBuilderBase.getCommonAttributes(bindingElm);
+ CommonAttributes commonAtts =
JXPathBindingBuilderBase.getCommonAttributes(bindingElm);
String repeaterId = DomHelper.getAttribute(bindingElm, "id");
String parentPath =
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DeleteNodeJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000
1.5
+++ DeleteNodeJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000
1.6
@@ -65,13 +65,13 @@
* @version CVS $Id$
*/
public class DeleteNodeJXPathBindingBuilder
- extends JXpathBindingBuilderBase {
+ extends JXPathBindingBuilderBase {
/**
* 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.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ValueJXPathBindingBuilder.java 11 Jan 2004 20:51:16 -0000 1.5
+++ ValueJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000 1.6
@@ -74,7 +74,7 @@
*
* @version CVS $Id$
*/
-public class ValueJXPathBindingBuilder extends JXpathBindingBuilderBase {
+public class ValueJXPathBindingBuilder extends JXPathBindingBuilderBase {
/**
* Creates an instance of [EMAIL PROTECTED] ValueJXPathBinding} based on
the attributes
@@ -83,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");
1.12 +3 -3
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ValueJXPathBinding.java 3 Feb 2004 12:22:08 -0000 1.11
+++ ValueJXPathBinding.java 3 Feb 2004 12:26:21 -0000 1.12
@@ -100,12 +100,12 @@
*
* @param convertor may be null
*/
- public ValueJXPathBinding(JXpathBindingBuilderBase.CommonAttributes
commonAtts, String widgetId, String xpath, JXPathBindingBase[] updateBindings,
+ public ValueJXPathBinding(JXPathBindingBuilderBase.CommonAttributes
commonAtts, String widgetId, String xpath, JXPathBindingBase[] updateBindings,
Convertor convertor, Locale convertorLocale) {
super(commonAtts);
this.fieldId = widgetId;
this.xpath = xpath;
- this.updateBinding = new
ComposedJXPathBindingBase(JXpathBindingBuilderBase.CommonAttributes.DEFAULT,
updateBindings);
+ this.updateBinding = new
ComposedJXPathBindingBase(JXPathBindingBuilderBase.CommonAttributes.DEFAULT,
updateBindings);
this.convertor = convertor;
this.convertorLocale = convertorLocale;
}
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AggregateJXPathBindingBuilder.java 11 Jan 2004 20:51:15 -0000
1.5
+++ AggregateJXPathBindingBuilder.java 3 Feb 2004 12:26:21 -0000
1.6
@@ -67,12 +67,12 @@
* @version CVS $Id$
*/
public class AggregateJXPathBindingBuilder
- extends JXpathBindingBuilderBase {
+ extends JXPathBindingBuilderBase {
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.12 +4 -4
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JXPathBindingBase.java 3 Feb 2004 12:22:08 -0000 1.11
+++ JXPathBindingBase.java 3 Feb 2004 12:26:21 -0000 1.12
@@ -77,7 +77,7 @@
/**
* Object holding the values of the common objects on all Bindings.
*/
- private final JXpathBindingBuilderBase.CommonAttributes commonAtts;
+ private final JXPathBindingBuilderBase.CommonAttributes commonAtts;
/**
* Parent binding of this binding.
@@ -90,10 +90,10 @@
protected Map classes;
private JXPathBindingBase() {
- this(JXpathBindingBuilderBase.CommonAttributes.DEFAULT);
+ this(JXPathBindingBuilderBase.CommonAttributes.DEFAULT);
}
- protected JXPathBindingBase(JXpathBindingBuilderBase.CommonAttributes
commonAtts) {
+ protected JXPathBindingBase(JXPathBindingBuilderBase.CommonAttributes
commonAtts) {
this.commonAtts = commonAtts;
}
1.1
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JXPathBindingBuilderBase.java
Index: JXPathBindingBuilderBase.java
===================================================================
/*
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.cocoon.woody.binding;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.woody.util.DomHelper;
import org.w3c.dom.Element;
/**
* 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: JXPathBindingBuilderBase.java,v 1.1 2004/02/03 12:26:21
joerg Exp $
*/
public abstract class JXPathBindingBuilderBase implements LogEnabled {
private Logger logger;
/**
* Receives the Avalon logger to use.
*/
public void enableLogging(Logger logger) {
this.logger = logger;
logger.debug("JXPathBindingBuilderBase got logger...");
}
/**
* Makes the logger available to the subclasses.
* @return Logger
*/
protected Logger getLogger() {
return this.logger;
}
/**
* Builds a configured binding object based on the configuration as
* described in the bindingElement. The BuilderMap can be used to
* find appropriate builders for possible subBinders.
*
* @param bindingElm
* @param assistant
* @return JXPathBindingBase
*/
public abstract JXPathBindingBase buildBinding(
Element bindingElm,
JXPathBindingManager.Assistant assistant) throws BindingException;
/**
* Helper method for interpreting the common attributes which are
supported
* on each of the Bindings. These are
* <br>
* <code>@direction</code> can hold one of the following values:
* <ol><li><code>'load'</code>: This binding will only load.</li>
* <li><code>'save'</code>: This binding will only save.</li>
* <li><code>'both'</code>: This binding will perform both
operations.</li>
* </ol>
* <br>
* <code>@lenient</code> can either be:
* <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
* 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>
* </ol>
* @param bindingElm
* @return an instance of CommonAttributes
* @throws BindingException
*/
static CommonAttributes getCommonAttributes(Element bindingElm) throws
BindingException {
try {
//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)
+ "\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)
+ "\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;
} catch (Exception e) {
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
* 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);
CommonAttributes(String direction, String leniency){
this(isLoadEnabled(direction), isSaveEnabled(direction),
decideLeniency(leniency));
}
CommonAttributes(boolean loadEnabled, boolean saveEnabled, Boolean
leniency){
this.loadEnabled = loadEnabled;
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) {
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) {
return "both".equals(direction) || "save".equals(direction);
}
/**
* 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
*/
private static Boolean decideLeniency(String leniency) {
if (leniency == null) return null;
return new Boolean(leniency);
}
}
}
