#314 Evaluate default permission on enum, remove default from handler interface

- Evaluate permission for DefaultPermission on the enum itself
- Remove boolean default from PermissionHandler for hasPermission()
- Remove some unused / intermediary hasPermission() flavors in PermissionsManager
This commit is contained in:
ljacqu
2016-06-01 21:56:57 +02:00
parent fdb9227ec1
commit 95343e366b
10 changed files with 50 additions and 49 deletions
@@ -23,7 +23,7 @@ public class BPermissionsHandler implements PermissionHandler {
}
@Override
public boolean hasPermission(Player player, PermissionNode node, boolean def) {
public boolean hasPermission(Player player, PermissionNode node) {
return ApiLayer.hasPermission(player.getWorld().getName(), CalculableType.USER, player.getName(), node.getNode());
}
@@ -30,7 +30,7 @@ public class GroupManagerHandler implements PermissionHandler {
}
@Override
public boolean hasPermission(Player player, PermissionNode node, boolean def) {
public boolean hasPermission(Player player, PermissionNode node) {
final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(player);
return handler != null && handler.has(player, node.getNode());
}
@@ -31,11 +31,10 @@ public interface PermissionHandler {
*
* @param player The player.
* @param node The permission node.
* @param def Default returned if no permissions system is used.
*
* @return True if the player has permission.
*/
boolean hasPermission(Player player, PermissionNode node, boolean def);
boolean hasPermission(Player player, PermissionNode node);
/**
* Check whether the player is in the specified group.
@@ -21,7 +21,7 @@ public class PermissionsBukkitHandler implements PermissionHandler {
}
@Override
public boolean hasPermission(Player player, PermissionNode node, boolean def) {
public boolean hasPermission(Player player, PermissionNode node) {
return player.hasPermission(node.getNode());
}
@@ -21,7 +21,7 @@ public class PermissionsExHandler implements PermissionHandler {
@Override
public boolean addToGroup(Player player, String group) {
if(!PermissionsEx.getPermissionManager().getGroupNames().contains(group)) {
if (!PermissionsEx.getPermissionManager().getGroupNames().contains(group)) {
ConsoleLogger.showError("The plugin tried to set " + player + "'s group to '" + group + "', but it doesn't exist!");
return false;
}
@@ -37,7 +37,7 @@ public class PermissionsExHandler implements PermissionHandler {
}
@Override
public boolean hasPermission(Player player, PermissionNode node, boolean def) {
public boolean hasPermission(Player player, PermissionNode node) {
PermissionUser user = permissionManager.getUser(player);
return user.has(node.getNode());
}
@@ -27,7 +27,7 @@ public class VaultHandler implements PermissionHandler {
}
@Override
public boolean hasPermission(Player player, PermissionNode node, boolean def) {
public boolean hasPermission(Player player, PermissionNode node) {
return vaultProvider.has(player, node.getNode());
}
@@ -29,12 +29,12 @@ public class ZPermissionsHandler implements PermissionHandler {
}
@Override
public boolean hasPermission(Player player, PermissionNode node, boolean def) {
public boolean hasPermission(Player player, PermissionNode node) {
Map<String, Boolean> perms = zPermissionsService.getPlayerPermissions(player.getWorld().getName(), null, player.getName());
if (perms.containsKey(node.getNode()))
return perms.get(node.getNode());
else
return def;
return node.getDefaultPermission().evaluate(player);
}
@Override