cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node NodeUtils.java

[jvanzyl]

jvanzyl     00/11/27 18:53:36

  Modified:    src/java/org/apache/velocity/runtime/parser/node
                        NodeUtils.java
  Log:
  - added support for:
  
    $image.getURI("${image}.jpg")
  
    so now formal references will be interpolated correctly.
  
  Revision  Changes    Path
  1.7       +4 -2      
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java
  
  Index: NodeUtils.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- NodeUtils.java    2000/11/28 02:29:12     1.6
  +++ NodeUtils.java    2000/11/28 02:53:33     1.7
  @@ -62,7 +62,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
  - * @version $Id: NodeUtils.java,v 1.6 2000/11/28 02:29:12 jvanzyl Exp $
  + * @version $Id: NodeUtils.java,v 1.7 2000/11/28 02:53:33 jvanzyl Exp $
    */
   public class NodeUtils
   {
  @@ -123,8 +123,10 @@
                       for (++cIdx ; cIdx < argStr.length(); ++cIdx)
                       {
                           ch = argStr.charAt(cIdx);
  -                        if (ch == '_' || Character.isLetterOrDigit(ch))
  +                        if (ch == '_' || ch == '-' || Character.isLetterOrDigit(ch))
                               nameBuf.append(ch);
  +                        else if (ch == '{' || ch == '}')
  +                            continue;  
                           else
                               break;
                       }