cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/directive Foreach.java

[geirm]

geirm       2003/12/23 06:35:48

  Modified:    src/java/org/apache/velocity/runtime/directive Foreach.java
  Log:
  fix for #25669 when
  
  #foreach(${foo} in ....)
  
  didn't work
  
  Revision  Changes    Path
  1.45      +17 -2     
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Foreach.java
  
  Index: Foreach.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Foreach.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- Foreach.java      29 Oct 2003 11:43:33 -0000      1.44
  +++ Foreach.java      23 Dec 2003 14:35:48 -0000      1.45
  @@ -65,6 +65,8 @@
   import org.apache.velocity.context.InternalContextAdapter;
   
   import org.apache.velocity.runtime.parser.node.Node;
  +import org.apache.velocity.runtime.parser.node.SimpleNode;
  +import org.apache.velocity.runtime.parser.node.ASTReference;
   
   import org.apache.velocity.exception.MethodInvocationException;
   import org.apache.velocity.exception.ParseErrorException;
  @@ -144,7 +146,20 @@
            *  else is context sensitive
            */
   
  -        elementKey = node.jjtGetChild(0).getFirstToken().image.substring(1);
  +        SimpleNode sn = (SimpleNode) node.jjtGetChild(0);
  +
  +        if (sn instanceof ASTReference)
  +        {
  +            elementKey = ((ASTReference) sn).getRootString();
  +        }
  +        else
  +        {
  +            /*
  +             * the default, error-prone way which we'll remove
  +             *  TODO : remove if all goes well
  +             */
  +            elementKey = sn.getFirstToken().image.substring(1);
  +        }
   
           /*
            * make an uberinfo - saves new's later on
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]