From 1dacb70669b52869703b1bc6644cd227bbbc65c5 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Tue, 12 Jul 2011 17:30:56 +0000 Subject: [PATCH] NIHVIVO-2875 fixed PropertyInstance deletion to delete in both directions again --- .../vitro/webapp/dao/jena/PropertyInstanceDaoJena.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java index 6c36da219..92fa288a3 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java @@ -48,14 +48,16 @@ public class PropertyInstanceDaoJena extends JenaBaseDao implements } public void deleteObjectPropertyStatement(String subjectURI, String propertyURI, String objectURI) { - deleteObjectPropertyStatement(subjectURI, propertyURI, objectURI, getOntModelSelector().getABoxModel()); + deleteObjectPropertyStatement(subjectURI, propertyURI, objectURI, getOntModelSelector()); } - public void deleteObjectPropertyStatement(String subjectURI, String propertyURI, String objectURI, OntModel ontModel) { + public void deleteObjectPropertyStatement(String subjectURI, String propertyURI, String objectURI, OntModelSelector ontModelSelector) { + OntModel ontModel = ontModelSelector.getABoxModel(); + OntModel tboxModel = ontModelSelector.getTBoxModel(); ontModel.enterCriticalSection(Lock.WRITE); try { Resource subjRes = ontModel.getResource(subjectURI); - Property pred = ontModel.getProperty(propertyURI); + Property pred = tboxModel.getProperty(propertyURI); OntProperty invPred = null; if (pred.canAs(OntProperty.class)) { invPred = ((OntProperty)pred.as(OntProperty.class)).getInverse(); @@ -468,4 +470,4 @@ public class PropertyInstanceDaoJena extends JenaBaseDao implements this.deleteObjectPropertyStatement(prop.getSubjectEntURI(), prop.getPropertyURI(), prop.getObjectEntURI()); } -} \ No newline at end of file +}