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

VIVO-92 Remove OntModelSelector.getTBoxModel(String ontologyURI)

Browse source 
This variant of getTBoxModel() is never called in the code, and it not implemented correctly in any of the implementations of OntModelSelector. Lose it.
This commit is contained in:
j2blake 2013-05-28 15:39:07 -04:00
parent ee6141adc2
commit c9e666048e
4 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java
View file

@ -29,19 +29,15 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
* VitroRequest.getUnfilteredRDFService() * VitroRequest.getUnfilteredRDFService()
* VitroRequest.getWebappDaoFactory() * VitroRequest.getWebappDaoFactory()
* VitroRequest.getWriteModel() * VitroRequest.getWriteModel()
* VitroRequest.getJenaOntModel()
* vreq.setUnfilteredWebappDaoFactory(wadf); * vreq.setUnfilteredWebappDaoFactory(wadf);
* *
* OntModelSelector.getABoxModel * OntModelSelector.getABoxModel
* OntModelSelector.getFullModel() * OntModelSelector.getFullModel()
* OntModelSelector.getTBoxModel() * OntModelSelector.getTBoxModel()
* OntModelSelector.getTBoxModel(ontologyURI)
* VitroModelSource.getModel(URL) * VitroModelSource.getModel(URL)
* VitroModelSource.getModel(URL, loadIfAbsent) * VitroModelSource.getModel(URL, loadIfAbsent)
* VitroModelSource.openModel(name) * VitroModelSource.openModel(name)
* VitroModelSource.openModelIfPresent(string) * VitroModelSource.openModelIfPresent(string)
* ServletContext.getAttribute("deductionsWebappDaoFactory")
* ServletContext.getAttribute("baseOntModelSelector")
* ServletContext.getAttribute("jenaPersistentOntModel") * ServletContext.getAttribute("jenaPersistentOntModel")
* ServletContext.getAttribute("pelletOntModel") * ServletContext.getAttribute("pelletOntModel")
* VitroJenaModelMaker * VitroJenaModelMaker
@ -303,11 +299,6 @@ public class ModelAccess {
return parent.getOntModel(tboxID); return parent.getOntModel(tboxID);
} }
@Override
public OntModel getTBoxModel(String ontologyURI) {
return parent.getOntModel(tboxID);
}
@Override @Override
public OntModel getFullModel() { public OntModel getFullModel() {
return parent.getOntModel(fullID); return parent.getOntModel(fullID);

8
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java
View file

@ -35,13 +35,9 @@ public interface OntModelSelector {
* @return OntModel containing all TBox axioms * @return OntModel containing all TBox axioms
*/ */
public OntModel getTBoxModel(); public OntModel getTBoxModel();
/** /**
* @param ontologyURI * @return OntModel containing all RDF statements in the Display model.
* @return OntModel containing TBox axioms for the specified ontology
*/ */
public OntModel getTBoxModel(String ontologyURI);
public OntModel getDisplayModel(); public OntModel getDisplayModel();
} }

5
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java
View file

@ -38,11 +38,6 @@ public class OntModelSelectorImpl implements OntModelSelector {
return this.tboxModel; return this.tboxModel;
} }
@Override
public OntModel getTBoxModel(String ontologyURI) {
return this.tboxModel;
}
@Override @Override
public OntModel getUserAccountsModel() { public OntModel getUserAccountsModel() {
return this.userAccountsModel; return this.userAccountsModel;

10
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java
View file

@ -89,26 +89,27 @@ public class SimpleOntModelSelector implements OntModelSelector {
this.fullModel = m; this.fullModel = m;
} }
@Override
public OntModel getABoxModel() { public OntModel getABoxModel() {
return aboxModel; return aboxModel;
} }
@Override
public OntModel getApplicationMetadataModel() { public OntModel getApplicationMetadataModel() {
return applicationMetadataModel; return applicationMetadataModel;
} }
@Override
public OntModel getFullModel() { public OntModel getFullModel() {
return fullModel; return fullModel;
} }
@Override
public OntModel getTBoxModel() { public OntModel getTBoxModel() {
return tboxModel; return tboxModel;
} }
public OntModel getTBoxModel(String ontologyURI) { @Override
return tboxModel;
}
public OntModel getUserAccountsModel() { public OntModel getUserAccountsModel() {
return userAccountsModel; return userAccountsModel;
} }
@ -120,6 +121,7 @@ public class SimpleOntModelSelector implements OntModelSelector {
public void setDisplayModel(OntModel displayModel) { public void setDisplayModel(OntModel displayModel) {
this.displayModel = displayModel; this.displayModel = displayModel;
} }
@Override
public OntModel getDisplayModel(){ public OntModel getDisplayModel(){
return this.displayModel; return this.displayModel;
} }