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

NIHVIVO-3729 small refactoring in how to create a FreemarkerConfiguration

Browse source
This commit is contained in:
j2blake 2012-04-20 17:21:41 +00:00
parent 9386832142
commit ac873fe238
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,6 @@ import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
import edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean; 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.controller.freemarker.UrlBuilder.Route;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfigurationConstants; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfigurationConstants;
import edu.cornell.mannlib.vitro.webapp.web.methods.IndividualLocalNameMethod; import edu.cornell.mannlib.vitro.webapp.web.methods.IndividualLocalNameMethod;
@ -40,14 +39,12 @@ public class FreemarkerConfiguration extends Configuration {
private final String themeDir; private final String themeDir;
private final ServletContext context; private final ServletContext context;
private final ApplicationBean appBean; private final ApplicationBean appBean;
private final String appName;
FreemarkerConfiguration(String themeDir, VitroRequest vreq, ServletContext context) { FreemarkerConfiguration(String themeDir, ApplicationBean appBean, ServletContext context) {
this.themeDir = themeDir; this.themeDir = themeDir;
this.context = context; this.context = context;
this.appBean = vreq.getAppBean(); this.appBean = appBean;
this.appName = appBean.getApplicationName();
String buildEnv = ConfigurationProperties.getBean(context).getProperty("Environment.build"); String buildEnv = ConfigurationProperties.getBean(context).getProperty("Environment.build");
log.debug("Current build environment: " + buildEnv); log.debug("Current build environment: " + buildEnv);
@ -88,7 +85,7 @@ public class FreemarkerConfiguration extends Configuration {
setTemplateLoader(createTemplateLoader()); setTemplateLoader(createTemplateLoader());
setSharedVariables(vreq); setSharedVariables();
} }
@ -96,13 +93,12 @@ public class FreemarkerConfiguration extends Configuration {
* These are values that are accessible to all * These are values that are accessible to all
* templates loaded by the Configuration's TemplateLoader. They * templates loaded by the Configuration's TemplateLoader. They
* should be application- rather than request-specific. * should be application- rather than request-specific.
* @param VitroRequest vreq
*/ */
private void setSharedVariables(VitroRequest vreq) { private void setSharedVariables() {
Map<String, Object> sharedVariables = new HashMap<String, Object>(); Map<String, Object> sharedVariables = new HashMap<String, Object>();
sharedVariables.put("siteName", appName); sharedVariables.put("siteName", appBean.getApplicationName());
sharedVariables.put("version", getRevisionInfo()); sharedVariables.put("version", getRevisionInfo());
sharedVariables.put("urls", getSiteUrls()); sharedVariables.put("urls", getSiteUrls());
sharedVariables.put("themeDir", themeDir); sharedVariables.put("themeDir", themeDir);

8
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerConfigurationLoader.java
View file

@ -22,7 +22,7 @@ public class FreemarkerConfigurationLoader {
public static FreemarkerConfiguration getConfig(VitroRequest vreq, public static FreemarkerConfiguration getConfig(VitroRequest vreq,
ServletContext context) { ServletContext context) {
String themeDir = getThemeDir(vreq.getAppBean()); String themeDir = getThemeDir(vreq.getAppBean());
return getConfigForTheme(themeDir, vreq, context); return getConfigForTheme(themeDir, vreq.getAppBean(), context);
} }
private static String getThemeDir(ApplicationBean appBean) { private static String getThemeDir(ApplicationBean appBean) {
@ -46,16 +46,16 @@ public class FreemarkerConfigurationLoader {
* 1. The template loader is theme-specific, since it specifies a theme * 1. The template loader is theme-specific, since it specifies a theme
* directory to load templates from. * directory to load templates from.
* *
* 2. Shared variables like stylesheets are theme-specific. * 2. Some shared variables are theme-specific.
*/ */
private static FreemarkerConfiguration getConfigForTheme(String themeDir, private static FreemarkerConfiguration getConfigForTheme(String themeDir,
VitroRequest vreq, ServletContext context) { ApplicationBean appBean, ServletContext context) {
synchronized (themeToConfigMap) { synchronized (themeToConfigMap) {
if (themeToConfigMap.containsKey(themeDir)) { if (themeToConfigMap.containsKey(themeDir)) {
return themeToConfigMap.get(themeDir); return themeToConfigMap.get(themeDir);
} else { } else {
FreemarkerConfiguration config = new FreemarkerConfiguration( FreemarkerConfiguration config = new FreemarkerConfiguration(
themeDir, vreq, context); themeDir, appBean, context);
themeToConfigMap.put(themeDir, config); themeToConfigMap.put(themeDir, config);
return config; return config;
} }