You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2008/08/22 18:59:41 UTC
svn commit: r688120 -
/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityView.java
Author: nbubna
Date: Fri Aug 22 09:59:40 2008
New Revision: 688120
URL: http://svn.apache.org/viewvc?rev=688120&view=rev
Log:
make it a wee bit easier to use a different VelocityEngine in a VelocityView subclass
Modified:
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityView.java
Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityView.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityView.java?rev=688120&r1=688119&r2=688120&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityView.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityView.java Fri Aug 22 09:59:40 2008
@@ -282,7 +282,7 @@
*/
protected String getProperty(String key, String alternate)
{
- String prop = (String)velocity.getProperty(key);
+ String prop = (String)getVelocityEngine().getProperty(key);
if (prop == null || prop.length() == 0)
{
return alternate;
@@ -947,11 +947,11 @@
ViewToolContext ctx;
if (this.deprecationSupportMode)
{
- ctx = new ChainedContext(velocity, request, response, servletContext);
+ ctx = new ChainedContext(getVelocityEngine(), request, response, servletContext);
}
else
{
- ctx = new ViewToolContext(velocity, request, response, servletContext);
+ ctx = new ViewToolContext(getVelocityEngine(), request, response, servletContext);
}
prepareContext(ctx);
return ctx;