From 877dfb5438f1e05c4e9281eb535ca70bbacd3b61 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Wed, 22 Dec 2010 16:52:35 +0000 Subject: [PATCH] Added getTitle() method to EmptyController. Requires changing method signature to take a VitroRequest object. --- .../authenticate/FakeExternalAuthController.java | 2 +- .../authenticate/UnrecognizedUserController.java | 2 +- .../webapp/controller/edit/PrimitiveRdfEdit.java | 2 +- .../webapp/controller/freemarker/AboutController.java | 2 +- .../controller/freemarker/BrowseController.java | 2 +- .../controller/freemarker/ContactFormController.java | 2 +- .../controller/freemarker/ContactMailController.java | 2 +- .../webapp/controller/freemarker/EmptyController.java | 11 +++++++++++ .../controller/freemarker/FreemarkerHttpServlet.java | 4 ++-- .../controller/freemarker/HomePageController.java | 4 +--- .../controller/freemarker/RevisionInfoController.java | 2 +- .../controller/freemarker/SamplesController.java | 2 +- .../controller/freemarker/SiteAdminController.java | 2 +- .../controller/freemarker/TermsOfUseController.java | 2 +- .../webapp/controller/freemarker/TestController.java | 2 +- .../webapp/search/controller/IndexController.java | 2 +- 16 files changed, 27 insertions(+), 18 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java index 577db8ff9..6254cd603 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java @@ -44,7 +44,7 @@ public class FakeExternalAuthController extends FreemarkerHttpServlet { } @Override - protected String getTitle(String siteName) { + protected String getTitle(String siteName, VitroRequest vreq) { return "Fake external login " + siteName; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/UnrecognizedUserController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/UnrecognizedUserController.java index 33e367f26..c44ba5c7b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/UnrecognizedUserController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/UnrecognizedUserController.java @@ -31,7 +31,7 @@ public class UnrecognizedUserController extends FreemarkerHttpServlet { } @Override - protected String getTitle(String siteName) { + protected String getTitle(String siteName, VitroRequest vreq) { return "Unrecognized user " + siteName; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java index 981ed286d..e9aa28f55 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java @@ -35,7 +35,7 @@ public class PrimitiveRdfEdit extends FreemarkerHttpServlet{ private static final long serialVersionUID = 1L; @Override - protected String getTitle(String siteName) { + protected String getTitle(String siteName, VitroRequest vreq) { return "RDF edit"; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java index f81eafe09..c208fcd23 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java @@ -32,7 +32,7 @@ public class AboutController extends FreemarkerHttpServlet { } @Override - protected String getTitle(String siteName) { + protected String getTitle(String siteName, VitroRequest vreq) { return "About " + siteName; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java index 4d21c59b9..a284f2d69 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java @@ -49,7 +49,7 @@ public class BrowseController extends FreemarkerHttpServlet { private static final String TEMPLATE_DEFAULT = "classGroups.ftl"; @Override - protected String getTitle(String siteName) { + protected String getTitle(String siteName, VitroRequest vreq) { return "Index to " + siteName + " Contents"; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java index f86e05846..b365fc8a1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java @@ -37,7 +37,7 @@ public class ContactFormController extends FreemarkerHttpServlet { private static final String TEMPLATE_ERROR = "contactForm-error.ftl"; @Override - protected String getTitle(String siteName) { + protected String getTitle(String siteName, VitroRequest vreq) { return siteName + " Feedback Form"; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java index 628e4b89b..b487c08cc 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java @@ -75,7 +75,7 @@ public class ContactMailController extends FreemarkerHttpServlet { } @Override - protected String getTitle(String siteName) { + protected String getTitle(String siteName, VitroRequest vreq) { return siteName + " Feedback Form"; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/EmptyController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/EmptyController.java index 368461660..1ffb47168 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/EmptyController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/EmptyController.java @@ -21,12 +21,23 @@ public class EmptyController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(EmptyController.class); + @SuppressWarnings("serial") private static final Map urlsToTemplates = new HashMap(){ { put("/login", "login.ftl"); } }; + @Override + protected String getTitle(String siteName, VitroRequest vreq) { + String requestedUrl = vreq.getServletPath(); + String title = null; + if (requestedUrl.equals("/login")) { + title = "Log in to " + siteName; + } + return title; + } + protected ResponseValues processRequest(VitroRequest vreq) { String requestedUrl = vreq.getServletPath(); String templateName = urlsToTemplates.get(requestedUrl); 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 d055e130a..f12e30150 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 @@ -341,7 +341,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { map.put("siteName", siteName); // This may be overridden by the body data model received from the subcontroller. - map.put("title", getTitle(siteName)); + map.put("title", getTitle(siteName, vreq)); String themeDir = getThemeDir(portal); UrlBuilder urlBuilder = new UrlBuilder(portal); @@ -426,7 +426,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { } // Subclasses may override. This serves as a default. - protected String getTitle(String siteName) { + protected String getTitle(String siteName, VitroRequest vreq) { return siteName; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java index 5f7f73eb4..ed4a31a78 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java @@ -8,9 +8,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.Template; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; @@ -30,7 +28,7 @@ public class HomePageController extends FreemarkerHttpServlet { } @Override - protected String getTitle(String siteName) { + protected String getTitle(String siteName, VitroRequest vreq) { return siteName; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java index fbbe3fb33..f7adf924c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java @@ -47,7 +47,7 @@ public class RevisionInfoController extends FreemarkerHttpServlet { } @Override - protected String getTitle(String siteName) { + protected String getTitle(String siteName, VitroRequest vreq) { return "Revision Information for " + siteName; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java index 818b4cadd..e851cef07 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java @@ -99,7 +99,7 @@ public class SamplesController extends FreemarkerHttpServlet { } @Override - protected String getTitle(String siteName) { + protected String getTitle(String siteName, VitroRequest vreq) { return "Freemarker Samples"; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java index 4fdf38612..7b6002f51 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java @@ -32,7 +32,7 @@ public class SiteAdminController extends FreemarkerHttpServlet { private static final int REQUIRED_LOGIN_LEVEL = LoginStatusBean.EDITOR; @Override - public String getTitle(String siteName) { + public String getTitle(String siteName, VitroRequest vreq) { return siteName + " Site Administration"; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java index c17c6c6f6..d3c9e0f67 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java @@ -37,7 +37,7 @@ public class TermsOfUseController extends FreemarkerHttpServlet { } @Override - protected String getTitle(String siteName) { + protected String getTitle(String siteName, VitroRequest vreq) { return siteName + " Terms of Use"; } } \ No newline at end of file diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java index f5c96d9ec..6179c16a9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java @@ -41,7 +41,7 @@ public class TestController extends FreemarkerHttpServlet { } @Override - protected String getTitle(String siteName) { + protected String getTitle(String siteName, VitroRequest vreq) { return "Test"; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java index aee1488f8..f754a7bf7 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java @@ -67,7 +67,7 @@ public class IndexController extends FreemarkerHttpServlet { // } @Override - protected String getTitle(String siteName) { + protected String getTitle(String siteName, VitroRequest vreq) { return "Full Search Index Rebuild"; }