Grantee.java (hsqldb-2.7.0) | : | Grantee.java (hsqldb-2.7.1) | ||
---|---|---|---|---|
skipping to change at line 74 | skipping to change at line 74 | |||
* We use the word "Admin" (e.g., in private variable "admin" and method | * We use the word "Admin" (e.g., in private variable "admin" and method | |||
* "isAdmin()) to mean this Grantee has admin priv by any means. | * "isAdmin()) to mean this Grantee has admin priv by any means. | |||
* We use the word "adminDirect" (e.g., in private variable "adminDirect" | * We use the word "adminDirect" (e.g., in private variable "adminDirect" | |||
* and method "isAdminDirect()) to mean this Grantee has admin priv | * and method "isAdminDirect()) to mean this Grantee has admin priv | |||
* directly. | * directly. | |||
* | * | |||
* @author Campbell Burnet (campbell-burnet@users dot sourceforge.net) | * @author Campbell Burnet (campbell-burnet@users dot sourceforge.net) | |||
* @author Fred Toussi (fredt@users dot sourceforge.net) | * @author Fred Toussi (fredt@users dot sourceforge.net) | |||
* @author Blaine Simpson (blaine dot simpson at admc dot com) | * @author Blaine Simpson (blaine dot simpson at admc dot com) | |||
* | * | |||
* @version 2.7.0 | * @version 2.7.1 | |||
* @since 1.8.0 | * @since 1.8.0 | |||
*/ | */ | |||
public class Grantee implements SchemaObject { | public class Grantee implements SchemaObject { | |||
boolean isRole; | boolean isRole; | |||
/** | /** | |||
* true if this grantee has database administrator priv directly | * true if this grantee has database administrator priv directly | |||
* (ie., not by membership in any role) | * (ie., not by membership in any role) | |||
*/ | */ | |||
skipping to change at line 194 | skipping to change at line 194 | |||
} | } | |||
/** | /** | |||
* Gets direct roles, not roles nested within them. | * Gets direct roles, not roles nested within them. | |||
*/ | */ | |||
public OrderedHashSet getDirectRoles() { | public OrderedHashSet getDirectRoles() { | |||
return roles; | return roles; | |||
} | } | |||
/** | /** | |||
* Gets direct roles and public role, not roles nested within them. | ||||
*/ | ||||
public OrderedHashSet getDirectRolesWithPublic() { | ||||
OrderedHashSet newSet = new OrderedHashSet(); | ||||
newSet.addAll(roles); | ||||
newSet.add(granteeManager.publicRole); | ||||
return newSet; | ||||
} | ||||
/** | ||||
* Gets direct and indirect roles. | * Gets direct and indirect roles. | |||
*/ | */ | |||
public OrderedHashSet getAllRoles() { | public OrderedHashSet getAllRoles() { | |||
OrderedHashSet set = getGranteeAndAllRoles(); | OrderedHashSet set = getGranteeAndAllRoles(); | |||
// Since we added "Grantee" in addition to Roles, need to remove self. | // Since we added "Grantee" in addition to Roles, need to remove self. | |||
set.remove(this); | set.remove(this); | |||
return set; | return set; | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 11 lines changed or added |