diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java index cc10a0806..66204b310 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java @@ -29,19 +29,15 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector; * VitroRequest.getUnfilteredRDFService() * VitroRequest.getWebappDaoFactory() * VitroRequest.getWriteModel() - * VitroRequest.getJenaOntModel() * vreq.setUnfilteredWebappDaoFactory(wadf); * * OntModelSelector.getABoxModel * OntModelSelector.getFullModel() * OntModelSelector.getTBoxModel() - * OntModelSelector.getTBoxModel(ontologyURI) * VitroModelSource.getModel(URL) * VitroModelSource.getModel(URL, loadIfAbsent) * VitroModelSource.openModel(name) * VitroModelSource.openModelIfPresent(string) - * ServletContext.getAttribute("deductionsWebappDaoFactory") - * ServletContext.getAttribute("baseOntModelSelector") * ServletContext.getAttribute("jenaPersistentOntModel") * ServletContext.getAttribute("pelletOntModel") * VitroJenaModelMaker @@ -303,11 +299,6 @@ public class ModelAccess { return parent.getOntModel(tboxID); } - @Override - public OntModel getTBoxModel(String ontologyURI) { - return parent.getOntModel(tboxID); - } - @Override public OntModel getFullModel() { return parent.getOntModel(fullID); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java index e5aa2f68b..63d4d1446 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java @@ -35,13 +35,9 @@ public interface OntModelSelector { * @return OntModel containing all TBox axioms */ public OntModel getTBoxModel(); - + /** - * @param ontologyURI - * @return OntModel containing TBox axioms for the specified ontology + * @return OntModel containing all RDF statements in the Display model. */ - public OntModel getTBoxModel(String ontologyURI); - public OntModel getDisplayModel(); - } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java index 673ebdc91..a80d064f2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java @@ -38,11 +38,6 @@ public class OntModelSelectorImpl implements OntModelSelector { return this.tboxModel; } - @Override - public OntModel getTBoxModel(String ontologyURI) { - return this.tboxModel; - } - @Override public OntModel getUserAccountsModel() { return this.userAccountsModel; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java index 7564dc891..f3d150ac3 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java @@ -89,26 +89,27 @@ public class SimpleOntModelSelector implements OntModelSelector { this.fullModel = m; } + @Override public OntModel getABoxModel() { return aboxModel; } + @Override public OntModel getApplicationMetadataModel() { return applicationMetadataModel; } + @Override public OntModel getFullModel() { return fullModel; } + @Override public OntModel getTBoxModel() { return tboxModel; } - public OntModel getTBoxModel(String ontologyURI) { - return tboxModel; - } - + @Override public OntModel getUserAccountsModel() { return userAccountsModel; } @@ -120,6 +121,7 @@ public class SimpleOntModelSelector implements OntModelSelector { public void setDisplayModel(OntModel displayModel) { this.displayModel = displayModel; } + @Override public OntModel getDisplayModel(){ return this.displayModel; }