vgritsenko 02/04/21 10:39:16
Modified: src/java/org/apache/cocoon/components/treeprocessor
DefaultTreeBuilder.java MapStackResolver.java
Log:
fix bug: substitute parameter names
Revision Changes Path
1.5 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
Index: DefaultTreeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultTreeBuilder.java 13 Apr 2002 08:28:33 -0000 1.4
+++ DefaultTreeBuilder.java 21 Apr 2002 17:39:16 -0000 1.5
@@ -93,7 +93,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: DefaultTreeBuilder.java,v 1.4 2002/04/13 08:28:33 sylvain Exp $
+ * @version CVS $Id: DefaultTreeBuilder.java,v 1.5 2002/04/21 17:39:16 vgritsenko
Exp $
*/
public class DefaultTreeBuilder extends AbstractLoggable implements TreeBuilder,
@@ -499,9 +499,10 @@
for (int i = 0; i < children.length; i++) {
Configuration child = children[i];
if (true) { // FIXME : check namespace
+ String name = child.getAttribute("name");
String value = child.getAttribute("value");
try {
- params.put(child.getAttribute("name"),
MapStackResolver.getResolver(value));
+ params.put(MapStackResolver.getResolver(name),
MapStackResolver.getResolver(value));
} catch(PatternException pe) {
String msg = "Invalid pattern '" + value + "' at " +
child.getLocation();
getLogger().error(msg, pe);
1.2 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/MapStackResolver.java
Index: MapStackResolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/MapStackResolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MapStackResolver.java 5 Mar 2002 08:26:22 -0000 1.1
+++ MapStackResolver.java 21 Apr 2002 17:39:16 -0000 1.2
@@ -60,7 +60,7 @@
* Utility class for handling {...} pattern substitutions from a List of Maps.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: MapStackResolver.java,v 1.1 2002/03/05 08:26:22 sylvain Exp $
+ * @version CVS $Id: MapStackResolver.java,v 1.2 2002/04/21 17:39:16 vgritsenko Exp
$
*/
public abstract class MapStackResolver {
@@ -156,8 +156,9 @@
Iterator iter = expressions.entrySet().iterator();
while (iter.hasNext()) {
Map.Entry entry = (Map.Entry)iter.next();
+ String name = ((MapStackResolver)entry.getKey()).resolve(mapStack);
String value = ((MapStackResolver)entry.getValue()).resolve(mapStack);
- result.setParameter((String)entry.getKey(), value);
+ result.setParameter(name, value);
}
return result;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
