Commits

Anonymous committed 2a36339
  • Participants
  • Parent commits 11812e9

Comments (0)

Files changed (2)

File src/java/com/opensymphony/webwork/views/freemarker/FreemarkerManager.java

         if (config == null) {
             config = createConfiguration(servletContext);
 
-            // store this configuration in the servlet context 
+            // store this configuration in the servlet context
             servletContext.setAttribute(CONFIG_SERVLET_CONTEXT_KEY, config);
         }
 
      */
     protected TemplateLoader getTemplateLoader(ServletContext servletContext) {
         // presume that most apps will require the class and webapp template loader
-        // if people wish to 
+        // if people wish to
         TemplateLoader multiLoader = new MultiTemplateLoader(new TemplateLoader[]{
             new WebappTemplateLoader(servletContext),
             new ClassTemplateLoader(FreemarkerResult.class, "/")
     /**
      * Load the settings from the /freemarker.properties file on the classpath
      *
-     * @see freemarker.template.Configurable#setSetting for the definition of valid settings
+     * @see freemarker.template.Configuration#setSettings for the definition of valid settings
      */
     protected void loadSettings(ServletContext servletContext, freemarker.template.Configuration configuration) {
         try {

File src/java/com/opensymphony/webwork/views/freemarker/FreemarkerServlet.java

     }
 
     /**
-     * This method is called from {@link #doExecute()} to obtain the
+     * This method is called from {@link #process(HttpServletRequest, HttpServletResponse)} to obtain the
      * FreeMarker object wrapper object that this result will use
      * for adapting objects into
      * template models.. This is a hook that allows you
             return (includePathInfo == null) ? includeServletPath : includePathInfo;
         }
 
-        // Seems that the servlet was not called as the result of a 
+        // Seems that the servlet was not called as the result of a
         // RequestDispatcher.include(...). Try pathInfo then servletPath again,
         // only now directly on the request object:
         String path = request.getPathInfo();