From 54395c6cb359cae3f7fbbab5e8851afc83a755e2 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Tue, 7 Dec 2010 14:29:17 +0000 Subject: [PATCH] NIHVIVO-1333 Continued work on ontology property display --- .../CollatedObjectPropertyTemplateModel.java | 5 +++ .../individual/DataPropertyTemplateModel.java | 7 +++- .../ObjectPropertyStatementTemplateModel.java | 32 ++++++++++++------ .../ObjectPropertyTemplateModel.java | 5 +++ .../PropertyGroupTemplateModel.java | 5 +++ .../individual/PropertyListBuilder.java | 1 - .../individual/PropertyTemplateModel.java | 5 +++ .../individual/SubclassList.java | 15 ++++++--- ...UncollatedObjectPropertyTemplateModel.java | 33 ------------------- 9 files changed, 59 insertions(+), 49 deletions(-) delete mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java 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 51b05e905..c0301e8af 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 @@ -5,10 +5,15 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; import java.util.ArrayList; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateModel { + private static final Log log = LogFactory.getLog(CollatedObjectPropertyTemplateModel.class); + private List subclassList; CollatedObjectPropertyTemplateModel(ObjectProperty property) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java index 163c33617..cf1daedb9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java @@ -5,6 +5,9 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; import java.util.ArrayList; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -12,13 +15,15 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; public class DataPropertyTemplateModel extends PropertyTemplateModel { + + private static final Log log = LogFactory.getLog(DataPropertyTemplateModel.class); private static final String TYPE = "data"; private List statements; DataPropertyTemplateModel(DataProperty dp, Individual subject, WebappDaoFactory wdf) { super(dp); - // Get the data property statements via sparql query + // Get the data property statements via a sparql query DataPropertyStatementDao dpDao = wdf.getDataPropertyStatementDao(); List dpStatements = dpDao.getDataPropertyStatementsForIndividualByProperty(subject, dp); statements = new ArrayList(dpStatements.size()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java index b9f140871..85cfb1ceb 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java @@ -5,19 +5,31 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -public class ObjectPropertyStatementTemplateModel extends PropertyStatementTemplateModel { +import edu.cornell.mannlib.vitro.webapp.beans.Individual; +import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; +import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel; + +public class ObjectPropertyStatementTemplateModel extends BaseTemplateModel { private static final Log log = LogFactory.getLog(ObjectPropertyStatementTemplateModel.class); - // not sure whether we want the objects or the uris here - //protected ObjectProperty property = null; - protected String predicateUri = null; - //protected Individual object = null; - protected String objectUri = null; + private ObjectPropertyStatement statement; - ObjectPropertyStatementTemplateModel(String subjectUri, String predicateUri, String objectUri) { - this.subjectUri = subjectUri; - this.predicateUri = predicateUri; - this.objectUri = objectUri; + ObjectPropertyStatementTemplateModel(ObjectPropertyStatement statement) { + this.statement = statement; + } + + /* Access methods for templates */ + + public Individual getObject() { + return statement.getObject(); + } + + public String getEditLink() { + return null; + } + + public String getDeleteLink() { + return null; } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java index 0ee68edae..e386c35d5 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java @@ -5,10 +5,15 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; import java.util.ArrayList; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; public class ObjectPropertyTemplateModel extends PropertyTemplateModel { + private static final Log log = LogFactory.getLog(ObjectPropertyTemplateModel.class); + private static final String TYPE = "object"; private List statements; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java index 381dfd14b..cdccefa1b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java @@ -5,6 +5,9 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; import java.util.ArrayList; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; @@ -14,6 +17,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel; public class PropertyGroupTemplateModel extends BaseTemplateModel { + + private static final Log log = LogFactory.getLog(PropertyGroupTemplateModel.class); private String name; private List properties; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyListBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyListBuilder.java index 00cb8c291..6035b3363 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyListBuilder.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyListBuilder.java @@ -98,7 +98,6 @@ public class PropertyListBuilder { List groupList = addPropertiesToGroups(propertyList); // Build the template data model from the groupList - // List> groups = new ArrayList>(groupList.size()); List groups = new ArrayList(groupList.size()); for (PropertyGroup pg : groupList) { groups.add(new PropertyGroupTemplateModel(wdf, pg, subject)); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java index 48c900945..2951e4ef9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java @@ -2,6 +2,9 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import edu.cornell.mannlib.vitro.webapp.beans.Property; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel; @@ -9,6 +12,8 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel; * Represents the property statement list for a single property of an individual. */ public abstract class PropertyTemplateModel extends BaseTemplateModel { + + private static final Log log = LogFactory.getLog(PropertyTemplateModel.class); private String name; protected Property property; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/SubclassList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/SubclassList.java index a07d044ff..a3bf9551d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/SubclassList.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/SubclassList.java @@ -5,18 +5,25 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; import java.util.ArrayList; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel; + /** List of object property statements for an individual, where the objects belong to a single subclass **/ -public class SubclassList { +public class SubclassList extends BaseTemplateModel { + + private static final Log log = LogFactory.getLog(SubclassList.class); - String name = null; - List statements = null; + String name; + List statements; SubclassList(String name) { this.name = name; this.statements = new ArrayList(); - // get the obj property statements for this subclass from the db via sparql query + // get the obj property statements for this subclass from the db via a sparql query } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java deleted file mode 100644 index e4a5516be..000000000 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java +++ /dev/null @@ -1,33 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; - -import java.util.ArrayList; -import java.util.List; - -import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; - -public class UncollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateModel { - - private List statements; - - UncollatedObjectPropertyTemplateModel(ObjectProperty property) { - super(property); - statements = new ArrayList(); - - // get the statements from the db via sparql query - } - - @Override - public List getStatements() { - return statements; - } - - - /* Access methods for templates */ - - @Override - public boolean isCollatedBySubclass() { - return false; - } -}