Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Somewhat improving the location variable name

Browse Source 
WW-1807


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@556512 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2007-07-16 06:06:53 +00:00
parent 048333c2bc
commit 5f16c73803
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
+7 -7
View File
@@ -143,28 +143,28 @@ public class FreemarkerResult extends StrutsResultSupport {
}
/**
* 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