From 42d4c5f0ac35d3d7804bfe3fee31c3c342996342 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Tue, 14 Dec 2010 19:37:00 +0000 Subject: [PATCH] Comments --- .../mannlib/vitro/webapp/dao/ObjectPropertyDao.java | 2 +- .../webapp/dao/filtering/ObjectPropertyDaoFiltering.java | 4 ++-- .../vitro/webapp/dao/jena/ObjectPropertyDaoJena.java | 2 +- .../individual/CollatedObjectPropertyTemplateModel.java | 8 ++++++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java index dd6ffc6cd..4dafd01a5 100755 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java @@ -56,5 +56,5 @@ public interface ObjectPropertyDao extends PropertyDao { public List getObjectPropertyList(String subjectUri); - public String getCustomShortView(); + public String getCustomListView(); } 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 4fedef1a1..899af6871 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 @@ -216,7 +216,7 @@ class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectProperty } @Override - public String getCustomShortView() { - return innerObjectPropertyDao.getCustomShortView(); + public String getCustomListView() { + return innerObjectPropertyDao.getCustomListView(); } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java index cff2ca184..d8afcfb39 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java @@ -859,7 +859,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp } @Override - public String getCustomShortView() { + public String getCustomListView() { //return getPropertyStringValue(, PROPERTY_CUSTOM_LIST_VIEW_ANNOT); return null; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java index 8debf0476..678180bcf 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java @@ -28,6 +28,14 @@ public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateM CollatedObjectPropertyTemplateModel(ObjectProperty op, Individual subject, WebappDaoFactory wdf) throws Exception { super(op, subject, wdf); + /* Change the approach to collation: + * Custom views can get the subclasses in the query. Must use a term ?subclass - throw error if not. + * Default view: we may be able to figure out the class to get subclasses of by inspecting the property. + * If not, use getDirectClasses etc of the object term. + * We need a subclassed and nonsubclassed default query for the default view: collated-query and uncollated-query. + * We can also use these for custom views. Throw error if property is collated but there's no subclass term + * in the query. (The reverse is okay - uncollated property with a subclass term in the query. + */ String collationTargetError = getCollationTargetError(); if ( ! collationTargetError.isEmpty()) { String errorMessage = "Collation target error for collated object property " + getName() + ": " +