From a97973800490542c643494e3b247e2b4ba234c92 Mon Sep 17 00:00:00 2001 From: ryounes Date: Fri, 15 Jul 2011 15:26:11 +0000 Subject: [PATCH] NIHVIVO-2924 Change name of getMostSpecificTypes DAO method to reflect the fact that it filters out types not in a classgroup --- .../cornell/mannlib/vitro/webapp/controller/JsonServlet.java | 2 +- .../mannlib/vitro/webapp/dao/ObjectPropertyStatementDao.java | 2 +- .../dao/filtering/ObjectPropertyStatementDaoFiltering.java | 4 ++-- .../vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java | 2 +- .../individual/BaseIndividualTemplateModel.java | 2 +- .../templatemodels/individuallist/BaseListedIndividual.java | 2 +- .../searchresult/BaseIndividualSearchResult.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java index daf601d51..fdede95ce 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java @@ -282,7 +282,7 @@ public class JsonServlet extends VitroHttpServlet { public static Collection getMostSpecificTypes(Individual individual, WebappDaoFactory wdf) { ObjectPropertyStatementDao opsDao = wdf.getObjectPropertyStatementDao(); - Map mostSpecificTypes = opsDao.getMostSpecificTypesForIndividual(individual.getURI()); + Map mostSpecificTypes = opsDao.getMostSpecificTypesInClassgroupsForIndividual(individual.getURI()); return mostSpecificTypes.values(); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDao.java index 7a905a880..20a6a173b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDao.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDao.java @@ -35,6 +35,6 @@ public interface ObjectPropertyStatementDao { public List> getObjectPropertyStatementsForIndividualByProperty(String subjectUri, String propertyUri, String objectKey, String query, Set constructQueries); - public Map getMostSpecificTypesForIndividual(String subjectUri); + public Map getMostSpecificTypesInClassgroupsForIndividual(String subjectUri); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementDaoFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementDaoFiltering.java index 3e83c2d9e..5b30acbde 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementDaoFiltering.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementDaoFiltering.java @@ -132,8 +132,8 @@ class ObjectPropertyStatementDaoFiltering extends BaseFiltering implements Objec } @Override - public Map getMostSpecificTypesForIndividual(String subjectUri) { - return innerObjectPropertyStatementDao.getMostSpecificTypesForIndividual(subjectUri); + public Map getMostSpecificTypesInClassgroupsForIndividual(String subjectUri) { + return innerObjectPropertyStatementDao.getMostSpecificTypesInClassgroupsForIndividual(subjectUri); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java index 924598bf4..7df5c7e7c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java @@ -400,7 +400,7 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec * Finds all mostSpecificTypes of an individual. * Returns a list of type labels. * **/ - public Map getMostSpecificTypesForIndividual(String subjectUri) { + public Map getMostSpecificTypesInClassgroupsForIndividual(String subjectUri) { String queryString = QueryUtils.subUriForQueryVar(MOST_SPECIFIC_TYPE_QUERY, "subject", subjectUri); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java index 9bf9ec044..99c9c3915 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java @@ -150,7 +150,7 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel { public Collection getMostSpecificTypes() { ObjectPropertyStatementDao opsDao = vreq.getWebappDaoFactory().getObjectPropertyStatementDao(); - Map types = opsDao.getMostSpecificTypesForIndividual(getUri()); + Map types = opsDao.getMostSpecificTypesInClassgroupsForIndividual(getUri()); return types.values(); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/BaseListedIndividual.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/BaseListedIndividual.java index e6d9b0e92..799cf33b6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/BaseListedIndividual.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/BaseListedIndividual.java @@ -61,7 +61,7 @@ public abstract class BaseListedIndividual extends BaseTemplateModel { public List getMostSpecificTypes() { ObjectPropertyStatementDao opsDao = vreq.getWebappDaoFactory().getObjectPropertyStatementDao(); - Map types = opsDao.getMostSpecificTypesForIndividual(individual.getURI()); + Map types = opsDao.getMostSpecificTypesInClassgroupsForIndividual(individual.getURI()); List typeLabels = new ArrayList(types.size()); String displayedType = (String) vreq.getAttribute("displayType"); for (String type : types.keySet()) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/BaseIndividualSearchResult.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/BaseIndividualSearchResult.java index 27297bff6..069852219 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/BaseIndividualSearchResult.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/BaseIndividualSearchResult.java @@ -55,7 +55,7 @@ public abstract class BaseIndividualSearchResult extends BaseTemplateModel { public Collection getMostSpecificTypes() { ObjectPropertyStatementDao opsDao = vreq.getWebappDaoFactory().getObjectPropertyStatementDao(); - Map types = opsDao.getMostSpecificTypesForIndividual(individual.getURI()); + Map types = opsDao.getMostSpecificTypesInClassgroupsForIndividual(individual.getURI()); return types.values(); }