You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ge...@apache.org on 2001/03/19 19:53:58 UTC

cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node ASTReference.java ASTStringLiteral.java ASTText.java ASTTrue.java ASTVariable.java ASTWord.java ASTprocess.java AbstractExecutor.java GetExecutor.java NodeUtils.java ParserVisitor.java PropertyExecutor.java

geirm       01/03/19 10:53:57

  Modified:    src/java/org/apache/velocity/runtime/parser/node
                        ASTReference.java ASTStringLiteral.java
                        ASTText.java ASTTrue.java ASTVariable.java
                        ASTWord.java ASTprocess.java AbstractExecutor.java
                        GetExecutor.java NodeUtils.java ParserVisitor.java
                        PropertyExecutor.java
  Log:
  more doc, licence, and package - no functional
  
  Revision  Changes    Path
  1.23      +3 -6      jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
  
  Index: ASTReference.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ASTReference.java	2001/03/19 17:16:42	1.22
  +++ ASTReference.java	2001/03/19 18:53:52	1.23
  @@ -1,11 +1,9 @@
   package org.apache.velocity.runtime.parser.node;
   
  -/* Generated By:JJTree: Do not edit this line. ASTReference.java */
  -
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -27,7 +25,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  @@ -80,9 +78,8 @@
    * @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
    * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
    * @author <a href="mailto:Christoph.Reck@dlr.de">Christoph Reck</a>
  - * @version $Id: ASTReference.java,v 1.22 2001/03/19 17:16:42 geirm Exp $ 
  + * @version $Id: ASTReference.java,v 1.23 2001/03/19 18:53:52 geirm Exp $ 
   */
  -
   public class ASTReference extends SimpleNode
   {
       /* Reference types */
  
  
  
  1.9       +34 -25    jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
  
  Index: ASTStringLiteral.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ASTStringLiteral.java	2001/02/27 03:24:23	1.8
  +++ ASTStringLiteral.java	2001/03/19 18:53:52	1.9
  @@ -1,9 +1,9 @@
  -/* Generated By:JJTree: Do not edit this line. ASTStringLiteral.java */
  +package org.apache.velocity.runtime.parser.node;
   
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -25,7 +25,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  @@ -54,16 +54,6 @@
    * <http://www.apache.org/>.
    */
   
  -/**
  - * ASTStringLiteral support.  Will interpolate!
  - *
  - * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  - * @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
  - * @version $Id: ASTStringLiteral.java,v 1.8 2001/02/27 03:24:23 geirm Exp $
  - */
  -
  -package org.apache.velocity.runtime.parser.node;
  -
   import org.apache.velocity.context.InternalContextAdapter;
   import org.apache.velocity.runtime.parser.Parser;
   
  @@ -71,6 +61,13 @@
   import java.io.ByteArrayInputStream;
   import org.apache.velocity.runtime.Runtime;
   
  +/**
  + * ASTStringLiteral support.  Will interpolate!
  + *
  + * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  + * @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
  + * @version $Id: ASTStringLiteral.java,v 1.9 2001/03/19 18:53:52 geirm Exp $
  + */
   public class ASTStringLiteral extends SimpleNode
   {
       /* cache the value of the interpolation switch */
  @@ -90,8 +87,8 @@
       }
       
       /**
  -     *  init : we don't have to do much.  Init the tree (there shouldn't be
  -     *  one ) and then see if interpolation is turned on.
  +     *  init : we don't have to do much.  Init the tree (there 
  +     *  shouldn't be one ) and then see if interpolation is turned on.
        */
       public Object init( InternalContextAdapter context, Object data) 
           throws Exception
  @@ -103,23 +100,27 @@
           super.init( context, data );
   
           /*
  -         *  the stringlit is set at template parse time, so we can do this here for now.
  -         *  if things change and we can somehow create stringlits at runtime, this must
  +         *  the stringlit is set at template parse time, so we can 
  +         *  do this here for now.  if things change and we can somehow 
  +         * create stringlits at runtime, this must
            *  move to the runtime execution path
            *
  -         *  so, only if interpolation is turned on AND it starts with a " AND it has a 
  -         *  directive or reference, then we can  interpolate.  Otherwise, don't bother.
  +         *  so, only if interpolation is turned on AND it starts 
  +         *  with a " AND it has a  directive or reference, then we 
  +         *  can  interpolate.  Otherwise, don't bother.
            */
   
           interpolate = Runtime.getBoolean(Runtime.INTERPOLATE_STRINGLITERALS , true)
               && getFirstToken().image.startsWith("\"")
  -            && ( (getFirstToken().image.indexOf("$") != -1 ) || ( getFirstToken().image.indexOf("#") != -1 ));
  +            && ( (getFirstToken().image.indexOf("$") != -1 ) 
  +                 || ( getFirstToken().image.indexOf("#") != -1 ));
   
           /*
            *  get the contents of the string, minus the '/" at each end
            */
           
  -        image = getFirstToken().image.substring(1, getFirstToken().image.length() - 1);
  +        image = getFirstToken().image.substring(1, 
  +                                                getFirstToken().image.length() - 1);
   
           /*
            * tack a space on the end (dreaded <MORE> kludge)
  @@ -155,13 +156,17 @@
                   if (nodeTree == null)
                   {
                      
  -                    ByteArrayInputStream inStream = new ByteArrayInputStream( interpolateimage.getBytes() );
  +                    ByteArrayInputStream inStream 
  +                        = new ByteArrayInputStream( 
  +                                interpolateimage.getBytes() );
     
                       /*
                        *  parse the stringlit
                        */
                       
  -                    nodeTree = Runtime.parse( inStream, context.getCurrentTemplateName() );        
  +                    nodeTree 
  +                        = Runtime.parse( inStream, 
  +                                         context.getCurrentTemplateName() );        
                   
                       /*
                        *  init with context. It won't modify anything
  @@ -192,13 +197,17 @@
               }
               catch( Exception e )
               {
  -                /* eh.  If anything wrong, just punt and output the literal */
  +                /* 
  +                 *  eh.  If anything wrong, just punt 
  +                 *  and output the literal 
  +                 */
                   Runtime.error("Error in interpolating string literal : " + e );
               }
           }
           
           /*
  -         *  ok, either not allowed to interpolate, there wasn't a ref or directive, or we failed, so
  +         *  ok, either not allowed to interpolate, there wasn't 
  +         *  a ref or directive, or we failed, so
            *  just output the literal
            */
   
  
  
  
  1.7       +13 -6     jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTText.java
  
  Index: ASTText.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTText.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ASTText.java	2001/03/19 01:36:30	1.6
  +++ ASTText.java	2001/03/19 18:53:52	1.7
  @@ -1,8 +1,9 @@
  -/* Generated By:JJTree: Do not edit this line. ASTText.java */
  +package org.apache.velocity.runtime.parser.node;
  +
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -24,7 +25,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  @@ -53,8 +54,6 @@
    * <http://www.apache.org/>.
    */
   
  -package org.apache.velocity.runtime.parser.node;
  -
   import java.io.Writer;
   import java.io.IOException;
   
  @@ -82,7 +81,8 @@
           return visitor.visit(this, data);
       }
   
  -    public Object init( InternalContextAdapter context, Object data) throws Exception
  +    public Object init( InternalContextAdapter context, Object data) 
  +        throws Exception
       {
           Token t = getFirstToken();
   
  @@ -100,3 +100,10 @@
           return true;
       }    
   }
  +
  +
  +
  +
  +
  +
  +
  
  
  
  1.3       +3 -5      jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTTrue.java
  
  Index: ASTTrue.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTTrue.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ASTTrue.java	2001/01/03 05:27:19	1.2
  +++ ASTTrue.java	2001/03/19 18:53:52	1.3
  @@ -1,9 +1,9 @@
  -/* Generated By:JJTree: Do not edit this line. ASTTrue.java */
  +package org.apache.velocity.runtime.parser.node;
   
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -25,7 +25,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  @@ -53,8 +53,6 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    */
  -
  -package org.apache.velocity.runtime.parser.node;
   
   import org.apache.velocity.context.InternalContextAdapter;
   import org.apache.velocity.runtime.parser.Parser;
  
  
  
  1.3       +4 -5      jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTVariable.java
  
  Index: ASTVariable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTVariable.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ASTVariable.java	2001/01/03 05:27:37	1.2
  +++ ASTVariable.java	2001/03/19 18:53:53	1.3
  @@ -1,8 +1,9 @@
  -/* Generated By:JJTree: Do not edit this line. ASTVariable.java */
  +package org.apache.velocity.runtime.parser.node;
  +
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -24,7 +25,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  @@ -52,8 +53,6 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    */
  -
  -package org.apache.velocity.runtime.parser.node;
   
   import org.apache.velocity.runtime.parser.Parser;
   
  
  
  
  1.3       +3 -5      jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTWord.java
  
  Index: ASTWord.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTWord.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ASTWord.java	2001/01/03 05:27:38	1.2
  +++ ASTWord.java	2001/03/19 18:53:53	1.3
  @@ -1,9 +1,9 @@
  -/* Generated By:JJTree: Do not edit this line. ASTWord.java */
  +package org.apache.velocity.runtime.parser.node;
   
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -25,7 +25,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  @@ -53,8 +53,6 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    */
  -
  -package org.apache.velocity.runtime.parser.node;
   
   import org.apache.velocity.runtime.parser.Parser;
   
  
  
  
  1.4       +3 -5      jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTprocess.java
  
  Index: ASTprocess.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTprocess.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ASTprocess.java	2001/01/03 05:27:38	1.3
  +++ ASTprocess.java	2001/03/19 18:53:53	1.4
  @@ -1,9 +1,9 @@
  -/* Generated By:JJTree: Do not edit this line. ASTprocess.java */
  +package org.apache.velocity.runtime.parser.node;
   
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -25,7 +25,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  @@ -53,8 +53,6 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    */
  -
  -package org.apache.velocity.runtime.parser.node;
   
   import java.io.Writer;
   import java.io.IOException;
  
  
  
  1.5       +5 -4      jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java
  
  Index: AbstractExecutor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/AbstractExecutor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractExecutor.java	2001/01/06 22:14:05	1.4
  +++ AbstractExecutor.java	2001/03/19 18:53:53	1.5
  @@ -1,7 +1,9 @@
  +package org.apache.velocity.runtime.parser.node;
  +
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,7 +25,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  @@ -52,7 +54,6 @@
    * <http://www.apache.org/>.
    */
   
  -package org.apache.velocity.runtime.parser.node;
   
   import java.lang.reflect.Method;
   
  @@ -64,7 +65,7 @@
    * for the GetExecutor and PropertyExecutor.
    *
    * @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
  - * @version $Id: AbstractExecutor.java,v 1.4 2001/01/06 22:14:05 jvanzyl Exp $
  + * @version $Id: AbstractExecutor.java,v 1.5 2001/03/19 18:53:53 geirm Exp $
    */
   public abstract class AbstractExecutor
   {
  
  
  
  1.3       +4 -5      jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/GetExecutor.java
  
  Index: GetExecutor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/GetExecutor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GetExecutor.java	2001/01/06 22:14:05	1.2
  +++ GetExecutor.java	2001/03/19 18:53:54	1.3
  @@ -1,7 +1,8 @@
  +package org.apache.velocity.runtime.parser.node;
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,7 +24,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  @@ -52,8 +53,6 @@
    * <http://www.apache.org/>.
    */
   
  -package org.apache.velocity.runtime.parser.node;
  -
   import java.lang.reflect.Method;
   
   import org.apache.velocity.context.InternalContextAdapter;
  @@ -67,7 +66,7 @@
    * the case.
    *
    * @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
  - * @version $Id: GetExecutor.java,v 1.2 2001/01/06 22:14:05 jvanzyl Exp $
  + * @version $Id: GetExecutor.java,v 1.3 2001/03/19 18:53:54 geirm Exp $
    */
   public class GetExecutor extends AbstractExecutor
   {
  
  
  
  1.12      +6 -6      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- NodeUtils.java	2001/03/19 03:01:47	1.11
  +++ NodeUtils.java	2001/03/19 18:53:54	1.12
  @@ -1,7 +1,8 @@
  +package org.apache.velocity.runtime.parser.node;
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,7 +24,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  @@ -52,8 +53,6 @@
    * <http://www.apache.org/>.
    */
   
  -package org.apache.velocity.runtime.parser.node;
  -
   import org.apache.velocity.context.Context;
   import org.apache.velocity.context.InternalContextAdapter;
   import org.apache.velocity.runtime.parser.*;
  @@ -63,7 +62,7 @@
    *
    * @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
    * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  - * @version $Id: NodeUtils.java,v 1.11 2001/03/19 03:01:47 geirm Exp $
  + * @version $Id: NodeUtils.java,v 1.12 2001/03/19 18:53:54 geirm Exp $
    */
   public class NodeUtils
   {
  @@ -138,7 +137,8 @@
                       for (++cIdx ; cIdx < argStr.length(); ++cIdx)
                       {
                           ch = argStr.charAt(cIdx);
  -                        if (ch == '_' || ch == '-' || Character.isLetterOrDigit(ch))
  +                        if (ch == '_' || ch == '-' 
  +                            || Character.isLetterOrDigit(ch))
                               nameBuf.append(ch);
                           else if (ch == '{' || ch == '}')
                               continue;  
  
  
  
  1.3       +4 -6      jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java
  
  Index: ParserVisitor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ParserVisitor.java	2001/01/03 05:27:38	1.2
  +++ ParserVisitor.java	2001/03/19 18:53:54	1.3
  @@ -1,8 +1,9 @@
  -/* Generated By:JJTree: Do not edit this line. ParserVisitor.java */
  +package org.apache.velocity.runtime.parser.node;
  +
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -24,7 +25,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  @@ -52,9 +53,6 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    */
  -
  -
  -package org.apache.velocity.runtime.parser.node;
   
   public interface ParserVisitor
   {
  
  
  
  1.5       +3 -4      jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
  
  Index: PropertyExecutor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PropertyExecutor.java	2001/02/01 17:28:15	1.4
  +++ PropertyExecutor.java	2001/03/19 18:53:55	1.5
  @@ -1,7 +1,8 @@
  +package org.apache.velocity.runtime.parser.node;
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,7 +24,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  @@ -51,8 +52,6 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    */
  -
  -package org.apache.velocity.runtime.parser.node;
   
   import java.lang.reflect.Method;