From f29b8c781a6b3ca8ed78fc52647b2afff4b1fd8b Mon Sep 17 00:00:00 2001
From: Jim Blake <jeb228@cornell.edu>
Date: Tue, 10 Mar 2015 13:30:53 -0400
Subject: [PATCH] Correct a copy/paste error in static utility method. Also,
 add another utility method.

---
 .../identifier/common/HasPermissionSet.java   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasPermissionSet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasPermissionSet.java
index e39273ed9..83798cd0a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasPermissionSet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasPermissionSet.java
@@ -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.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.Permission;
 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
 		Identifier, Comparable<HasPermissionSet> {
-	public static Collection<HasPermission> getIdentifiers(IdentifierBundle ids) {
-		return getIdentifiersForClass(ids, HasPermission.class);
+	public static Collection<HasPermissionSet> getIdentifiers(IdentifierBundle ids) {
+		return getIdentifiersForClass(ids, HasPermissionSet.class);
 	}
 
-	public static Collection<Permission> getPermissions(IdentifierBundle ids) {
-		Set<Permission> set = new HashSet<Permission>();
-		for (HasPermission id : getIdentifiers(ids)) {
-			set.add(id.getPermission());
+	public static Collection<PermissionSet> getPermissionSets(IdentifierBundle ids) {
+		Set<PermissionSet> set = new HashSet<>();
+		for (HasPermissionSet id : getIdentifiers(ids)) {
+			set.add(id.getPermissionSet());
 		}
 		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
 
 	public HasPermissionSet(PermissionSet permissionSet) {