You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by by...@apache.org on 2009/01/11 06:43:11 UTC

svn commit: r733418 - in /velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive: Macro.java MacroParseException.java

Author: byron
Date: Sat Jan 10 21:43:10 2009
New Revision: 733418

URL: http://svn.apache.org/viewvc?rev=733418&view=rev
Log:
Fix exception message spacing and reporting

Modified:
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/MacroParseException.java

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java?rev=733418&r1=733417&r2=733418&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java Sat Jan 10 21:43:10 2009
@@ -151,7 +151,7 @@
                               "argument to #macro(). #args = " + numArgs);
 
             throw new MacroParseException("First argument to #macro() must be " +
-                    " macro name.", sourceTemplate, t);
+                    " macro name", sourceTemplate, t);
         }
 
         /*

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/MacroParseException.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/MacroParseException.java?rev=733418&r1=733417&r2=733418&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/MacroParseException.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/directive/MacroParseException.java Sat Jan 10 21:43:10 2009
@@ -51,7 +51,7 @@
      */
     public MacroParseException(final String msg, final String templateName, final Token currentToken)
     {
-        super(msg);
+        super(msg + " at ");
         this.currentToken = currentToken;
         this.templateName = templateName;
     }