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

[geirm]

geirm       00/12/04 21:06:58

  Modified:    src/java/org/apache/velocity/runtime Runtime.java
  Log:
  Added support for including  template name in parser error.
  
  Revision  Changes    Path
  1.65      +5 -5      
jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java
  
  Index: Runtime.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- Runtime.java      2000/12/04 02:09:49     1.64
  +++ Runtime.java      2000/12/05 05:06:58     1.65
  @@ -154,7 +154,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Jeff Bowden</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magusson Jr.</a>
  - * @version $Id: Runtime.java,v 1.64 2000/12/04 02:09:49 geirm Exp $
  + * @version $Id: Runtime.java,v 1.65 2000/12/05 05:06:58 geirm Exp $
    */
   public class Runtime implements RuntimeConstants
   {
  @@ -792,7 +792,7 @@
        * Parse the input stream and return the root of
        * AST node structure.
        */
  -    public static SimpleNode parse(InputStream inputStream)
  +    public static SimpleNode parse(InputStream inputStream, String strTemplateName )
           throws ParseException
       {
           SimpleNode AST = null;
  @@ -800,7 +800,7 @@
           
           if (parser != null)
           {
  -            AST = parser.parse(inputStream);
  +            AST = parser.parse(inputStream, strTemplateName);
               parserPool.put(parser);
               return AST;
           }
  @@ -904,7 +904,7 @@
                   try
                   {
                       is = tl.getTemplateStream(template);
  -                    t.setDocument(parse(is));
  +                    t.setDocument(parse(is, t.getName() ));
                       t.initDocument();
   
                       return t;
  @@ -953,7 +953,7 @@
                   t.setLastModified(tl.getLastModified(t));
                   t.setModificationCheckInterval(tl.getModificationCheckInterval());
                   t.setTemplateLoader(tl);
  -                t.setDocument(parse(is));
  +                t.setDocument(parse(is, t.getName() ));
   
                   t.initDocument();