From 4d1ec35fc9ca4fc0aeb838b66d80f7e02e75e16b Mon Sep 17 00:00:00 2001 From: j2blake Date: Wed, 6 Apr 2011 20:51:26 +0000 Subject: [PATCH] NIHVIVO-2254 Remove VisitingPolicyIface - fix a bug --- .../webapp/auth/policy/JenaNetidPolicy.java | 12 ++++++------ .../vitro/webapp/auth/policy/SparqlPolicy.java | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java index df0b08fab..d5da219e6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java @@ -177,17 +177,17 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Policy if (netid == null) return pd.setMessage("Unable to get netid from IdBundle"); - if (whoToAuth instanceof AddResource) { + if (whatToAuth instanceof AddResource) { return visit(whoToAuth, (AddResource) whatToAuth); - } else if (whoToAuth instanceof DropResource) { + } else if (whatToAuth instanceof DropResource) { return visit(whoToAuth, (DropResource) whatToAuth); - } else if (whoToAuth instanceof AddObjectPropStmt) { + } else if (whatToAuth instanceof AddObjectPropStmt) { return visit(whoToAuth, (AddObjectPropStmt) whatToAuth); - } else if (whoToAuth instanceof DropObjectPropStmt) { + } else if (whatToAuth instanceof DropObjectPropStmt) { return visit(whoToAuth, (DropObjectPropStmt) whatToAuth); - } else if (whoToAuth instanceof AddDataPropStmt) { + } else if (whatToAuth instanceof AddDataPropStmt) { return visit(whoToAuth, (AddDataPropStmt) whatToAuth); - } else if (whoToAuth instanceof DropDataPropStmt) { + } else if (whatToAuth instanceof DropDataPropStmt) { return visit(whoToAuth, (DropDataPropStmt) whatToAuth); } else { return UNAUTH; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/SparqlPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/SparqlPolicy.java index f23a20642..6184f671a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/SparqlPolicy.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/SparqlPolicy.java @@ -107,23 +107,23 @@ public class SparqlPolicy extends DefaultInconclusivePolicy implements PolicyIfa return new BasicPolicyDecision(Authorization.INCONCLUSIVE, "no queryies found for action" + whatToAuth.getClass().getName()); - if (whoToAuth instanceof AddObjectPropStmt) { + if (whatToAuth instanceof AddObjectPropStmt) { return visit(whoToAuth, (AddObjectPropStmt) whatToAuth); - } else if (whoToAuth instanceof DropResource) { + } else if (whatToAuth instanceof DropResource) { return visit(whoToAuth, (DropResource) whatToAuth); - } else if (whoToAuth instanceof DropDataPropStmt) { + } else if (whatToAuth instanceof DropDataPropStmt) { return visit(whoToAuth, (DropDataPropStmt) whatToAuth); - } else if (whoToAuth instanceof DropObjectPropStmt) { + } else if (whatToAuth instanceof DropObjectPropStmt) { return visit(whoToAuth, (DropObjectPropStmt) whatToAuth); - } else if (whoToAuth instanceof AddResource) { + } else if (whatToAuth instanceof AddResource) { return visit(whoToAuth, (AddResource) whatToAuth); - } else if (whoToAuth instanceof AddDataPropStmt) { + } else if (whatToAuth instanceof AddDataPropStmt) { return visit(whoToAuth, (AddDataPropStmt) whatToAuth); - } else if (whoToAuth instanceof UploadFile) { + } else if (whatToAuth instanceof UploadFile) { return visit(whoToAuth, (UploadFile) whatToAuth); - } else if (whoToAuth instanceof EditDataPropStmt) { + } else if (whatToAuth instanceof EditDataPropStmt) { return visit(whoToAuth, (EditDataPropStmt) whatToAuth); - } else if (whoToAuth instanceof EditObjPropStmt) { + } else if (whatToAuth instanceof EditObjPropStmt) { return visit(whoToAuth, (EditObjPropStmt) whatToAuth); } else { return UNAUTH;