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

Correct a copy/paste error in static utility method. Also, add another utility method.

Browse source
This commit is contained in:
Jim Blake 2015-03-10 13:30:53 -04:00
parent e818f1ab24
commit f29b8c781a
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasPermissionSet.java
View file

@ -8,7 +8,6 @@ import java.util.Set;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier; import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
import edu.cornell.mannlib.vitro.webapp.auth.permissions.Permission;
import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet; import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
/** /**
@ -16,18 +15,26 @@ import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
*/ */
public class HasPermissionSet extends AbstractCommonIdentifier implements public class HasPermissionSet extends AbstractCommonIdentifier implements
Identifier, Comparable<HasPermissionSet> { Identifier, Comparable<HasPermissionSet> {
public static Collection<HasPermission> getIdentifiers(IdentifierBundle ids) { public static Collection<HasPermissionSet> getIdentifiers(IdentifierBundle ids) {
return getIdentifiersForClass(ids, HasPermission.class); return getIdentifiersForClass(ids, HasPermissionSet.class);
} }
public static Collection<Permission> getPermissions(IdentifierBundle ids) { public static Collection<PermissionSet> getPermissionSets(IdentifierBundle ids) {
Set<Permission> set = new HashSet<Permission>(); Set<PermissionSet> set = new HashSet<>();
for (HasPermission id : getIdentifiers(ids)) { for (HasPermissionSet id : getIdentifiers(ids)) {
set.add(id.getPermission()); set.add(id.getPermissionSet());
} }
return set; return set;
} }
public static Collection<String> getPermissionSetUris(IdentifierBundle ids) {
Set<String> set = new HashSet<>();
for (HasPermissionSet id : getIdentifiers(ids)) {
set.add(id.getPermissionSet().getUri());
}
return set;
}
private final PermissionSet permissionSet; // never null private final PermissionSet permissionSet; // never null
public HasPermissionSet(PermissionSet permissionSet) { public HasPermissionSet(PermissionSet permissionSet) {