GUACAMOLE-220: Correct user vs. entity wording in documentation. Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/4a5f2717 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/4a5f2717 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/4a5f2717
Branch: refs/heads/master Commit: 4a5f271702c0777849b615848b168ea8d0a36168 Parents: 8399b25 Author: Michael Jumper <mjum...@apache.org> Authored: Thu Sep 27 19:45:30 2018 -0700 Committer: Michael Jumper <mjum...@apache.org> Committed: Thu Sep 27 19:45:30 2018 -0700 ---------------------------------------------------------------------- .../auth/jdbc/permission/PermissionService.java | 2 +- .../auth/jdbc/permission/SystemPermissionService.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/4a5f2717/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionService.java index 5d88887..a48157e 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionService.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/PermissionService.java @@ -136,7 +136,7 @@ public interface PermissionService<PermissionSetType extends PermissionSet<Permi * The permissions to delete. * * @throws GuacamoleException - * If the entity lacks permission to delete the permissions, or an error + * If the user lacks permission to delete the permissions, or an error * occurs while deleting the permissions. */ void deletePermissions(ModeledAuthenticatedUser user, http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/4a5f2717/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionService.java index c94a260..5e5a43b 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionService.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/SystemPermissionService.java @@ -68,7 +68,7 @@ public class SystemPermissionService SystemPermissionModel model = new SystemPermissionModel(); - // Populate model object with data from user and permission + // Populate model object with data from entity and permission model.setEntityID(targetEntity.getModel().getEntityID()); model.setType(permission.getType()); @@ -81,7 +81,7 @@ public class SystemPermissionService ModeledPermissions<? extends EntityModel> targetEntity, Set<String> effectiveGroups) throws GuacamoleException { - // Create permission set for requested user + // Create permission set for requested entity SystemPermissionSet permissionSet = systemPermissionSetProvider.get(); permissionSet.init(user, targetEntity, effectiveGroups); @@ -144,13 +144,13 @@ public class SystemPermissionService * * @param effectiveGroups * The identifiers of all groups that should be taken into account - * when determining the permissions effectively granted to the user. If - * no groups are given, only permissions directly granted to the user - * will be used. + * when determining the permissions effectively granted to the entity. + * If no groups are given, only permissions directly granted to the + * entity will be used. * * @return * true if permission of the given type has been granted to the given - * user, false otherwise. + * entity, false otherwise. * * @throws GuacamoleException * If an error occurs while retrieving the requested permission. @@ -164,7 +164,7 @@ public class SystemPermissionService if (canReadPermissions(user, targetEntity)) return getPermissionMapper().selectOne(targetEntity.getModel(), type, effectiveGroups) != null; - // User cannot read this user's permissions + // User cannot read this entity's permissions throw new GuacamoleSecurityException("Permission denied."); }
