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

NIHVIVO-646 Broke up FreeMarkerHttpServlet write() method into separate pieces for greater flexibility in subclass controllers.

Browse source
This commit is contained in:
rjy7 2010-06-17 22:17:48 +00:00
parent 369a0f0a93
commit 083aa4e530
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java
View file

@ -69,7 +69,7 @@ public class FreeMarkerHttpServlet extends VitroHttpServlet {
doSetup(request, response); doSetup(request, response);
setUpPage(); setUpPage();
setTitleAndBody(); setTitleAndBody();
write(response); writePage();
} catch (Throwable e) { } catch (Throwable e) {
log.error("FreeMarkerHttpServlet could not forward to view."); log.error("FreeMarkerHttpServlet could not forward to view.");
@ -344,11 +344,18 @@ public class FreeMarkerHttpServlet extends VitroHttpServlet {
return body; return body;
} }
protected void write(HttpServletResponse response) { protected void writePage() {
String templateName = "page/" + getPageTemplateName(); String templateName = "page/" + getPageTemplateName();
writeTemplate(templateName, root);
}
protected void writeTemplate(String templateName, Map<String, Object> map) {
StringWriter sw = mergeToTemplate(templateName, map);
write(sw);
}
protected void write(StringWriter sw) {
StringWriter sw = mergeToTemplate(templateName, root);
try { try {
PrintWriter out = response.getWriter(); PrintWriter out = response.getWriter();
out.print(sw); out.print(sw);