From ecbda5be7b1208963056590473afa91e710ab326 Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Mon, 2 Mar 2015 11:34:48 -0500 Subject: [PATCH] VIVO-946 remove vestigial method: ObjectPropertyDao.getStatementsUsingObjectProperty() --- .../mannlib/vitro/webapp/dao/ObjectPropertyDao.java | 4 ---- .../webapp/dao/filtering/ObjectPropertyDaoFiltering.java | 7 ------- .../vitro/webapp/dao/jena/ObjectPropertyDaoJena.java | 4 ---- .../mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java | 7 ------- 4 files changed, 22 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 76eddf603..82df46d3a 100755 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java @@ -6,8 +6,6 @@ import java.util.List; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; -import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; -import edu.cornell.mannlib.vitro.webapp.beans.VClass; public interface ObjectPropertyDao extends PropertyDao { @@ -35,8 +33,6 @@ public interface ObjectPropertyDao extends PropertyDao { public List getSubPropertyURIs(String objectPropertyURI); - public List getStatementsUsingObjectProperty(ObjectProperty op); - public void fillObjectPropertiesForIndividual(Individual individual); public int insertObjectProperty(ObjectProperty objectProperty ) throws InsertException; 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 0a5848d98..73b0a9cab 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 @@ -2,17 +2,14 @@ package edu.cornell.mannlib.vitro.webapp.dao.filtering; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import net.sf.jga.algorithms.Filter; import net.sf.jga.fn.UnaryFunctor; import net.sf.jga.fn.adaptor.AndUnary; -import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; -import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Property; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.dao.InsertException; @@ -59,10 +56,6 @@ class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectProperty return (newOprop == null) ? null : new ObjectPropertyFiltering(newOprop, filters); } - public List getStatementsUsingObjectProperty(ObjectProperty op) { - return ObjectPropertyStatementDaoFiltering.filterAndWrapList(innerObjectPropertyDao.getStatementsUsingObjectProperty(op),filters); - } - public List getRootObjectProperties() { return filterAndWrap(innerObjectPropertyDao.getRootObjectProperties(),filters); } 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 1d5abfd64..d7441c266 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 @@ -933,10 +933,6 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp return subURIs; } - public List getStatementsUsingObjectProperty(ObjectProperty op) { - return null; - } - // checks for annotation property vitro:skipEditForm. // Used by N3 editing system to govern behavior of edit link: // if annotation is present, editing system redirects to display diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java index 33c802dc5..a4a341b5c 100644 --- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java +++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java @@ -221,13 +221,6 @@ public class ObjectPropertyDaoStub implements ObjectPropertyDao { "ObjectPropertyDaoStub.getSubPropertyURIs() not implemented."); } - @Override - public List getStatementsUsingObjectProperty( - ObjectProperty op) { - throw new RuntimeException( - "ObjectPropertyDaoStub.getStatementsUsingObjectProperty() not implemented."); - } - @Override public void fillObjectPropertiesForIndividual(Individual individual) { throw new RuntimeException(