sylvain 02/02/05 12:32:50
Modified: src/scratchpad/src/org/apache/cocoon/treeprocessor/sitemap
ActionSetNode.java SelectNodeBuilder.java
Log:
Fixes for bugs #6252 and #6253
Submitted by Peter Royal [[EMAIL PROTECTED]]
Revision Changes Path
1.5 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/treeprocessor/sitemap/ActionSetNode.java
Index: ActionSetNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/treeprocessor/sitemap/ActionSetNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ActionSetNode.java 4 Feb 2002 14:39:53 -0000 1.4
+++ ActionSetNode.java 5 Feb 2002 20:32:50 -0000 1.5
@@ -78,7 +78,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: ActionSetNode.java,v 1.4 2002/02/04 14:39:53 cziegeler Exp $
+ * @version CVS $Id: ActionSetNode.java,v 1.5 2002/02/05 20:32:50 sylvain Exp $
*/
public class ActionSetNode extends SimpleSelectorProcessingNode
@@ -152,7 +152,7 @@
} else {
- action = (Action)this.selector.select(this.componentName);
+ action = (Action)this.selector.select(this.types[i]);
try {
actionResult = action.act(
redirector, resolver, objectModel, source, params);
1.5 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/treeprocessor/sitemap/SelectNodeBuilder.java
Index: SelectNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/treeprocessor/sitemap/SelectNodeBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SelectNodeBuilder.java 4 Feb 2002 14:39:53 -0000 1.4
+++ SelectNodeBuilder.java 5 Feb 2002 20:32:50 -0000 1.5
@@ -74,7 +74,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: SelectNodeBuilder.java,v 1.4 2002/02/04 14:39:53 cziegeler Exp
$
+ * @version CVS $Id: SelectNodeBuilder.java,v 1.5 2002/02/05 20:32:50 sylvain Exp $
*/
public class SelectNodeBuilder extends AbstractParentProcessingNodeBuilder
implements ThreadSafe {
@@ -109,7 +109,7 @@
whenTests.add(MapStackResolver.getResolver(childConfig.getAttribute("test")));
whenChildren.add(buildChildNodes(childConfig));
- } else if ("otherwhise".equals(name)) {
+ } else if ("otherwise".equals(name)) {
checkNamespace(childConfig);
if (otherwhiseNodes != null) {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
