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

NIHVIVO-2164 Change a class name

Browse source
This commit is contained in:
ryounes 2011-08-11 18:43:02 +00:00
parent 4aa4b5ec76
commit 100df03127
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.Tags;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.Tags.TagsBeansWrapper;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.Tags.TagsWrapper;
import freemarker.cache.ClassTemplateLoader;
import freemarker.cache.FileTemplateLoader;
import freemarker.cache.MultiTemplateLoader;
@ -187,7 +187,7 @@ public class FreemarkerConfiguration extends Configuration {
*/
private TemplateModel wrapTagList(Tags tags) {
try {
BeansWrapper wrapper = new TagsBeansWrapper();
BeansWrapper wrapper = new TagsWrapper();
return wrapper.wrap(tags); // this is a StringModel
} catch (TemplateModelException e) {
log.error("Error creating Tags template model");

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

@ -282,7 +282,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
if (FreemarkerEmailFactory.isConfigured(vreq)) {
urls.put("contact", UrlBuilder.getUrl(Route.CONTACT));
} else {
urls.remove("contact");
urls.remove("contact"); // clear value from a previous request
}
urls.put("currentPage", getCurrentPageUrl(vreq));
@ -291,7 +291,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
if (PolicyHelper.isAuthorizedForActions(vreq, new EditOwnAccount())) {
urls.put("myAccount", UrlBuilder.getUrl("/accounts/myAccount"));
} else {
urls.remove("myAccount");
urls.remove("myAccount"); // clear value from a previous request
}
config.setSharedVariable("urls", urls);

4
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/Tags.java
View file

@ -31,9 +31,9 @@ public class Tags extends BaseTemplateModel {
tags.clear();
}
static public class TagsBeansWrapper extends BeansWrapper {
static public class TagsWrapper extends BeansWrapper {
public TagsBeansWrapper() {
public TagsWrapper() {
// Start by exposing all safe methods.
setExposureLevel(EXPOSE_SAFE);
}