From 619cfeed3916bcfa6d68c102d45f37524e89c6ff Mon Sep 17 00:00:00 2001 From: briancaruso Date: Mon, 4 Apr 2011 20:11:50 +0000 Subject: [PATCH] Deleting unused class ProhibitedFromUpdateBelowRoleLevelFilter. --- ...hibitedFromUpdateBelowRoleLevelFilter.java | 223 ------------------ .../filtering/filters/VitroFilterUtils.java | 7 +- 2 files changed, 1 insertion(+), 229 deletions(-) delete mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/ProhibitedFromUpdateBelowRoleLevelFilter.java diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/ProhibitedFromUpdateBelowRoleLevelFilter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/ProhibitedFromUpdateBelowRoleLevelFilter.java deleted file mode 100644 index 670c0d6f4..000000000 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/ProhibitedFromUpdateBelowRoleLevelFilter.java +++ /dev/null @@ -1,223 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.dao.filtering.filters; - -import java.util.List; - -import net.sf.jga.fn.UnaryFunctor; - -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; -import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; -import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; -import edu.cornell.mannlib.vitro.webapp.beans.ResourceBean; -import edu.cornell.mannlib.vitro.webapp.beans.VClass; -import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel; -import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; - -/* - * bdc34: This is not yet used anywhere in the system. - */ -public class ProhibitedFromUpdateBelowRoleLevelFilter extends VitroFiltersImpl { - - protected final RoleLevel userRole; - protected final WebappDaoFactory wdf; - - private final static Log log = LogFactory.getLog(ProhibitedFromUpdateBelowRoleLevelFilter.class); - - public ProhibitedFromUpdateBelowRoleLevelFilter( RoleLevel role , WebappDaoFactory wdf ){ - super(); - log.debug("initializing ProhibitedFromUpdateBelowRoleLevelFilter"); - if( role == null ) - throw new IllegalArgumentException("ProhibitedFromUpdateBelowRoleLevelFilter must have a RoleLevel "); - if( wdf == null ) - throw new IllegalArgumentException("ProhibitedFromUpdateBelowRoleLevelFilter must have a DaoFactory"); - this.userRole = role; - this.wdf = wdf; - - setIndividualFilter(new IndividualRoleFilter() ); - setClassFilter(new RoleFilter()); - setDataPropertyFilter(new RoleFilter() ); - setObjectPropertyFilter(new RoleFilter() ); - setDataPropertyStatementFilter(new DataPropertyStatementRoleFilter( ) ); - setObjectPropertyStatementFilter(new ObjectPropertyStatementRoleFilter() ); - } - - private boolean sameLevelOrHigher( RoleLevel other ){ - if( other == null ) - return true; //default to visible - return ( userRole.compareTo(other) >= 0 ); - } - - private boolean canViewOddItems( ){ - return sameLevelOrHigher( RoleLevel.DB_ADMIN ) ; - } - - @SuppressWarnings("serial") - private class RoleFilter extends UnaryFunctor{ - @Override - public Boolean fn(E resource) { - log.debug("fn for update RoleFilter"); - try{ - if( resource == null ) - return canViewOddItems(); - else - return sameLevelOrHigher( resource.getProhibitedFromUpdateBelowRoleLevel() ); - }catch(RuntimeException th){ - log.warn("Error checking update prohibition status for " + resource, th); - return false; - } - } - } - - @SuppressWarnings("serial") - private class IndividualRoleFilter extends UnaryFunctor{ - @Override - public Boolean fn(Individual ind){ - log.debug("fn for update IndividualRoleFilter"); - if( ind == null ) - return canViewOddItems(); - - try{ - if( ! sameLevelOrHigher( ind.getProhibitedFromUpdateBelowRoleLevel() ) ) - return false; - - List vclasses = ind.getVClasses(true); - - if( vclasses == null ){ - VClass clazz = wdf.getVClassDao().getVClassByURI(ind.getVClassURI()); - if( clazz == null ) - return canViewOddItems(); - else - return sameLevelOrHigher(clazz.getProhibitedFromUpdateBelowRoleLevel() ); - } - - for( VClass vclass : vclasses ){ - if( ! sameLevelOrHigher(vclass.getProhibitedFromUpdateBelowRoleLevel()) ) - return false; - } - return true; - - }catch(RuntimeException ex){ - log.warn("Error checking update prohibition status for " + ind ); - return false; - } - } - } - - @SuppressWarnings("serial") - private class DataPropertyStatementRoleFilter - extends UnaryFunctor{ - @Override - public Boolean fn(E dPropStmt) { - log.debug("fn for update DataPropertyStatementRoleFilter"); - try { - if( dPropStmt == null ) return false; //don't know why this would happen - - DataProperty prop = wdf.getDataPropertyDao().getDataPropertyByURI(dPropStmt.getDatapropURI()); - if( prop == null ) { - if( ! canViewOddItems() ){ return false; } - }else{ - if( sameLevelOrHigher( prop.getProhibitedFromUpdateBelowRoleLevel() ) == false) - return false; - } - - Individual subject = dPropStmt.getIndividual(); - if( subject == null ) { - if( ! canViewOddItems() ){ return false; } - }else{ - if( sameLevelOrHigher( subject.getProhibitedFromUpdateBelowRoleLevel() ) == false) - return false; - } - - VClass subjectClass = - (subject.getVClass() != null ? subject.getVClass() : wdf.getVClassDao().getVClassByURI(subject.getVClassURI())); - if( subjectClass == null ){ - if( ! canViewOddItems() ){ return false; } - }else{ - if( sameLevelOrHigher( subjectClass.getProhibitedFromUpdateBelowRoleLevel() ) == false ) - return false; - } - } catch (RuntimeException e) { - log.warn("Error checking update prohibition status of data property statement \"" + dPropStmt + "\"", e); - return false; - } - return true; - } - } - - - @SuppressWarnings("serial") - private class ObjectPropertyStatementRoleFilter - extends UnaryFunctor{ - @Override - public Boolean fn(E stmt) { - log.debug("fn for update ObjectPropertyStatementRoleFilter"); - - if( stmt == null ) - return false; - - try { - ObjectProperty prop = stmt.getProperty(); - if (prop == null) { - prop = wdf.getObjectPropertyDao().getObjectPropertyByURI(stmt.getPropertyURI()); - } - if (prop == null) { - if (!canViewOddItems()) { - return false; - } - } else { - if (sameLevelOrHigher(prop.getProhibitedFromUpdateBelowRoleLevel()) == false) { - return false; - } - } - - Individual subject = - (stmt.getSubject() != null ? stmt.getSubject() : wdf.getIndividualDao().getIndividualByURI( stmt.getSubjectURI())); - if( subject == null ) { - if( ! canViewOddItems() ){ return false; } - }else{ - if( sameLevelOrHigher( subject.getProhibitedFromUpdateBelowRoleLevel() ) == false) - return false; - } - - Individual object = - (stmt.getObject() != null ? stmt.getObject() : wdf.getIndividualDao().getIndividualByURI( stmt.getObjectURI() )); - if( object == null ) { - if( ! canViewOddItems() ) { return false; } - }else{ - if( sameLevelOrHigher( subject.getProhibitedFromUpdateBelowRoleLevel() ) == false) - return false; - } - - VClass subjectClass = - (subject.getVClass() != null ? subject.getVClass() : wdf.getVClassDao().getVClassByURI(subject.getVClassURI())); - if( subjectClass == null ){ - if( ! canViewOddItems() ){ return false; } - }else{ - if( sameLevelOrHigher( subjectClass.getProhibitedFromUpdateBelowRoleLevel() ) == false ) - return false; - } - - VClass objectClass = - (object.getVClass() != null ? object.getVClass() : wdf.getVClassDao().getVClassByURI(object.getVClassURI())); - if( objectClass == null ){ - if( ! canViewOddItems() ){ return false; } - }else{ - if( sameLevelOrHigher( objectClass.getProhibitedFromUpdateBelowRoleLevel() ) == false ) - return false; - } - } catch (RuntimeException e) { - log.warn("Error checking update prohibition status of " + stmt, e); - return false; - } - return true; - } - } - - -} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilterUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilterUtils.java index 59c2b23a6..4fb2a48cd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilterUtils.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilterUtils.java @@ -46,12 +46,7 @@ public class VitroFilterUtils { */ public static VitroFilters getDisplayFilterByRoleLevel(RoleLevel role, WebappDaoFactory wdf){ return new HiddenFromDisplayBelowRoleLevelFilter(role, wdf); - } - - /* bdc34: Currently, this is not called from anywhere in the code. */ - public static VitroFilters getUpdateFilterByRoleLevel(RoleLevel role, WebappDaoFactory wdf){ - return new ProhibitedFromUpdateBelowRoleLevelFilter(role, wdf); - } + } /** this filter accepts only objects which have sunset dates of the given date or * earlier and sunset dates after the given date. sunrise <= givenDate < sunset.