Daniel Rall <[EMAIL PROTECTED]> writes:
>This commit also removed a call to node.jjtGetChild(0).getFirstToken(),
>which wasn't used. AFAICT, this method doesn't have any necessary
>side-effects, but it would be nice if the change was mentioned in the
>log.
Yep, forgot to log that. Sorry.
I've checked the getFirstToken() method in SimpleNode (as none of the
nodes overrides it) and it is just public Token getFirstToken() {
return first; }, I deemed it safe to remove the method call.
Best regards
Henning
>svn ps --revprop -r291691 -F change-log.txt 'svn:log'
>On Mon, 26 Sep 2005, [EMAIL PROTECTED] wrote:
>> Author: henning
>> Date: Mon Sep 26 10:46:29 2005
>> New Revision: 291691
>>
>> URL: http://svn.apache.org/viewcvs?rev=291691&view=rev
>> Log:
>> discard return value, never read anyway
>>
>>
>> Modified:
>>
>> jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java
>>
>> Modified:
>> jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java
>> URL:
>> http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java?rev=291691&r1=291690&r2=291691&view=diff
>> ==============================================================================
>> ---
>> jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java
>> (original)
>> +++
>> jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java
>> Mon Sep 26 10:46:29 2005
>> @@ -148,13 +148,10 @@
>>
>> if(firstType != ParserTreeConstants.JJTWORD)
>> {
>> - Token t = node.jjtGetChild(0).getFirstToken();
>> -
>> throw new MacroParseException("First argument to #macro() must
>> be a"
>> + " token without surrounding \' or \", which specifies"
>> + " the macro name. Currently it is a "
>> + ParserTreeConstants.jjtNodeName[firstType]);
>> -
>> }
>>
>> /*
>> @@ -186,8 +183,8 @@
>> * so just give it a whack...
>> */
>>
>> - boolean bRet = rs.addVelocimacro(argArray[0], macroBody.toString(),
>> - argArray, sourceTemplate);
>> + rs.addVelocimacro(argArray[0], macroBody.toString(),
>> + argArray, sourceTemplate);
>>
>> return;
>> }
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: [EMAIL PROTECTED]
>> For additional commands, e-mail: [EMAIL PROTECTED]
>---------------------------------------------------------------------
>To unsubscribe, e-mail: [EMAIL PROTECTED]
>For additional commands, e-mail: [EMAIL PROTECTED]
--
Dipl.-Inf. (Univ.) Henning P. Schmiedehausen INTERMETA GmbH
[EMAIL PROTECTED] +49 9131 50 654 0 http://www.intermeta.de/
RedHat Certified Engineer -- Jakarta Turbine Development -- hero for hire
Linux, Java, perl, Solaris -- Consulting, Training, Development
4 - 8 - 15 - 16 - 23 - 42
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
