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

[cbrisson]

Author: cbrisson
Date: Tue May 29 03:34:36 2007
New Revision: 542481

URL: http://svn.apache.org/viewvc?view=rev&rev=542481
Log:
relax access to some methods to facilitate access from VelovityViewServlet 
subclasses

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=542481&r1=542480&r2=542481
==============================================================================
--- 
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
 Tue May 29 03:34:36 2007
@@ -872,12 +872,12 @@
      * @param request client request
      * @return Velocity Template object or null
      */
-    protected Template getTemplate(HttpServletRequest request)
+    public Template getTemplate(HttpServletRequest request)
     {
         return getTemplate(request, null);
     }
 
-    protected Template getTemplate(HttpServletRequest request,
+    public Template getTemplate(HttpServletRequest request,
                                    HttpServletResponse response)
     {
         String path = ServletUtils.getPath(request);
@@ -949,7 +949,7 @@
      * @param context Context created by the [EMAIL PROTECTED] #createContext}
      * @param writer into which the content is rendered
      */
-    protected void merge(Template template, Context context, Writer writer)
+    public void merge(Template template, Context context, Writer writer)
         throws IOException
     {
         VelocityWriter vw = null;