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 703070a6c..552846a98 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 @@ -481,22 +481,12 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { return helper.processTemplate(templateName, map); } - protected StringWriter processTemplate(ResponseValues values, - HttpServletRequest request) throws TemplateProcessingException { - return processTemplate(values.getTemplateName(), values.getMap(), request); - } - // In fact, we can put StringWriter objects directly into the data model, so perhaps we should eliminate the processTemplateToString() methods. protected String processTemplateToString(String templateName, Map map, HttpServletRequest request) throws TemplateProcessingException { return processTemplate(templateName, map, request).toString(); } - protected String processTemplateToString(ResponseValues values, - HttpServletRequest request) throws TemplateProcessingException { - return processTemplate(values, request).toString(); - } - protected void writePage(Map root, HttpServletRequest request, HttpServletResponse response, int statusCode, ResponseValues rv) throws TemplateProcessingException { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java index db0e941f1..ffca0bb65 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java @@ -14,7 +14,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import freemarker.core.Environment; import freemarker.template.Configuration; import freemarker.template.Template; @@ -42,13 +41,6 @@ public class TemplateProcessingHelper { return sw; } - protected StringWriter processTemplate(ResponseValues values) throws TemplateProcessingException { - if (values == null) { - return null; - } - return processTemplate(values.getTemplateName(), values.getMap()); - } - private void processTemplate(Template template, Map map, Writer writer) throws TemplateProcessingException { @@ -73,18 +65,6 @@ public class TemplateProcessingHelper { } } - // For cases where we need a String instead of a StringWriter. StringWriter objects can be put in the template data model, - // but we can use this method from a jsp, for example. - public String processTemplateToString(String templateName, Map map) - throws TemplateProcessingException { - return processTemplate(templateName, map).toString(); - } - - protected String processTemplateToString(ResponseValues values) - throws TemplateProcessingException { - return processTemplate(values).toString(); - } - private Template getTemplate(String templateName) throws TemplateProcessingException { Template template = null; try {