From de14c86bed66dba502255a33a9467b08388ba46a Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 2 Dec 2011 16:35:47 +0000 Subject: [PATCH] Rename "EditIndividual" requested action to the more specific "DoBackEndEditing". --- .../auth/policy/UseRestrictedPagesByRoleLevelPolicy.java | 4 ++-- .../usepages/{EditIndividuals.java => DoBackEndEditing.java} | 4 ++-- .../controller/edit/DataPropertyStatementRetryController.java | 4 ++-- .../vitro/webapp/controller/edit/EntityEditController.java | 4 ++-- .../vitro/webapp/controller/edit/EntityRetryController.java | 4 ++-- .../webapp/controller/edit/ExternalIdRetryController.java | 4 ++-- .../controller/edit/IndividualTypeOperationController.java | 4 ++-- .../webapp/controller/edit/IndividualTypeRetryController.java | 4 ++-- .../edit/ObjectPropertyStatementRetryController.java | 4 ++-- .../webapp/controller/freemarker/BaseSiteAdminController.java | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) rename webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/{EditIndividuals.java => DoBackEndEditing.java} (63%) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/UseRestrictedPagesByRoleLevelPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/UseRestrictedPagesByRoleLevelPolicy.java index 9731d7780..3c9b2b591 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/UseRestrictedPagesByRoleLevelPolicy.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/UseRestrictedPagesByRoleLevelPolicy.java @@ -16,7 +16,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.querymodel.QueryFul import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.querymodel.QueryUserAccountsModel; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.AccessSpecialDataModels; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.DoFrontEndEditing; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditIndividuals; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.DoBackEndEditing; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditOntology; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditOwnAccount; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditSiteInformation; @@ -110,7 +110,7 @@ public class UseRestrictedPagesByRoleLevelPolicy implements PolicyIface { } else if (whatToAuth instanceof UseMiscellaneousCuratorPages) { result = isAuthorized(whatToAuth, RoleLevel.CURATOR, userRole); - } else if (whatToAuth instanceof EditIndividuals) { + } else if (whatToAuth instanceof DoBackEndEditing) { result = isAuthorized(whatToAuth, RoleLevel.EDITOR, userRole); } else if (whatToAuth instanceof SeeSiteAdminPage) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/EditIndividuals.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/DoBackEndEditing.java similarity index 63% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/EditIndividuals.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/DoBackEndEditing.java index bcf2dfa29..ff807e413 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/EditIndividuals.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/DoBackEndEditing.java @@ -4,8 +4,8 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; -/** Should we allow the user to use the pages for editing individuals? */ -public class EditIndividuals extends RequestedAction implements +/** Should we allow the user to use the back-end editing pages (blue screen editing)? */ +public class DoBackEndEditing extends RequestedAction implements UsePagesRequestedAction { // no fields } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java index bb0dd7d5c..50b2132dc 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java @@ -19,7 +19,7 @@ import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditIndividuals; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.DoBackEndEditing; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl; @@ -35,7 +35,7 @@ public class DataPropertyStatementRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(DataPropertyStatementRetryController.class.getName()); public void doPost (HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, new Actions(new EditIndividuals()))) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new DoBackEndEditing()))) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java index d3c51ba45..15289af7b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java @@ -25,7 +25,7 @@ import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditIndividuals; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.DoBackEndEditing; import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -42,7 +42,7 @@ public class EntityEditController extends BaseEditController { private static final Log log = LogFactory.getLog(EntityEditController.class.getName()); public void doGet (HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, new Actions(new EditIndividuals()))) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new DoBackEndEditing()))) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java index b85c68df5..617916f47 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java @@ -37,7 +37,7 @@ import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vedit.validator.impl.RequiredFieldValidator; import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditIndividuals; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.DoBackEndEditing; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -59,7 +59,7 @@ public class EntityRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(EntityRetryController.class.getName()); public void doPost (HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, new Actions(new EditIndividuals()))) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new DoBackEndEditing()))) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ExternalIdRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ExternalIdRetryController.java index f2d11afd4..0785f7c8d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ExternalIdRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ExternalIdRetryController.java @@ -20,7 +20,7 @@ import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditIndividuals; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.DoBackEndEditing; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -35,7 +35,7 @@ public class ExternalIdRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(ExternalIdRetryController.class.getName()); public void doPost (HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, new Actions(new EditIndividuals()))) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new DoBackEndEditing()))) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java index a052fdb36..cc543196a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java @@ -14,7 +14,7 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditIndividuals; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.DoBackEndEditing; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; @@ -23,7 +23,7 @@ public class IndividualTypeOperationController extends BaseEditController { private static final Log log = LogFactory.getLog(IndividualTypeOperationController.class.getName()); public void doGet(HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, new Actions(new EditIndividuals()))) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new DoBackEndEditing()))) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java index 95d83c270..ba528ca49 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java @@ -26,7 +26,7 @@ import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditIndividuals; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.DoBackEndEditing; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl; import edu.cornell.mannlib.vitro.webapp.beans.VClass; @@ -41,7 +41,7 @@ public class IndividualTypeRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(IndividualTypeRetryController.class.getName()); public void doGet (HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, new Actions(new EditIndividuals()))) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new DoBackEndEditing()))) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java index 639789aca..f584e8722 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java @@ -24,7 +24,7 @@ import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditIndividuals; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.DoBackEndEditing; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance; @@ -42,7 +42,7 @@ public class ObjectPropertyStatementRetryController extends BaseEditController { private static final Log log = LogFactory.getLog(ObjectPropertyStatementRetryController.class.getName()); public void doPost (HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, new Actions(new EditIndividuals()))) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new DoBackEndEditing()))) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java index 8e46ebabf..29c584157 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java @@ -17,7 +17,7 @@ import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditIndividuals; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.DoBackEndEditing; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditOntology; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditSiteInformation; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageMenus; @@ -91,7 +91,7 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet { Map map = new HashMap(); - if (PolicyHelper.isAuthorizedForActions(vreq, new EditIndividuals())) { + if (PolicyHelper.isAuthorizedForActions(vreq, new DoBackEndEditing())) { map.put("formAction", UrlBuilder.getUrl("/editRequestDispatch"));