svn commit: r534720 - /velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java

[nb...@apache.org]

Author: nbubna
Date: Wed May  2 22:54:24 2007
New Revision: 534720

URL: http://svn.apache.org/viewvc?view=rev&rev=534720
Log:
when in deprecationSupportMode, use ChainedContext instead of ViewToolContext

Modified:
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java?view=diff&rev=534720&r1=534719&r2=534720
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java Wed May  2 22:54:24 2007
@@ -48,6 +48,7 @@
 import org.apache.velocity.tools.config.PropertiesFactoryConfiguration;
 import org.apache.velocity.tools.config.XmlFactoryConfiguration;
 import org.apache.velocity.tools.view.ViewToolContext;
+import org.apache.velocity.tools.view.context.ChainedContext;
 import org.apache.velocity.util.SimplePool;
 
 /**
@@ -173,7 +174,7 @@
     private String defaultContentType = DEFAULT_CONTENT_TYPE;
     private String toolboxKey = DEFAULT_TOOLBOX_KEY;
     private boolean createSession = true;
-    private boolean supportDeprecatedConfig = true;
+    private boolean deprecationSupportMode = true;
 
     public VelocityView(ServletConfig config)
     {
@@ -224,9 +225,9 @@
         return this.toolboxKey;
     }
 
-    protected final void setSupportDeprecatedConfig(boolean support)
+    protected final void setDeprecationSupportMode(boolean support)
     {
-        this.supportDeprecatedConfig = support;
+        this.deprecationSupportMode = support;
     }
 
     /**
@@ -454,7 +455,7 @@
             factoryConfig.addConfiguration(appConfig);
         }
 
-        if (this.supportDeprecatedConfig)
+        if (this.deprecationSupportMode)
         {
             // check for deprecated user configuration at the old conventional
             // location.  be silent if missing, log deprecation warning otherwise
@@ -616,7 +617,7 @@
         FileFactoryConfiguration config = null;
         if (path.endsWith(".xml"))
         {
-            config = new XmlFactoryConfiguration(this.supportDeprecatedConfig);
+            config = new XmlFactoryConfiguration(this.deprecationSupportMode);
         }
         else if (path.endsWith(".properties"))
         {
@@ -817,8 +818,15 @@
     protected ViewToolContext createContext(HttpServletRequest request,
                                             HttpServletResponse response)
     {
-        ViewToolContext ctx =
-            new ViewToolContext(velocity, request, response, servletContext);
+        ViewToolContext ctx;
+        if (this.deprecationSupportMode)
+        {
+            ctx = new ChainedContext(velocity, request, response, servletContext);
+        }
+        else
+        {
+            ctx = new ViewToolContext(velocity, request, response, servletContext);
+        }
         prepareContext(ctx);
         return ctx;
     }