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

[geirm]

geirm       00/12/04 21:10:03

  Modified:    src/java/org/apache/velocity Template.java
  Log:
  Support for setting template name in context during merge, so template name is 
available if needed for more informative log messages.
  
  Revision  Changes    Path
  1.16      +2 -1      jakarta-velocity/src/java/org/apache/velocity/Template.java
  
  Index: Template.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/Template.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Template.java     2000/12/04 02:10:18     1.15
  +++ Template.java     2000/12/05 05:10:01     1.16
  @@ -84,7 +84,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
  - * @version $Id: Template.java,v 1.15 2000/12/04 02:10:18 geirm Exp $
  + * @version $Id: Template.java,v 1.16 2000/12/05 05:10:01 geirm Exp $
    */
   public class Template
   {
  @@ -279,6 +279,7 @@
       public void merge(Context context, Writer writer)
           throws IOException, Exception
       {
  +        context.setCurrentTemplateName( name );
           document.render(context, writer);
       }
   }