You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by nb...@apache.org on 2004/11/11 07:22:09 UTC

cvs commit: jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/tools ViewRenderTool.java

nbubna      2004/11/10 22:22:09

  Modified:    src/java/org/apache/velocity/tools/view/tools
                        ViewRenderTool.java
  Log:
  try to use VelocityEngine if one is available
  
  Revision  Changes    Path
  1.6       +8 -2      jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java
  
  Index: ViewRenderTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/tools/ViewRenderTool.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ViewRenderTool.java	12 Mar 2004 20:30:32 -0000	1.5
  +++ ViewRenderTool.java	11 Nov 2004 06:22:09 -0000	1.6
  @@ -19,9 +19,9 @@
   
   
   import java.io.StringWriter;
  -import org.apache.velocity.app.Velocity;
   import org.apache.velocity.context.Context;
   import org.apache.velocity.tools.generic.RenderTool;
  +import org.apache.velocity.tools.view.context.ViewContext;
   import org.apache.velocity.tools.view.tools.ViewTool;
   
   
  @@ -97,6 +97,12 @@
       public void init(Object obj)
       {
           context = (Context)obj;
  +
  +        // if ViewContext, try to retrieve a VelocityEngine for use
  +        if (obj instanceof ViewContext)
  +        {
  +            setVelocityEngine(((ViewContext)obj).getVelocityEngine());
  +        }
       }
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org