#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
@@ -48,7 +48,7 @@ public class HelpProvider implements SettingsDependent {
private String helpHeader;
@Inject
public HelpProvider(PermissionsManager permissionsManager, NewSetting settings) {
HelpProvider(PermissionsManager permissionsManager, NewSetting settings) {
this.permissionsManager = permissionsManager;
loadSettings(settings);
}
@@ -152,7 +152,7 @@ public class HelpProvider implements SettingsDependent {
final DefaultPermission defaultPermission = permission.getDefaultPermission();
String addendum = "";
if (DefaultPermission.OP_ONLY.equals(defaultPermission)) {
addendum = PermissionsManager.evaluateDefaultPermission(defaultPermission, sender)
addendum = defaultPermission.evaluate(sender)
? " (You have permission)"
: " (No permission)";
}