You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by sy...@apache.org on 2002/04/24 10:49:53 UTC

cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor MapStackResolver.java

sylvain     02/04/24 01:49:53

  Modified:    src/java/org/apache/cocoon/components/treeprocessor
                        MapStackResolver.java
  Log:
  Fix call-resource parameter problem reported by Konstantin
  
  Revision  Changes    Path
  1.3       +9 -6      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MapStackResolver.java	21 Apr 2002 17:39:16 -0000	1.2
  +++ MapStackResolver.java	24 Apr 2002 08:49:52 -0000	1.3
  @@ -60,7 +60,7 @@
    * Utility class for handling {...} pattern substitutions from a List of Maps.
    *
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
  - * @version CVS $Id: MapStackResolver.java,v 1.2 2002/04/21 17:39:16 vgritsenko Exp $
  + * @version CVS $Id: MapStackResolver.java,v 1.3 2002/04/24 08:49:52 sylvain Exp $
    */
   
   public abstract class MapStackResolver {
  @@ -156,9 +156,10 @@
           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(name, value);
  +            result.setParameter(
  +                ((MapStackResolver)entry.getKey()).resolve(mapStack),
  +                ((MapStackResolver)entry.getValue()).resolve(mapStack)
  +            );
           }
   
           return result;
  @@ -181,8 +182,10 @@
           Iterator iter = expressions.entrySet().iterator();
           while (iter.hasNext()) {
               Map.Entry entry = (Map.Entry)iter.next();
  -            String value = ((MapStackResolver)entry.getValue()).resolve(mapStack);
  -            result.put(entry.getKey(), value);
  +            result.put(
  +                ((MapStackResolver)entry.getKey()).resolve(mapStack),
  +                ((MapStackResolver)entry.getValue()).resolve(mapStack)
  +            );
           }
   
           return result;
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org