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

Added getTitle() method to EmptyController. Requires changing method signature to take a VitroRequest object.

Browse source
This commit is contained in:
rjy7 2010-12-22 16:52:35 +00:00
parent 714feec254
commit 877dfb5438
16 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java
View file

@ -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;
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/UnrecognizedUserController.java
View file

@ -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;
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java
View file

@ -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";
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java
View file

@ -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;
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java
View file

@ -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";
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java
View file

@ -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";
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java
View file

@ -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";
}

11
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/EmptyController.java
View file

@ -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<String, String> urlsToTemplates = new HashMap<String, String>(){
{
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);

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

@ -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;
}

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java
View file

@ -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;
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java
View file

@ -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;
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java
View file

@ -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";
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
View file

@ -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";
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java
View file

@ -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";
}
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java
View file

@ -41,7 +41,7 @@ public class TestController extends FreemarkerHttpServlet {
}
@Override
protected String getTitle(String siteName) {
protected String getTitle(String siteName, VitroRequest vreq) {
return "Test";
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java
View file

@ -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";
}