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

NIHVIVO-2299 Rename Actions.EMPTY to Actions.AUTHORIZED, for consistency.

Browse source
This commit is contained in:
j2blake 2011-05-12 19:26:20 +00:00
parent e72604c727
commit 69dd3019a7
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,12 +31,12 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAct
public class Actions { public class Actions {
private static final Log log = LogFactory.getLog(Actions.class); private static final Log log = LogFactory.getLog(Actions.class);
public static final Actions EMPTY = new Actions(); public static final Actions AUTHORIZED = new Actions();
public static final Actions UNAUTHORIZED = new Actions( public static final Actions UNAUTHORIZED = new Actions(
new UnauthorizedAction()); new UnauthorizedAction());
public static Actions notNull(Actions actions) { public static Actions notNull(Actions actions) {
return (actions == null) ? EMPTY : actions; return (actions == null) ? AUTHORIZED : actions;
} }
private final List<Set<RequestedAction>> clauseList; private final List<Set<RequestedAction>> clauseList;

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/VitroAjaxController.java
View file

@ -67,7 +67,7 @@ public abstract class VitroAjaxController extends HttpServlet {
*/ */
@SuppressWarnings("unused") @SuppressWarnings("unused")
protected Actions requiredActions(VitroRequest vreq) { protected Actions requiredActions(VitroRequest vreq) {
return Actions.EMPTY; return Actions.AUTHORIZED;
} }
/** /**

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java
View file

@ -39,7 +39,7 @@ public class AdminLoginController extends FreemarkerHttpServlet {
@Override @Override
protected Actions requiredActions(VitroRequest vreq) { protected Actions requiredActions(VitroRequest vreq) {
return Actions.EMPTY; // No requirements to use this page. return Actions.AUTHORIZED; // No requirements to use this page.
} }
@Override @Override

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
View file

@ -121,7 +121,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
*/ */
@SuppressWarnings("unused") @SuppressWarnings("unused")
protected Actions requiredActions(VitroRequest vreq) { protected Actions requiredActions(VitroRequest vreq) {
return Actions.EMPTY; return Actions.AUTHORIZED;
} }
// Subclasses will override // Subclasses will override