svn commit: r385125 - in /jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools: generic/RenderTool.java view/tools/ViewRenderTool.java

[nbubna]

Author: nbubna
Date: Sat Mar 11 10:43:08 2006
New Revision: 385125

URL: http://svn.apache.org/viewcvs?rev=385125&view=rev
Log:
remove ViewTool and Configurable interfaces and shift parse depth configuration 
from ViewRenderTool to RenderTool

Modified:
    
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/RenderTool.java
    
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java

Modified: 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/RenderTool.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/RenderTool.java?rev=385125&r1=385124&r2=385125&view=diff
==============================================================================
--- 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/RenderTool.java
 (original)
+++ 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/generic/RenderTool.java
 Sat Mar 11 10:43:08 2006
@@ -17,6 +17,7 @@
 package org.apache.velocity.tools.generic;
 
 import java.io.StringWriter;
+import java.util.Map;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.context.Context;
@@ -56,6 +57,12 @@
  *      ------
  *      hello world!
  *
+ *
+ * Toolbox configuration:
+ * <tool>
+ *   <key>render</key>
+ *   <class>org.apache.velocity.tools.generic.RenderTool</class>
+ * </tool>
  * </pre>
  *
  * <p>Ok, so these examples are really lame.  But, it seems like
@@ -76,11 +83,19 @@
      * @since VelocityTools 1.2
      */
     public static final int DEFAULT_PARSE_DEPTH = 20;
+    public static final String KEY_PARSE_DEPTH = "parse.depth";
 
     private static final String LOG_TAG = "RenderTool.eval()";
 
     private VelocityEngine engine = null;
     private int parseDepth = DEFAULT_PARSE_DEPTH;
+
+    public void configure(Map params)
+    {
+        ValueParser parser = new ValueParser(params);
+        int depth = parser.getInt(KEY_PARSE_DEPTH, DEFAULT_PARSE_DEPTH);
+        setParseDepth(depth);
+    }
 
     /**
      * Allow user to specify a VelocityEngine to be used

Modified: 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java?rev=385125&r1=385124&r2=385125&view=diff
==============================================================================
--- 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java
 (original)
+++ 
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java
 Sat Mar 11 10:43:08 2006
@@ -20,9 +20,7 @@
 import java.util.Map;
 import org.apache.velocity.context.Context;
 import org.apache.velocity.tools.generic.RenderTool;
-import org.apache.velocity.tools.generic.ValueParser;
 import org.apache.velocity.tools.view.context.ViewContext;
-import org.apache.velocity.tools.view.tools.ViewTool;
 
 /**
  * This tool expose methods to evaluate the given
@@ -75,10 +73,8 @@
  * @author <a href="mailto:[EMAIL PROTECTED]">Nathan Bubna</a>
  * @version $Revision$ $Date$
  */
-public class ViewRenderTool extends RenderTool implements ViewTool, 
Configurable
+public class ViewRenderTool extends RenderTool
 {
-    public static final String KEY_PARSE_DEPTH = "parse.depth";
-
     private Context context;
 
     /**
@@ -102,13 +98,6 @@
         {
             setVelocityEngine(((ViewContext)obj).getVelocityEngine());
         }
-    }
-
-    public void configure(Map params)
-    {
-        ValueParser parser = new ValueParser(params);
-        int depth = parser.getInt(KEY_PARSE_DEPTH, DEFAULT_PARSE_DEPTH);
-        setParseDepth(depth);
     }
 
     /**



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