From ef412632cfa5378742178a0321361bd9081191be Mon Sep 17 00:00:00 2001 From: briancaruso Date: Thu, 9 Feb 2012 21:36:10 +0000 Subject: [PATCH] Using constant string for context attribute key for display model. --- .../webapp/controller/freemarker/NavigationController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/NavigationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/NavigationController.java index 2ff4ea03a..21b96f5eb 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/NavigationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/NavigationController.java @@ -32,6 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Res import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import freemarker.template.Configuration; +import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.DISPLAY_ONT_MODEL; public class NavigationController extends FreemarkerHttpServlet { private static final long serialVersionUID = 1L; @@ -43,14 +44,14 @@ public class NavigationController extends FreemarkerHttpServlet { @Override public void init(ServletConfig config) throws ServletException { super.init(config); - OntModel displayOntModel = (OntModel)config.getServletContext().getAttribute("displayOntModel"); + OntModel displayOntModel = (OntModel)config.getServletContext().getAttribute(DISPLAY_ONT_MODEL); this.urlPatterns = new NavigationURLPatternListener( ); displayOntModel.getBaseModel().register( urlPatterns ); } @Override protected ResponseValues processRequest(VitroRequest vreq) { - OntModel displayOntModel = (OntModel)getServletContext().getAttribute("displayOntModel"); + OntModel displayOntModel = (OntModel)getServletContext().getAttribute(DISPLAY_ONT_MODEL); OntModel jenaOntModel = (OntModel)getServletContext().getAttribute("jenaOntModel"); //figure out what is being requested