Author: mrdon
Date: Sun Jul 15 23:06:53 2007
New Revision: 556512
URL: http://svn.apache.org/viewvc?view=rev&rev=556512
Log:
Somewhat improving the location variable name
WW-1807
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java?view=diff&rev=556512&r1=556511&r2=556512
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
Sun Jul 15 23:06:53 2007
@@ -143,28 +143,28 @@
}
/**
- * Execute this result, using the specified template location.
+ * Execute this result, using the specified template locationArg.
* <p/>
- * The template location has already been interoplated for any variable
substitutions
+ * The template locationArg has already been interoplated for any variable
substitutions
* <p/>
* this method obtains the freemarker configuration and the object wrapper
from the provided hooks.
* It them implements the template processing workflow by calling the
hooks for
* preTemplateProcess and postTemplateProcess
*/
- public void doExecute(String location, ActionInvocation invocation) throws
IOException, TemplateException {
- this.location = location;
+ public void doExecute(String locationArg, ActionInvocation invocation)
throws IOException, TemplateException {
+ this.location = locationArg;
this.invocation = invocation;
this.configuration = getConfiguration();
this.wrapper = getObjectWrapper();
- if (!location.startsWith("/")) {
+ if (!locationArg.startsWith("/")) {
ActionContext ctx = invocation.getInvocationContext();
HttpServletRequest req = (HttpServletRequest)
ctx.get(ServletActionContext.HTTP_REQUEST);
String base = ResourceUtil.getResourceBase(req);
- location = base + "/" + location;
+ locationArg = base + "/" + locationArg;
}
- Template template = configuration.getTemplate(location,
deduceLocale());
+ Template template = configuration.getTemplate(locationArg,
deduceLocale());
TemplateModel model = createModel();
// Give subclasses a chance to hook into preprocessing
