litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2211 Clean up the type hierarchy under RequestedAction.

Browse source
This commit is contained in:
jeb228 2011-03-10 15:20:06 +00:00
parent 84c544accc
commit 5b36920c05
20 changed files with 68 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

9
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/AddNewUser.java
View file

@ -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);
}
}

9
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/LoadOntology.java
View file

@ -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);
}
}

10
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/RebuildTextIndex.java
View file

@ -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);
}
}

9
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/RemoveUser.java
View file

@ -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);
}
}

10
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/ServerStatus.java
View file

@ -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);
}
}

9
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/UpdateTextIndex.java
View file

@ -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);
}
}

10
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/admin/UploadFile.java
View file

@ -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);
}
}

6
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/AdminRequestedAction.java
View file

@ -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 */
}

5
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/OntoRequestedAction.java
View file

@ -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 */
}

3
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/SingleParameterAction.java
View file

@ -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+">";
}
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/TwoParameterAction.java
View file

@ -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;
}
}

9
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/CreateOwlClass.java
View file

@ -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);
}
}

9
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/DefineDataProperty.java
View file

@ -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);
}
}

9
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/DefineObjectProperty.java
View file

@ -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);
}
}

9
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ontology/RemoveOwlClass.java
View file

@ -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);
}
}

4
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddObjectPropStmt.java
View file

@ -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);

4
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/DropObjectPropStmt.java
View file

@ -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);

4
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/EditObjPropStmt.java
View file

@ -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());

5
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/resource/AddResource.java
View file

@ -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);

5
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/resource/DropResource.java
View file

@ -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);