svn commit: r291868 - in /jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime: VelocimacroFactory.java directive/Macro.java

[henning]

Author: henning
Date: Tue Sep 27 02:13:18 2005
New Revision: 291868

URL: http://svn.apache.org/viewcvs?rev=291868&view=rev
Log:
factor out common Macro printout routine. Add some javadocs.


Modified:
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java?rev=291868&r1=291867&r2=291868&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroFactory.java
 Tue Sep 27 02:13:18 2005
@@ -18,6 +18,7 @@
 
 import org.apache.velocity.Template;
 import org.apache.velocity.runtime.directive.Directive;
+import org.apache.velocity.runtime.directive.Macro;
 import org.apache.velocity.runtime.directive.VelocimacroProxy;
 
 import java.util.Vector;
@@ -364,16 +365,11 @@
          */
         if (getBlather())
         {
-            // The same code appears in directive.Macro
-            StringBuffer msg = new StringBuffer();
-            msg.append("Velocimacro : added new VM : #");
-            msg.append(argArray[0]).append('(');;
-            for (int i = 1; i < argArray.length; i++)
-            {
-                msg.append(' ').append(argArray[i]);
-            }
-            msg.append(" ) : source = ").append(sourceTemplate);
-            logVMMessageInfo(msg.toString());
+            StringBuffer msg = new StringBuffer("Velocimacro : added new VM : 
");
+            Macro.macroToString(msg, argArray);
+            msg.append(" : source = ").append(sourceTemplate);
+            // Already checked for getBlather()
+            rsvc.info(msg.toString());
         }
 
         return true;

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=291868&r1=291867&r2=291868&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
 Tue Sep 27 02:13:18 2005
@@ -190,9 +190,10 @@
                                                argArray, sourceTemplate);
         if (!macroAdded)
         {
-            rs.warn("Failed to add macro " +
-                    formatArgArray(new StringBuffer(), argArray) +
-                    " from '" + sourceTemplate + '\'');
+            StringBuffer msg = new StringBuffer("Failed to add macro: ");
+            macroToString(msg, argArray);
+            msg.append(" : source = ").append(sourceTemplate);
+            rs.warn(msg.toString());
         }
     }
 
@@ -247,10 +248,9 @@
        
         if (debugMode)
         {
-            StringBuffer msg = new StringBuffer();
-            msg.append("Macro.getArgArray() : nbrArgs=" + numArgs);
-            msg.append(" : ");
-            formatArgArray(msg, argArray);
+            StringBuffer msg = new StringBuffer("Macro.getArgArray() : 
nbrArgs=");
+            msg.append(numArgs).append(" : ");
+            macroToString(msg, argArray);
             rsvc.debug(msg.toString());
         }
        
@@ -297,16 +297,24 @@
     /**
      * For debugging purposes.  Formats the arguments from
      * <code>argArray</code> and appends them to <code>buf</code>.
+     *
+     * @param buf A StringBuffer. If null, a new StringBuffer is allocated.
+     * @param argArray The Macro arguments to format
+     *
+     * @return A StringBuffer containing the formatted arguments. If a 
StringBuffer
+     *         has passed in as buf, this method returns it.
      */
-    private static StringBuffer formatArgArray(StringBuffer buf,
-                                               String[] argArray)
+    public static final StringBuffer macroToString(final StringBuffer buf,
+                                                   final String[] argArray)
     {
-        buf.append(argArray[0]).append('(');
+        StringBuffer ret = (buf == null) ? new StringBuffer() : buf;
+
+        ret.append('#').append(argArray[0]).append("( ");
         for (int i = 1; i < argArray.length; i++)
         {
-            buf.append(' ').append(argArray[i]);
+            ret.append(' ').append(argArray[i]);
         }
-        buf.append(" )");
-        return buf;
+        ret.append(" )");
+        return ret;
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]