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

[VIVO-1245] Cleanup of MenuManagementDataUtils

Browse source
This commit is contained in:
Graham Triggs 2016-05-25 18:38:46 +01:00
parent 40abb0a4e1
commit dba5c4e005
3 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java → api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/VIVOMenuManagementDataUtils.java
View file

@ -23,18 +23,17 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
* This class includes methods that help in selecting a data getter based on * This class includes methods that help in selecting a data getter based on
* parameters, and VIVO will have its own version or extend this * parameters, and VIVO will have its own version or extend this
*/ */
public class MenuManagementDataUtils { public class VIVOMenuManagementDataUtils implements MenuManagementDataUtils.IMenuManagementDataUtils {
private static final Log log = LogFactory.getLog(MenuManagementDataUtils.class); private static final Log log = LogFactory.getLog(VIVOMenuManagementDataUtils.class);
//Data that is to be returned to template that does not involve data getters //Data that is to be returned to template that does not involve data getters
//e.g. what are the current class groups, etc. //e.g. what are the current class groups, etc.
public static void includeRequiredSystemData(ServletContext context, Map<String, Object> templateData) { public void includeRequiredSystemData(ServletContext context, Map<String, Object> templateData) {
checkInstitutionalInternalClass(context, templateData); checkInstitutionalInternalClass(context, templateData);
} }
//Check whether any classes exist with internal class restrictions //Check whether any classes exist with internal class restrictions
private static void checkInstitutionalInternalClass(ServletContext context, Map<String, Object> templateData) { private void checkInstitutionalInternalClass(ServletContext context, Map<String, Object> templateData) {
//TODO: replace with more generic ModelContext retrieval method //TODO: replace with more generic ModelContext retrieval method
String internalClass = retrieveInternalClass(context); String internalClass = retrieveInternalClass(context);
if(internalClass != null) { if(internalClass != null) {
@ -47,7 +46,7 @@ public class MenuManagementDataUtils {
} }
private static String retrieveInternalClass(ServletContext context) { private String retrieveInternalClass(ServletContext context) {
OntModel mainModel = ModelAccess.on(context).getOntModel(TBOX_ASSERTIONS); OntModel mainModel = ModelAccess.on(context).getOntModel(TBOX_ASSERTIONS);
StmtIterator internalIt = mainModel.listStatements(null, ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT), (RDFNode) null); StmtIterator internalIt = mainModel.listStatements(null, ResourceFactory.createProperty(VitroVocabulary.IS_INTERNAL_CLASSANNOT), (RDFNode) null);
if(internalIt.hasNext()) { if(internalIt.hasNext()) {

19
api/src/main/java/org/vivoweb/webapp/startup/MenuManagementSetup.java Normal file
View file

@ -0,0 +1,19 @@
package org.vivoweb.webapp.startup;
import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.MenuManagementDataUtils;
import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.VIVOMenuManagementDataUtils;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
public class MenuManagementSetup implements ServletContextListener {
@Override
public void contextInitialized(ServletContextEvent servletContextEvent) {
MenuManagementDataUtils.setImplementation(new VIVOMenuManagementDataUtils());
}
@Override
public void contextDestroyed(ServletContextEvent servletContextEvent) {
}
}

1
webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
View file

@ -59,6 +59,7 @@ edu.cornell.mannlib.vitro.webapp.visualization.setup.VisualizationSetup
org.vivoweb.webapp.startup.DataGetterN3Setup org.vivoweb.webapp.startup.DataGetterN3Setup
org.vivoweb.webapp.startup.GeneratorSetup org.vivoweb.webapp.startup.GeneratorSetup
org.vivoweb.webapp.startup.MenuManagementSetup
org.vivoweb.webapp.startup.SearchResultTemplateModelSetup org.vivoweb.webapp.startup.SearchResultTemplateModelSetup
edu.ucsf.vitro.opensocial.OpenSocialSmokeTests edu.ucsf.vitro.opensocial.OpenSocialSmokeTests