diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/AddNewUser.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/AddNewUser.java index f7bd2a2d2..ee9f75c3d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/AddNewUser.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/AddNewUser.java @@ -7,13 +7,14 @@ 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.AdminRequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; -public class AddNewUser implements RequestedAction, AdminRequestedAction{ - public String getURI() { +public class AddNewUser implements AdminRequestedAction{ + @Override + public String getURI() { return RequestActionConstants.actionNamespace + this.getClass().getName(); } - public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){ + @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/admin/LoadOntology.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/LoadOntology.java index dbb39e2b7..1173bcaff 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/LoadOntology.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/LoadOntology.java @@ -7,9 +7,8 @@ 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.AdminRequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; -public class LoadOntology implements RequestedAction , AdminRequestedAction{ +public class LoadOntology implements AdminRequestedAction{ protected String ontologyUrl; public String getOntologyUrl() { @@ -20,10 +19,12 @@ public class LoadOntology implements RequestedAction , AdminRequestedAction{ this.ontologyUrl = ontologyUrl; } - public String getURI() { + @Override + public String getURI() { return RequestActionConstants.actionNamespace + this.getClass().getName(); } - public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){ + @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/admin/RebuildTextIndex.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/RebuildTextIndex.java index efd4aa82b..a334942f5 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/RebuildTextIndex.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/RebuildTextIndex.java @@ -7,14 +7,14 @@ 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.AdminRequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; -public class RebuildTextIndex implements RequestedAction , AdminRequestedAction{ - - public String getURI() { +public class RebuildTextIndex implements AdminRequestedAction{ + @Override + public String getURI() { return RequestActionConstants.actionNamespace + this.getClass().getName(); } - public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){ + @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/admin/RemoveUser.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/RemoveUser.java index 3fc2d396f..af8d1be94 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/RemoveUser.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/RemoveUser.java @@ -7,9 +7,8 @@ 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.AdminRequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; -public class RemoveUser implements RequestedAction, AdminRequestedAction{ +public class RemoveUser implements AdminRequestedAction{ protected String userUri; public String getUserUri() { @@ -20,10 +19,12 @@ public class RemoveUser implements RequestedAction, AdminRequestedAction{ this.userUri = userUri; } - public String getURI() { + @Override + public String getURI() { return RequestActionConstants.actionNamespace + this.getClass().getName(); } - public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){ + @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/admin/ServerStatus.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/ServerStatus.java index 245a2d42d..afe6ecd6b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/ServerStatus.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/ServerStatus.java @@ -7,21 +7,21 @@ 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.AdminRequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; /** * Represents a request to view information about the server status. * @author bdc34 * */ -public class ServerStatus implements RequestedAction, AdminRequestedAction { +public class ServerStatus implements AdminRequestedAction { - /** returns "java://edu.cornell.mannlib.vitro.webapp.auth.requestActions.ServerStatusRequest" */ - public String getURI() { + @Override + public String getURI() { return RequestActionConstants.actionNamespace + this.getClass().getName(); } - public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){ + @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/admin/UpdateTextIndex.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/UpdateTextIndex.java index 859501051..82b85fb71 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/UpdateTextIndex.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/UpdateTextIndex.java @@ -7,14 +7,15 @@ 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.AdminRequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; -public class UpdateTextIndex implements RequestedAction, AdminRequestedAction{ - public String getURI() { +public class UpdateTextIndex implements AdminRequestedAction{ + @Override + public String getURI() { return RequestActionConstants.actionNamespace + this.getClass().getName(); } - public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){ + @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/admin/UploadFile.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/UploadFile.java index 69b1a59df..fee8363ce 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/UploadFile.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/UploadFile.java @@ -7,10 +7,8 @@ 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.AdminRequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; - -public class UploadFile implements RequestedAction, AdminRequestedAction{ +public class UploadFile implements AdminRequestedAction{ protected String subjectUri; protected String predicateUri; @@ -20,10 +18,12 @@ public class UploadFile implements RequestedAction, AdminRequestedAction{ this.predicateUri = predicateUri; } - public String getURI() { + @Override + public String getURI() { return RequestActionConstants.actionNamespace + this.getClass().getName(); } - public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){ + @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/ifaces/AdminRequestedAction.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/AdminRequestedAction.java index 3d6e4098d..4c9d357ba 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/AdminRequestedAction.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/AdminRequestedAction.java @@ -2,8 +2,6 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces; -/** marker interface */ - -public interface AdminRequestedAction { - +public interface AdminRequestedAction extends RequestedAction { + /** marker interface */ } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/OntoRequestedAction.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/OntoRequestedAction.java index ffe646e8f..ef1090ce7 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/OntoRequestedAction.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/OntoRequestedAction.java @@ -2,7 +2,6 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces; -/** marker interface */ -public interface OntoRequestedAction { - +public interface OntoRequestedAction extends RequestedAction { + /** marker interface */ } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/SingleParameterAction.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/SingleParameterAction.java index 58b552892..762c11f26 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/SingleParameterAction.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/SingleParameterAction.java @@ -13,7 +13,8 @@ public abstract class SingleParameterAction implements RequestedAction { this.subjectUri = subjectUri; } - public String toString(){ + @Override + public String toString(){ return this.getClass().getName() + " <"+subjectUri+">"; } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/TwoParameterAction.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/TwoParameterAction.java index 8cc6eba83..e1067c3dd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/TwoParameterAction.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/TwoParameterAction.java @@ -6,7 +6,6 @@ public abstract class TwoParameterAction implements RequestedAction { protected String resourceUri; protected String secondUri; - public String getResourceUri() { return resourceUri; } @@ -20,5 +19,4 @@ public abstract class TwoParameterAction implements RequestedAction { this.secondUri = secondUri; } - } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/CreateOwlClass.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/CreateOwlClass.java index e1b782e38..700d5ebdd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/CreateOwlClass.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/CreateOwlClass.java @@ -7,16 +7,17 @@ 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.OntoRequestedAction; 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.SingleParameterAction; -public class CreateOwlClass extends SingleParameterAction implements RequestedAction, OntoRequestedAction { +public class CreateOwlClass extends SingleParameterAction implements OntoRequestedAction { - public String getURI() { + @Override + public String getURI() { return RequestActionConstants.actionNamespace + this.getClass().getName(); } - public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){ + @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/ontology/DefineDataProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/DefineDataProperty.java index 483b8ce95..f0be27742 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/DefineDataProperty.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/DefineDataProperty.java @@ -7,15 +7,16 @@ 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.OntoRequestedAction; 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.SingleParameterAction; -public class DefineDataProperty extends SingleParameterAction implements RequestedAction, OntoRequestedAction{ - public String getURI() { +public class DefineDataProperty extends SingleParameterAction implements OntoRequestedAction{ + @Override + public String getURI() { return RequestActionConstants.actionNamespace + this.getClass().getName(); } - public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){ + @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/ontology/DefineObjectProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/DefineObjectProperty.java index 445024a50..911369319 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/DefineObjectProperty.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/DefineObjectProperty.java @@ -7,16 +7,17 @@ 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.OntoRequestedAction; 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.SingleParameterAction; -public class DefineObjectProperty extends SingleParameterAction implements RequestedAction, OntoRequestedAction{ +public class DefineObjectProperty extends SingleParameterAction implements OntoRequestedAction{ - public String getURI() { + @Override + public String getURI() { return RequestActionConstants.actionNamespace + this.getClass().getName(); } - public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){ + @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/ontology/RemoveOwlClass.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/RemoveOwlClass.java index a2ba209c7..5a3b1d6b5 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/RemoveOwlClass.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/RemoveOwlClass.java @@ -7,14 +7,15 @@ 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.OntoRequestedAction; 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.SingleParameterAction; -public class RemoveOwlClass extends SingleParameterAction implements RequestedAction, OntoRequestedAction{ - public String getURI() { +public class RemoveOwlClass extends SingleParameterAction implements OntoRequestedAction{ + @Override + public String getURI() { return RequestActionConstants.actionNamespace + this.getClass().getName(); } - public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){ + @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/AddObjectPropStmt.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddObjectPropStmt.java index 3cf77c7a5..70b71905b 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,10 +5,8 @@ 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.RequestedAction; -public class AddObjectPropStmt extends AbstractObjectPropertyAction implements - RequestedAction { +public class AddObjectPropStmt extends AbstractObjectPropertyAction { public AddObjectPropStmt(String uriOfSub, String uriOfPred, String uriOfObj) { super(uriOfSub, uriOfPred, uriOfObj); 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 a8ccaff7c..8fd3429ff 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,10 +5,8 @@ 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.RequestedAction; -public class DropObjectPropStmt extends AbstractObjectPropertyAction implements - RequestedAction { +public class DropObjectPropStmt extends AbstractObjectPropertyAction { public DropObjectPropStmt(String sub, String pred, String obj) { super(sub, pred, obj); 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 363055a1d..7c5bc54a9 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,11 +5,9 @@ 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.RequestedAction; import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; -public class EditObjPropStmt extends AbstractObjectPropertyAction implements - RequestedAction { +public class EditObjPropStmt extends AbstractObjectPropertyAction { public EditObjPropStmt(ObjectPropertyStatement ops) { super(ops.getSubjectURI(), ops.getPropertyURI(), ops.getObjectURI()); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/resource/AddResource.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/resource/AddResource.java index 6fb6768dd..8e28991e7 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/resource/AddResource.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/resource/AddResource.java @@ -5,15 +5,14 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.resource; 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.RequestedAction; -public class AddResource extends AbstractResourceAction implements - RequestedAction { +public class AddResource extends AbstractResourceAction { public AddResource(String typeUri, String subjectUri) { super(typeUri, subjectUri); } + @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/resource/DropResource.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/resource/DropResource.java index 00f3e3e93..66935b06b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/resource/DropResource.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/resource/DropResource.java @@ -5,15 +5,14 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.resource; 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.RequestedAction; -public class DropResource extends AbstractResourceAction implements - RequestedAction { +public class DropResource extends AbstractResourceAction { public DropResource(String typeUri, String subjectUri) { super(typeUri, subjectUri); } + @Override public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids) { return policy.visit(ids, this);