svn commit: r368587 - in /incubator/roller/trunk/src/org/roller/presentation: tags/menu/MenuTag.java velocity/ContextLoader.java

[agilliland]

Author: agilliland
Date: Thu Jan 12 20:42:07 2006
New Revision: 368587

URL: http://svn.apache.org/viewcvs?rev=368587&view=rev
Log:
MenuTag doesn't need to use the full ContextLoader.setupContext() method.


Modified:
    incubator/roller/trunk/src/org/roller/presentation/tags/menu/MenuTag.java
    
incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java

Modified: 
incubator/roller/trunk/src/org/roller/presentation/tags/menu/MenuTag.java
URL: 
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/tags/menu/MenuTag.java?rev=368587&r1=368586&r2=368587&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/tags/menu/MenuTag.java 
(original)
+++ incubator/roller/trunk/src/org/roller/presentation/tags/menu/MenuTag.java 
Thu Jan 12 20:42:07 2006
@@ -65,17 +65,7 @@
                ctx.put("req", req );
                ctx.put("res", res );
                
-               RollerRequest rreq = RollerRequest.getRollerRequest(req);
-               rreq.setPageContext(pageContext);
-               try
-               {
-                       ContextLoader.setupContext( ctx, rreq, res );
-               }
-               catch (RollerException e)
-               {
-                       // superclass says I can't throw an exception
-                       mLogger.error(e);
-               }
+                ContextLoader.loadToolboxContext(req, res, ctx);
        }
 
 }

Modified: 
incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java
URL: 
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java?rev=368587&r1=368586&r2=368587&view=diff
==============================================================================
--- 
incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java 
(original)
+++ 
incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java 
Thu Jan 12 20:42:07 2006
@@ -471,7 +471,7 @@
     private static final String TOOLBOX_MANAGER_KEY = 
         "org.roller.presentation.velocity.toolboxManager";
 
-    private static ToolboxContext loadToolboxContext(
+    public static ToolboxContext loadToolboxContext(
                     HttpServletRequest request, HttpServletResponse response, 
Context ctx) 
     {
         mLogger.debug("Loading toolbox context");