From c086a595e13b3d925ac0c7948370656e901b6b53 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 21 May 2013 16:06:54 -0400 Subject: [PATCH] VIVO-82 Tweak the uses of ModelAccess to keep backward compatibility. Even if it appears to the untrained eye that the models are being misused. --- .../mannlib/vitro/webapp/controller/VitroRequest.java | 6 ++++-- .../generators/DefaultObjectPropertyFormGenerator.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java index 3f4d2d329..a80542d5c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java @@ -175,12 +175,14 @@ public class VitroRequest extends HttpServletRequestWrapper { return ModelAccess.on(this).getJenaOntModel(); } + /** JB - surprising that this comes from session. */ public OntModel getAssertionsOntModel() { - return ModelAccess.on(this).getBaseOntModel(); + return ModelAccess.on(this.getSession()).getBaseOntModel(); } + /** JB - surprising that this comes from session. */ public OntModel getInferenceOntModel() { - return ModelAccess.on(this).getInferenceOntModel(); + return ModelAccess.on(this.getSession()).getInferenceOntModel(); } public OntModel getDisplayModel(){ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java index e8d497d97..8b289802d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java @@ -409,7 +409,7 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene if(isSelectFromExisting(vreq)) { // set ProhibitedFromSearch object so picklist doesn't show // 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( DisplayVocabulary.SEARCH_INDEX_URI, displayOntModel); if( editConfig != null )