From e8fafcc10c6bb6666bba3f862956306ebd85010d Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 30 Mar 2012 21:44:46 +0000 Subject: [PATCH] NIHVIVO-3404 Rename accessor methods on AbstractObjectPropertyStatementAction to be consistent with those on AbstractDataPropertyStatementAction. --- .../permissions/EditByRolePermission.java | 6 ++-- .../RestrictHomeMenuItemEditingPolicy.java | 4 +-- .../webapp/auth/policy/SelfEditingPolicy.java | 6 ++-- ...AbstractObjectPropertyStatementAction.java | 32 +++++++++---------- .../policy/PolicyHelper_StatementsTest.java | 6 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/EditByRolePermission.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/EditByRolePermission.java index f06a42ce9..6d5e64363 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/EditByRolePermission.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/EditByRolePermission.java @@ -88,9 +88,9 @@ public class EditByRolePermission extends Permission { * to modify its subject, its predicate, and its object. */ private boolean isAuthorized(AbstractObjectPropertyStatementAction action) { - String subjectUri = action.getUriOfSubject(); - String predicateUri = action.getUriOfPredicate(); - String objectUri = action.getUriOfObject(); + String subjectUri = action.getSubjectUri(); + String predicateUri = action.getPredicateUri(); + String objectUri = action.getObjectUri(); return canModifyResource(subjectUri) && canModifyPredicate(predicateUri) && canModifyResource(objectUri); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RestrictHomeMenuItemEditingPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RestrictHomeMenuItemEditingPolicy.java index e7140b1a2..25795b470 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RestrictHomeMenuItemEditingPolicy.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RestrictHomeMenuItemEditingPolicy.java @@ -34,9 +34,9 @@ public class RestrictHomeMenuItemEditingPolicy implements PolicyIface { private PolicyDecision isAuthorized( AbstractObjectPropertyStatementAction whatToAuth) { - if (whatToAuth.getUriOfPredicate() + if (whatToAuth.getPredicateUri() .equals(DisplayVocabulary.HAS_ELEMENT) - && whatToAuth.getUriOfObject().equals( + && whatToAuth.getObjectUri().equals( DisplayVocabulary.HOME_MENU_ITEM)) { return notAuthorized(); } else { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy.java index 185a5d0f1..e3a6b8dec 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy.java @@ -68,9 +68,9 @@ public class SelfEditingPolicy extends BaseSelfEditingPolicy implements */ private PolicyDecision isAuthorizedForObjectPropertyAction( List userUris, AbstractObjectPropertyStatementAction action) { - String subject = action.getUriOfSubject(); - String predicate = action.getUriOfPredicate(); - String object = action.getUriOfObject(); + String subject = action.getSubjectUri(); + String predicate = action.getPredicateUri(); + String object = action.getObjectUri(); if (!canModifyResource(subject)) { return cantModifyResource(subject); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractObjectPropertyStatementAction.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractObjectPropertyStatementAction.java index d9351dfc9..aa696e90f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractObjectPropertyStatementAction.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractObjectPropertyStatementAction.java @@ -9,32 +9,32 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAct * property. */ public abstract class AbstractObjectPropertyStatementAction extends RequestedAction { - private final String uriOfSubject; - private final String uriOfPredicate; - private final String uriOfObject; + private final String subjectUri; + private final String predicateUri; + private final String objectUri; - public AbstractObjectPropertyStatementAction(String uriOfSubject, String uriOfPredicate, - String uriOfObject) { - this.uriOfSubject = uriOfSubject; - this.uriOfPredicate = uriOfPredicate; - this.uriOfObject = uriOfObject; + public AbstractObjectPropertyStatementAction(String subjectUri, String predicateUri, + String objectUri) { + this.subjectUri = subjectUri; + this.predicateUri = predicateUri; + this.objectUri = objectUri; } - public String getUriOfSubject() { - return uriOfSubject; + public String getSubjectUri() { + return subjectUri; } - public String getUriOfPredicate() { - return uriOfPredicate; + public String getPredicateUri() { + return predicateUri; } - public String getUriOfObject() { - return uriOfObject; + public String getObjectUri() { + return objectUri; } @Override public String toString() { - return this.getClass().getSimpleName() + ": <" + uriOfSubject + "> <" - + uriOfPredicate + "> <" + uriOfObject + ">"; + return this.getClass().getSimpleName() + ": <" + subjectUri + "> <" + + predicateUri + "> <" + objectUri + ">"; } } diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_StatementsTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_StatementsTest.java index 4675265ea..e7498e424 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_StatementsTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_StatementsTest.java @@ -257,10 +257,10 @@ public class PolicyHelper_StatementsTest extends AbstractTestClass { private PolicyDecision isAuthorized( AbstractObjectPropertyStatementAction whatToAuth) { - if ((APPROVED_SUBJECT_URI.equals(whatToAuth.getUriOfSubject())) + if ((APPROVED_SUBJECT_URI.equals(whatToAuth.getSubjectUri())) && (APPROVED_PREDICATE_URI - .equals(whatToAuth.getUriOfPredicate())) - && (APPROVED_OBJECT_URI.equals(whatToAuth.getUriOfObject()))) { + .equals(whatToAuth.getPredicateUri())) + && (APPROVED_OBJECT_URI.equals(whatToAuth.getObjectUri()))) { return authorized(); } else { return inconclusive();