geirm 01/11/13 06:47:32
Modified: src/java/org/apache/velocity/runtime/directive
VelocimacroProxy.java
Log:
Added Hennings patch to improve log output.
Revision Changes Path
1.26 +5 -3
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
Index: VelocimacroProxy.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- VelocimacroProxy.java 2001/08/07 21:57:56 1.25
+++ VelocimacroProxy.java 2001/11/13 14:47:32 1.26
@@ -85,7 +85,7 @@
* a proxy Directive-derived object to fit with the current directive system
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Geir Magnusson Jr.</a>
- * @version $Id: VelocimacroProxy.java,v 1.25 2001/08/07 21:57:56 geirm Exp $
+ * @version $Id: VelocimacroProxy.java,v 1.26 2001/11/13 14:47:32 geirm Exp $
*/
public class VelocimacroProxy extends Directive
{
@@ -259,8 +259,10 @@
if ( getNumArgs() != i )
{
- rsvc.error("VM #" + macroName + ": error : too few arguments to macro.
Wanted "
- + getNumArgs() + " got " + i + " -->");
+ rsvc.error("VM #" + macroName + ": error : too "
+ + ( (getNumArgs() > i) ? "few" : "many") + " arguments to
macro. Wanted "
+ + getNumArgs() + " got " + i );
+
return;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
