litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-3729 Remove unused methods from FreemarkerHttpServlet and TemplateProcessingHelper

Browse source
This commit is contained in:
j2blake 2012-04-23 20:43:50 +00:00
parent 91b2f03780
commit 41171a48f4
2 changed files with 0 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
View file

@ -481,22 +481,12 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
return helper.processTemplate(templateName, map); 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. // 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<String, Object> map, protected String processTemplateToString(String templateName, Map<String, Object> map,
HttpServletRequest request) throws TemplateProcessingException { HttpServletRequest request) throws TemplateProcessingException {
return processTemplate(templateName, map, request).toString(); return processTemplate(templateName, map, request).toString();
} }
protected String processTemplateToString(ResponseValues values,
HttpServletRequest request) throws TemplateProcessingException {
return processTemplate(values, request).toString();
}
protected void writePage(Map<String, Object> root, HttpServletRequest request, protected void writePage(Map<String, Object> root, HttpServletRequest request,
HttpServletResponse response, int statusCode, ResponseValues rv) throws TemplateProcessingException { HttpServletResponse response, int statusCode, ResponseValues rv) throws TemplateProcessingException {

20
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java
View file

@ -14,7 +14,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
import freemarker.core.Environment; import freemarker.core.Environment;
import freemarker.template.Configuration; import freemarker.template.Configuration;
import freemarker.template.Template; import freemarker.template.Template;
@ -42,13 +41,6 @@ public class TemplateProcessingHelper {
return sw; 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<String, Object> map, Writer writer) private void processTemplate(Template template, Map<String, Object> map, Writer writer)
throws TemplateProcessingException { 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<String, Object> 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 { private Template getTemplate(String templateName) throws TemplateProcessingException {
Template template = null; Template template = null;
try { try {