diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappsListingController.java index 1ae653357..7ff98c3ed 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappsListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappsListingController.java @@ -50,7 +50,7 @@ public class VClassWebappsListingController extends BaseEditController { if (request.getParameter("showPropertyRestrictions") != null) { PropertyDao pdao = getWebappDaoFactory().getObjectPropertyDao(); - classes = pdao.getClassesRestrictedOn(request.getParameter("propertyURI")); + classes = pdao.getClassesWithRestrictionOnProperty(request.getParameter("propertyURI")); } else { VClassDao vcdao = getWebappDaoFactory().getVClassDao(); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java index 668e4f05f..7274a413b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java @@ -43,6 +43,6 @@ public interface PropertyDao { List getEquivalentPropertyURIs(String propertyURI); - List getClassesRestrictedOn(String propertyURI); + List getClassesWithRestrictionOnProperty(String propertyURI); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java index 0da8eba02..22f360a6d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java @@ -185,8 +185,8 @@ class DataPropertyDaoFiltering extends BaseFiltering implements DataPropertyDao{ innerDataPropertyDao.removeEquivalentProperty(property, equivalentProperty); } - public List getClassesRestrictedOn(String propertyURI) { - return innerDataPropertyDao.getClassesRestrictedOn(propertyURI); + public List getClassesWithRestrictionOnProperty(String propertyURI) { + return innerDataPropertyDao.getClassesWithRestrictionOnProperty(propertyURI); } } \ No newline at end of file diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java index b7d36872e..d6b7fe134 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java @@ -198,8 +198,8 @@ class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectProperty return innerObjectPropertyDao.skipEditForm(predicateURI); } - public List getClassesRestrictedOn(String propertyURI) { - return innerObjectPropertyDao.getClassesRestrictedOn(propertyURI); + public List getClassesWithRestrictionOnProperty(String propertyURI) { + return innerObjectPropertyDao.getClassesWithRestrictionOnProperty(propertyURI); } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java index 20114f868..440957907 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java @@ -283,10 +283,10 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao { * definitions involving a restriction on the given property. */ - public List getClassesRestrictedOn(String propertyURI) { + public List getClassesWithRestrictionOnProperty(String propertyURI) { if (propertyURI == null) { - log.info("getClassesRestrictedOn: called with null propertyURI"); + log.info("getClassesWithRestrictionOnProperty: called with null propertyURI"); return null; } @@ -308,11 +308,11 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao { if ( statement.getSubject().canAs(OntClass.class) ) { classURISet.addAll(getRelatedClasses((OntClass) statement.getSubject().as(OntClass.class))); } else { - log.warn("getClassesRestrictedOn: Unexpected use of onProperty: it is not applied to a restriction"); + log.warn("getClassesWithRestrictionOnProperty: Unexpected use of onProperty: it is not applied to a class"); } } } else { - log.error("getClassesRestrictedOn: Error: didn't find a Property in the ontology model for the URI: " + propertyURI); + log.error("getClassesWithRestrictionOnProperty: Error: didn't find a Property in the ontology model for the URI: " + propertyURI); } } finally { ontModel.leaveCriticalSection(); @@ -331,7 +331,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao { if (vc != null) { classes.add(vc); } else { - log.error("getClassesRestrictedOn: Error: no VClass found for URI: " + curi); + log.error("getClassesWithRestrictionOnProperty: Error: no VClass found for URI: " + curi); } }