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

Remove previous "improvements".

Browse source
This commit is contained in:
Jim Blake 2014-10-31 16:50:35 -04:00
parent 0bf6abb197
commit 564130329e
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
View file

@ -25,9 +25,9 @@ public class BaseResourceBean implements ResourceBean {
protected String localNameWithPrefix = null; protected String localNameWithPrefix = null;
protected String pickListName = null; protected String pickListName = null;
protected RoleLevel hiddenFromDisplayBelowRoleLevel = RoleLevel.PUBLIC; protected RoleLevel hiddenFromDisplayBelowRoleLevel = null;
protected RoleLevel prohibitedFromUpdateBelowRoleLevel = RoleLevel.PUBLIC; protected RoleLevel prohibitedFromUpdateBelowRoleLevel = null;
protected RoleLevel hiddenFromPublishBelowRoleLevel = RoleLevel.PUBLIC; protected RoleLevel hiddenFromPublishBelowRoleLevel = null;
public enum RoleLevel { public enum RoleLevel {
PUBLIC("http://vitro.mannlib.cornell.edu/ns/vitro/role#public", PUBLIC("http://vitro.mannlib.cornell.edu/ns/vitro/role#public",
@ -79,10 +79,6 @@ public class BaseResourceBean implements ResourceBean {
return shorthand; return shorthand;
} }
public static RoleLevel notNull(RoleLevel level) {
return (level == null) ? RoleLevel.values()[0] : level;
}
public static RoleLevel getRoleByUri(String uri2) { public static RoleLevel getRoleByUri(String uri2) {
if (uri2 == null) if (uri2 == null)
return RoleLevel.values()[0]; return RoleLevel.values()[0];
@ -213,7 +209,7 @@ public class BaseResourceBean implements ResourceBean {
@Override @Override
public void setHiddenFromDisplayBelowRoleLevel(RoleLevel level) { public void setHiddenFromDisplayBelowRoleLevel(RoleLevel level) {
hiddenFromDisplayBelowRoleLevel = RoleLevel.notNull(level); hiddenFromDisplayBelowRoleLevel = level;
} }
@Override @Override
@ -228,7 +224,7 @@ public class BaseResourceBean implements ResourceBean {
@Override @Override
public void setProhibitedFromUpdateBelowRoleLevel(RoleLevel level) { public void setProhibitedFromUpdateBelowRoleLevel(RoleLevel level) {
prohibitedFromUpdateBelowRoleLevel = RoleLevel.notNull(level); prohibitedFromUpdateBelowRoleLevel = level;
} }
@Override @Override
@ -243,7 +239,7 @@ public class BaseResourceBean implements ResourceBean {
@Override @Override
public void setHiddenFromPublishBelowRoleLevel(RoleLevel level) { public void setHiddenFromPublishBelowRoleLevel(RoleLevel level) {
hiddenFromPublishBelowRoleLevel = RoleLevel.notNull(level); hiddenFromPublishBelowRoleLevel = level;
} }
@Override @Override