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

change method name (of the method newly added to PropertyDaoJena) from getClassesRestrictedOn to getClassesWithRestrictionOnProperty (NIHVIVO-404)

Browse source
This commit is contained in:
sjm222 2010-04-28 17:01:17 +00:00
parent d718ebb9de
commit 886d88e129
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappsListingController.java
View file

@ -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();

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java
View file

@ -43,6 +43,6 @@ public interface PropertyDao {
List <String> getEquivalentPropertyURIs(String propertyURI);
List <VClass> getClassesRestrictedOn(String propertyURI);
List <VClass> getClassesWithRestrictionOnProperty(String propertyURI);
}

4
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java
View file

@ -185,8 +185,8 @@ class DataPropertyDaoFiltering extends BaseFiltering implements DataPropertyDao{
innerDataPropertyDao.removeEquivalentProperty(property, equivalentProperty);
}
public List <VClass> getClassesRestrictedOn(String propertyURI) {
return innerDataPropertyDao.getClassesRestrictedOn(propertyURI);
public List <VClass> getClassesWithRestrictionOnProperty(String propertyURI) {
return innerDataPropertyDao.getClassesWithRestrictionOnProperty(propertyURI);
}
}

4
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java
View file

@ -198,8 +198,8 @@ class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectProperty
return innerObjectPropertyDao.skipEditForm(predicateURI);
}
public List <VClass> getClassesRestrictedOn(String propertyURI) {
return innerObjectPropertyDao.getClassesRestrictedOn(propertyURI);
public List <VClass> getClassesWithRestrictionOnProperty(String propertyURI) {
return innerObjectPropertyDao.getClassesWithRestrictionOnProperty(propertyURI);
}
}

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

@ -283,10 +283,10 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
* definitions involving a restriction on the given property.
*/
public List <VClass> getClassesRestrictedOn(String propertyURI) {
public List <VClass> 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);
}
}