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

VIVO-82 Tweak the uses of ModelAccess to keep backward compatibility.

Browse source 
Even if it appears to the untrained eye that the models are being misused.
This commit is contained in:
j2blake 2013-05-21 16:06:54 -04:00
parent 749e667e6a
commit c086a595e1
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java
View file

@ -175,12 +175,14 @@ public class VitroRequest extends HttpServletRequestWrapper {
return ModelAccess.on(this).getJenaOntModel(); return ModelAccess.on(this).getJenaOntModel();
} }
/** JB - surprising that this comes from session. */
public OntModel getAssertionsOntModel() { public OntModel getAssertionsOntModel() {
return ModelAccess.on(this).getBaseOntModel(); return ModelAccess.on(this.getSession()).getBaseOntModel();
} }
/** JB - surprising that this comes from session. */
public OntModel getInferenceOntModel() { public OntModel getInferenceOntModel() {
return ModelAccess.on(this).getInferenceOntModel(); return ModelAccess.on(this.getSession()).getInferenceOntModel();
} }
public OntModel getDisplayModel(){ public OntModel getDisplayModel(){

2
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java
View file

@ -409,7 +409,7 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
if(isSelectFromExisting(vreq)) { if(isSelectFromExisting(vreq)) {
// set ProhibitedFromSearch object so picklist doesn't show // set ProhibitedFromSearch object so picklist doesn't show
// individuals from classes that should be hidden from list views // individuals from classes that should be hidden from list views
OntModel displayOntModel = ModelAccess.on(session).getDisplayModel(); OntModel displayOntModel = ModelAccess.on(session.getServletContext()).getDisplayModel();
ProhibitedFromSearch pfs = new ProhibitedFromSearch( ProhibitedFromSearch pfs = new ProhibitedFromSearch(
DisplayVocabulary.SEARCH_INDEX_URI, displayOntModel); DisplayVocabulary.SEARCH_INDEX_URI, displayOntModel);
if( editConfig != null ) if( editConfig != null )