From 107162012add149f748760fac928d293facdfbe4 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Thu, 5 Aug 2010 15:32:48 +0000 Subject: [PATCH] NIHVIVO-564 Refactoring in FreemarkerHelper to take Configuration object in constructor and store as instance variable; individual methods don't need the param. --- .../controller/freemarker/FreemarkerHelper.java | 12 +++++++++--- .../controller/freemarker/FreemarkerHttpServlet.java | 4 ++-- .../web/directives/BaseTemplateDirectiveModel.java | 2 +- .../webapp/web/directives/DumpAllDirective.java | 4 ++-- .../vitro/webapp/web/directives/DumpDirective.java | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHelper.java index 128f35103..a91d1949c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHelper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHelper.java @@ -16,8 +16,14 @@ import freemarker.template.TemplateException; public class FreemarkerHelper { private static final Log log = LogFactory.getLog(FreemarkerHelper.class); + + private Configuration config = null; + + public FreemarkerHelper(Configuration config) { + this.config = config; + } - public StringWriter mergeToTemplate(String templateName, Map map, Configuration config) { + public StringWriter mergeToTemplate(String templateName, Map map) { Template template = null; try { @@ -40,8 +46,8 @@ public class FreemarkerHelper { return sw; } - public String mergeMapToTemplate(String templateName, Map map, Configuration config) { - return mergeToTemplate(templateName, map, config).toString(); + public String mergeMapToTemplate(String templateName, Map map) { + return mergeToTemplate(templateName, map).toString(); } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java index debf20130..dea7d875f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java @@ -376,8 +376,8 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { } protected StringWriter mergeToTemplate(String templateName, Map map, Configuration config) { - FreemarkerHelper helper = new FreemarkerHelper(); - return helper.mergeToTemplate(templateName, map, config); + FreemarkerHelper helper = new FreemarkerHelper(config); + return helper.mergeToTemplate(templateName, map); } protected String mergeBodyToTemplate(String templateName, Map map, Configuration config) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/BaseTemplateDirectiveModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/BaseTemplateDirectiveModel.java index 4a98d588d..9be22093b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/BaseTemplateDirectiveModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/BaseTemplateDirectiveModel.java @@ -32,7 +32,7 @@ public abstract class BaseTemplateDirectiveModel implements TemplateDirectiveMod } protected String mergeToTemplate(Map map, Configuration config) { - return new FreemarkerHelper().mergeMapToTemplate("directive-help.ftl", map, config); + return new FreemarkerHelper(config).mergeMapToTemplate("directive-help.ftl", map); } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpAllDirective.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpAllDirective.java index 04d8653ec..d3d2b8072 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpAllDirective.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpAllDirective.java @@ -82,8 +82,8 @@ public class DumpAllDirective extends BaseTemplateDirectiveModel { map.put("datamodel", dataModel); map.put("containingTemplate", env.getTemplate().getName()); - FreemarkerHelper helper = new FreemarkerHelper(); - String output = helper.mergeMapToTemplate(templateName, map, config); + FreemarkerHelper helper = new FreemarkerHelper(config); + String output = helper.mergeMapToTemplate(templateName, map); Writer out = env.getOut(); out.write(output); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java index c6e5b104e..83ef0616c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java @@ -116,7 +116,7 @@ public class DumpDirective extends BaseTemplateDirectiveModel { map.put("stylesheets", dataModel.get("stylesheets")); //map.put("dump", this); // would need for recursive calls - String output = new FreemarkerHelper().mergeMapToTemplate("dump-var.ftl", map, env.getConfiguration()); + String output = new FreemarkerHelper(env.getConfiguration()).mergeMapToTemplate("dump-var.ftl", map); Writer out = env.getOut(); out.write(output);