diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/ThreeParameterAction.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/ThreeParameterAction.java deleted file mode 100644 index fcfabe38c..000000000 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/ThreeParameterAction.java +++ /dev/null @@ -1,41 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces; - -/** - * A base class for actions that work with a triple. - * - * @author bdc34 - * - */ -public abstract class ThreeParameterAction implements RequestedAction{ - - //TODO: these should not be public - public String uriOfSubject; - public String uriOfObject; - public String uriOfPredicate; - - public String getUriOfObject() { - return uriOfObject; - } - public void setUriOfObject(String uriOfObject) { - this.uriOfObject = uriOfObject; - } - public String getUriOfPredicate() { - return uriOfPredicate; - } - public void setUriOfPredicate(String uriOfPredicate) { - this.uriOfPredicate = uriOfPredicate; - } - public String getUriOfSubject() { - return uriOfSubject; - } - public void setUriOfSubject(String uriOfSubject) { - this.uriOfSubject = uriOfSubject; - } - - public String toString(){ - return this.getClass().getName() + - " <" + uriOfSubject + "> <" + uriOfPredicate + "> <" + uriOfObject + ">"; - } -} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddObjectPropStmt.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddObjectPropStmt.java index 6f71af9dd..21f740da1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddObjectPropStmt.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddObjectPropStmt.java @@ -5,23 +5,18 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision; import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.VisitingPolicyIface; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.ThreeParameterAction; -public class AddObjectPropStmt extends ThreeParameterAction implements RequestedAction { +public class AddObjectPropStmt extends ObjectPropertyAction implements + RequestedAction { - public AddObjectPropStmt(String uriOfSub, String uriOfPred, String uriOfObj){ - this.uriOfSubject = uriOfSub; - this.uriOfObject = uriOfObj; - this.uriOfPredicate = uriOfPred; - } + public AddObjectPropStmt(String uriOfSub, String uriOfPred, String uriOfObj) { + super(uriOfSub, uriOfPred, uriOfObj); + } - public String getURI() { - return RequestActionConstants.actionNamespace + this.getClass().getName(); - } - - public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){ - return policy.visit(ids,this); - } + @Override + public PolicyDecision accept(VisitingPolicyIface policy, + IdentifierBundle ids) { + return policy.visit(ids, this); + } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/DropObjectPropStmt.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/DropObjectPropStmt.java index c0177f044..74a2cc291 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/DropObjectPropStmt.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/DropObjectPropStmt.java @@ -5,22 +5,18 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision; import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.VisitingPolicyIface; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.ThreeParameterAction; -public class DropObjectPropStmt extends ThreeParameterAction implements RequestedAction { +public class DropObjectPropStmt extends ObjectPropertyAction implements + RequestedAction { - public DropObjectPropStmt(String sub, String pred, String obj){ - setUriOfSubject(sub); - setUriOfPredicate(pred); - setUriOfObject(obj); - } - - public String getURI() { - return RequestActionConstants.actionNamespace + this.getClass().getName(); - } - public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){ - return policy.visit(ids,this); - } + public DropObjectPropStmt(String sub, String pred, String obj) { + super(sub, pred, obj); + } + + @Override + public PolicyDecision accept(VisitingPolicyIface policy, + IdentifierBundle ids) { + return policy.visit(ids, this); + } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/EditObjPropStmt.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/EditObjPropStmt.java index f0188b616..6cc3e2464 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/EditObjPropStmt.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/EditObjPropStmt.java @@ -5,33 +5,25 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision; import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.VisitingPolicyIface; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.ThreeParameterAction; import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; -public class EditObjPropStmt extends ThreeParameterAction implements RequestedAction { - - - public EditObjPropStmt(ObjectPropertyStatement ops){ - setUriOfSubject(ops.getSubjectURI()); - setUriOfPredicate(ops.getPropertyURI()); - setUriOfObject(ops.getObjectURI()); - } - - public EditObjPropStmt(String subjectUri, String keywordPredUri, - String objectUri) { - setUriOfSubject(subjectUri); - setUriOfPredicate(keywordPredUri); - setUriOfObject(objectUri); - } +public class EditObjPropStmt extends ObjectPropertyAction implements + RequestedAction { - public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle whoToAuth) { - return policy.visit(whoToAuth,this); - } + public EditObjPropStmt(ObjectPropertyStatement ops) { + super(ops.getSubjectURI(), ops.getPropertyURI(), ops.getObjectURI()); + } - public String getURI() { - return RequestActionConstants.actionNamespace + this.getClass().getName(); - } + public EditObjPropStmt(String subjectUri, String keywordPredUri, + String objectUri) { + super(subjectUri, keywordPredUri, objectUri); + } + + @Override + public PolicyDecision accept(VisitingPolicyIface policy, + IdentifierBundle whoToAuth) { + return policy.visit(whoToAuth, this); + } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/ObjectPropertyAction.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/ObjectPropertyAction.java new file mode 100644 index 000000000..eabe22129 --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/ObjectPropertyAction.java @@ -0,0 +1,54 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt; + +import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; +import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision; +import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.VisitingPolicyIface; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; + +/** + * A base class for requested actions that involve manipulating an object + * property. + */ +public abstract class ObjectPropertyAction implements RequestedAction { + public final String uriOfSubject; + public final String uriOfPredicate; + public final String uriOfObject; + + public ObjectPropertyAction(String uriOfSubject, String uriOfPredicate, + String uriOfObject) { + this.uriOfSubject = uriOfSubject; + this.uriOfPredicate = uriOfPredicate; + this.uriOfObject = uriOfObject; + } + + public String getUriOfSubject() { + return uriOfSubject; + } + + public String getUriOfPredicate() { + return uriOfPredicate; + } + + public String getUriOfObject() { + return uriOfObject; + } + + @Override + public String getURI() { + return RequestActionConstants.actionNamespace + + this.getClass().getName(); + } + + @Override + public abstract PolicyDecision accept(VisitingPolicyIface policy, + IdentifierBundle whoToAuth); + + @Override + public String toString() { + return this.getClass().getSimpleName() + ": <" + uriOfSubject + "> <" + + uriOfPredicate + "> <" + uriOfObject + ">"; + } +}