geirm 01/01/13 08:37:35
Modified: src/java/org/apache/velocity/runtime Runtime.java
Log:
Small mods. Removed extraneous args to the addVelocimacro() call bc
the new VM impl doesn't require all of them anymore.
Revision Changes Path
1.84 +6 -9
jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java
Index: Runtime.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- Runtime.java 2001/01/12 20:24:40 1.83
+++ Runtime.java 2001/01/13 16:37:34 1.84
@@ -169,7 +169,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jeff Bowden</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magusson Jr.</a>
- * @version $Id: Runtime.java,v 1.83 2001/01/12 20:24:40 dlr Exp $
+ * @version $Id: Runtime.java,v 1.84 2001/01/13 16:37:34 geirm Exp $
*/
public class Runtime implements RuntimeConstants
{
@@ -558,6 +558,8 @@
SimpleNode ast = null;
Parser parser = (Parser) parserPool.get();
+ //System.out.println(" Runtime.parse() : parsing " + strTemplateName );
+
if (parser != null)
{
try
@@ -765,18 +767,13 @@
* @param strName Name of velocimacro
* @param strMacro String form of macro body
* @param strArgArray Array of strings, containing the #macro() arguments.
the 0th is the name.
- * @param strMacroArray The macro body as an array of strings. Basically, the
tokenized literal representation
- * @param tmArgIndexMap Indexes to the args in the macro body string
* @return boolean True if added, false if rejected for some reason (either
parameters or permission settings)
*/
- public static boolean addVelocimacro( String strName, String strMacro, String
strArgArray[],
- String strMacroArray[], TreeMap
tmArgIndexMap,
- String strSourceTemplate )
+ public static boolean addVelocimacro( String strName, String strMacro, String
strArgArray[], String strSourceTemplate )
{
- return vmFactory.addVelocimacro( strName, strMacro, strArgArray,
strMacroArray,
- tmArgIndexMap, strSourceTemplate);
+ return vmFactory.addVelocimacro( strName, strMacro, strArgArray,
strSourceTemplate );
}
-
+
/**
* Checks to see if a VM exists
*
