geirm 00/12/10 11:38:33
Modified: src/java/org/apache/velocity/runtime/directive Macro.java
Log:
Removed message output. Taken care of by Factory.
Revision Changes Path
1.6 +2 -23
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Macro.java
Index: Macro.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Macro.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Macro.java 2000/12/06 05:59:21 1.5
+++ Macro.java 2000/12/10 19:38:33 1.6
@@ -70,7 +70,7 @@
* macro. It is used inline in the parser when processing a directive.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Macro.java,v 1.5 2000/12/06 05:59:21 geirm Exp $
+ * @version $Id: Macro.java,v 1.6 2000/12/10 19:38:33 geirm Exp $
*/
package org.apache.velocity.runtime.directive;
@@ -84,6 +84,7 @@
import org.apache.velocity.runtime.parser.node.Node;
import org.apache.velocity.runtime.parser.Token;
import org.apache.velocity.runtime.Runtime;
+import org.apache.velocity.runtime.RuntimeConstants;
public class Macro extends Directive
{
@@ -202,29 +203,7 @@
int iMacroArgs = strArgs.length - 1;
boolean bRet = Runtime.addVelocimacro( strArgs[0], strMacro, strArgs,
strMacroArray, tmArgIndexMap, strSourceTemplate );
-
- /*
- * lets make nicey-nicey output
- */
- String s = "#" + strArgs[0];
- s += "(";
-
- for( int i=1; i < strArgs.length; i++)
- {
- s += " ";
- s += strArgs[i];
- }
- s += " ) : source = ";
- s += strSourceTemplate;
-
- if (bRet)
- {
- Runtime.info( "Velocimacro : added new VM : " + s );
- }
- else
- Runtime.warn("Velocimacro : VM addition rejected : " + s + " Check VM
permissions and defaults." );
-
return;
}
