NIHVIVO-1333 Continued work on ontology property display

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> subclassList;
     
     CollatedObjectPropertyTemplateModel(ObjectProperty property) {

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<DataPropertyStatementTemplateModel> 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<DataPropertyStatement> dpStatements = dpDao.getDataPropertyStatementsForIndividualByProperty(subject, dp);
         statements = new ArrayList<DataPropertyStatementTemplateModel>(dpStatements.size());

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
+    private ObjectPropertyStatement statement;
-    //protected ObjectProperty property = null;
-    protected String predicateUri = null;
-    //protected Individual object = null;
-    protected String objectUri = null;
 
-    ObjectPropertyStatementTemplateModel(String subjectUri, String predicateUri, String objectUri) {
+    ObjectPropertyStatementTemplateModel(ObjectPropertyStatement statement) {
-        this.subjectUri = subjectUri;
+        this.statement = statement;
-        this.predicateUri = predicateUri;
+    }
-        this.objectUri = objectUri;
+    
+    /* Access methods for templates */
+    
+    public Individual getObject() {
+        return statement.getObject();
+    }
+    
+    public String getEditLink() {
+        return null;
+    }
+    
+    public String getDeleteLink() {
+        return null;
     }
 }

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<ObjectPropertyStatementTemplateModel> statements;
 

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<PropertyTemplateModel> properties;

webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyListBuilder.java

@@ -98,7 +98,6 @@ public class PropertyListBuilder {
         List<PropertyGroup> groupList = addPropertiesToGroups(propertyList);
 
         // Build the template data model from the groupList
-        // List<Map<String, Object>> groups = new ArrayList<Map<String, Object>>(groupList.size());
         List<PropertyGroupTemplateModel> groups = new ArrayList<PropertyGroupTemplateModel>(groupList.size());
         for (PropertyGroup pg : groupList) {
             groups.add(new PropertyGroupTemplateModel(wdf, pg, subject));

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;

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;
+    String name;
-    List<ObjectPropertyStatementTemplateModel> statements = null;
+    List<ObjectPropertyStatementTemplateModel> statements;
 
     SubclassList(String name) {
         this.name = name;
         this.statements = new ArrayList<ObjectPropertyStatementTemplateModel>();
         
-        // 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
     
     }
 

webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java

@@ -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<ObjectPropertyStatementTemplateModel> statements;
-    
-    UncollatedObjectPropertyTemplateModel(ObjectProperty property) {
-        super(property);
-        statements = new ArrayList<ObjectPropertyStatementTemplateModel>();
-        
-        // get the statements from the db via sparql query
-    }
-    
-    @Override
-    public List<ObjectPropertyStatementTemplateModel> getStatements() {
-        return statements;
-    }
-    
-
-    /* Access methods for templates */
-    
-    @Override
-    public boolean isCollatedBySubclass() {
-        return false;
-    }
-}