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

[geirm]

geirm       00/12/04 21:01:27

  Modified:    src/java/org/apache/velocity/runtime/parser/node
                        ASTReference.java
  Log:
  Support for template name to be part of invalid reference output.
  
  Revision  Changes    Path
  1.13      +5 -5      
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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ASTReference.java 2000/12/04 02:02:52     1.12
  +++ ASTReference.java 2000/12/05 05:01:27     1.13
  @@ -64,7 +64,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
  - * @version $Id: ASTReference.java,v 1.12 2000/12/04 02:02:52 geirm Exp $ 
  + * @version $Id: ASTReference.java,v 1.13 2000/12/05 05:01:27 geirm Exp $ 
   */
   
   package org.apache.velocity.runtime.parser.node;
  @@ -199,7 +199,7 @@
               writer.write(NodeUtils.specialText(getFirstToken()) + strPrefix_ + 
strPrefix_ + nullString);
               
               if (referenceType != QUIET_REFERENCE && Runtime.getBoolean( 
RuntimeConstants.RUNTIME_LOG_REFERENCE_LOG_INVALID, true) )
  -                Runtime.warn(new ReferenceException("reference", this));
  +                Runtime.warn(new ReferenceException("reference : template = " + 
context.getCurrentTemplateName(), this));
           }                    
           else
           {
  @@ -250,7 +250,7 @@
           
           if (result == null)
           {
  -            Runtime.error(new ReferenceException("#set", this));
  +            Runtime.error(new ReferenceException("reference set : template = " + 
context.getCurrentTemplateName(), this));
               return false;
           }                          
           
  @@ -266,7 +266,7 @@
               
               if (result == null)
               {
  -                Runtime.error(new ReferenceException("#set", this));
  +                Runtime.error(new ReferenceException("reference set : template = " 
+ context.getCurrentTemplateName(), this));
                   return false;
               }                          
           }            
  @@ -290,7 +290,7 @@
           }
           catch (Exception e)
           {
  -            Runtime.error(new ReferenceException("#set", this));
  +            Runtime.error(new ReferenceException("reference set : template = " + 
context.getCurrentTemplateName(), this));
               return false;
           }