Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2024-11-26 20:45:36 +01:00
Code Issues Projects Releases Wiki Activity

Some refactoring in Permissions handlers

Browse Source 
- Add default implementations of playerAddTransient() &
playerRemoveTransient() to the Permissions superclass.  "Pure"
superperms handlers (e.g. bPermissions, PermissionsBukkit) use those
methods, while handlers which use their own API can override them.

- Moved log and plugin fields to the Permissions superclass, since
they're present in all handlers.
This commit is contained in:
Des Herriott 2011-11-04 08:56:06 +00:00
parent e4675154d7
commit a6ab00f5e6
7 changed files with 62 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/net/milkbowl/vault/permission/Permission.java
View File

@ -19,11 +19,20 @@
package net.milkbowl.vault.permission;
import java.util.logging.Logger;
import net.milkbowl.vault.Vault;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo;
public abstract class Permission {
protected static final Logger log = Logger.getLogger("Minecraft");
protected Vault plugin = null;
/**
* Gets name of permission method
* @return Name of Permission Method
@ -130,12 +139,34 @@ public abstract class Permission {
/**
* Add transient permission to a player.
* This implementation can be used by any subclass which implements a "pure" superperms plugin, i.e.
* one that only needs the built-in Bukkit API to add transient permissions to a player. Any subclass
* implementing a plugin which provides its own API for this needs to override this method.
* @param world World name
* @param player Player name
* @param permission Permission node
* @return Success or Failure
*/
abstract public boolean playerAddTransient(String world, String player, String permission);
public boolean playerAddTransient(String world, String player, String permission) {
Player p = plugin.getServer().getPlayer(player);
if (p == null) {
throw new UnsupportedOperationException(getName() + " does not support offline player transient permissions!");
}
for (PermissionAttachmentInfo paInfo : p.getEffectivePermissions()) {
if (paInfo.getAttachment() != null && paInfo.getAttachment().getPlugin().equals(plugin)) {
paInfo.getAttachment().setPermission(permission, true);
return true;
}
}
PermissionAttachment attach = p.addAttachment(plugin);
attach.setPermission(permission, true);
return true;
}
/**
* Add transient permission to a player.
* @param world World Object
@ -187,14 +218,29 @@ public abstract class Permission {
}
/**
* Remove transient permission to a player.
* Remove transient permission from a player.
* This implementation can be used by any subclass which implements a "pure" superperms plugin, i.e.
* one that only needs the built-in Bukkit API to remove transient permissions from a player. Any subclass
* implementing a plugin which provides its own API for this needs to override this method.
* @param world World name
* @param player Player name
* @param permission Permission node
* @return Success or Failure
*/
abstract public boolean playerRemoveTransient(String world, String player, String permission);
public boolean playerRemoveTransient(String world, String player, String permission) {
Player p = plugin.getServer().getPlayer(player);
if (p == null)
return false;
for (PermissionAttachmentInfo paInfo : p.getEffectivePermissions()) {
if (paInfo.getAttachment() != null && paInfo.getAttachment().getPlugin().equals(plugin)) {
paInfo.getAttachment().unsetPermission(permission);
return true;
}
}
return false;
}
/**
* Remove transient permission from a player.
* @param world World name

6
src/net/milkbowl/vault/permission/plugins/Permission_GroupManager.java
View File

@ -3,8 +3,8 @@ package net.milkbowl.vault.permission.plugins;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Logger;
import net.milkbowl.vault.Vault;
import net.milkbowl.vault.permission.Permission;
import org.anjocaido.groupmanager.GroupManager;
@ -24,17 +24,15 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
public class Permission_GroupManager extends Permission {
private static final Logger log = Logger.getLogger("Minecraft");
private String name = "GroupManager";
private Plugin plugin = null;
private PluginManager pluginManager = null;
private GroupManager groupManager;
private AnjoPermissionsHandler perms;
private PermissionServerListener permissionServerListener = null;
@SuppressWarnings("deprecation")
public Permission_GroupManager(Plugin plugin) {
public Permission_GroupManager(Vault plugin) {
this.plugin = plugin;
pluginManager = this.plugin.getServer().getPluginManager();

6
src/net/milkbowl/vault/permission/plugins/Permission_Permissions3.java
View File

@ -21,13 +21,10 @@ package net.milkbowl.vault.permission.plugins;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Logger;
import net.milkbowl.vault.Vault;
import net.milkbowl.vault.permission.Permission;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.event.Event.Priority;
import org.bukkit.event.Event.Type;
@ -37,16 +34,13 @@ import org.bukkit.event.server.ServerListener;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
import com.nijiko.permissions.Group;
import com.nijiko.permissions.PermissionHandler;
import com.nijikokun.bukkit.Permissions.Permissions;
public class Permission_Permissions3 extends Permission {
private static final Logger log = Logger.getLogger("Minecraft");
private String name = "Permissions 3 (Yeti)";
private PermissionHandler perms;
private Vault plugin = null;
private PluginManager pluginManager = null;
private Permissions permission = null;
private PermissionServerListener permissionServerListener = null;

52
src/net/milkbowl/vault/permission/plugins/Permission_PermissionsBukkit.java
View File

@ -2,18 +2,14 @@ package net.milkbowl.vault.permission.plugins;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
import org.bukkit.Bukkit;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.craftbukkit.command.ColouredConsoleSender;
import org.bukkit.entity.Player;
import org.bukkit.event.Event.Priority;
import org.bukkit.event.Event.Type;
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.event.server.ServerListener;
import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
@ -21,29 +17,28 @@ import com.platymuus.bukkit.permissions.Group;
import com.platymuus.bukkit.permissions.PermissionsPlugin;
import net.D3GN.MiracleM4n.mChat.mChatAPI;
import net.milkbowl.vault.Vault;
import net.milkbowl.vault.permission.Permission;
public class Permission_PermissionsBukkit extends Permission {
private static final Logger log = Logger.getLogger("Minecraft");
private final String name = "PermissionsBukkit";
private Plugin plugin = null;
private PluginManager pluginManager = null;
private PermissionsPlugin perms = null;
private mChatAPI mChat = null;
private PermissionServerListener permissionServerListener = null;
private ConsoleCommandSender ccs;
public Permission_PermissionsBukkit(Plugin plugin) {
public Permission_PermissionsBukkit(Vault plugin) {
this.plugin = plugin;
ccs = ColouredConsoleSender.getInstance();
ccs = Bukkit.getServer().getConsoleSender();
pluginManager = this.plugin.getServer().getPluginManager();
permissionServerListener = new PermissionServerListener(this);
this.pluginManager.registerEvent(Type.PLUGIN_ENABLE, permissionServerListener, Priority.Monitor, plugin);
this.pluginManager.registerEvent(Type.PLUGIN_DISABLE, permissionServerListener, Priority.Monitor, plugin);
// Load Plugin in case it was loaded before
if (perms == null) {
Plugin perms = plugin.getServer().getPluginManager().getPlugin("PermissionsBukkit");
@ -135,26 +130,6 @@ public class Permission_PermissionsBukkit extends Permission {
return plugin.getServer().dispatchCommand(ccs, "permissions player setperm " + player + " " + permission + " true");
}
@Override
public boolean playerAddTransient(String world, String player, String permission) {
Player p = plugin.getServer().getPlayer(player);
if (p == null) {
throw new UnsupportedOperationException(getName() + " does not support offline player transient permissions!");
}
for (PermissionAttachmentInfo paInfo : p.getEffectivePermissions()) {
if (paInfo.getAttachment() != null && paInfo.getAttachment().getPlugin().equals(plugin)) {
paInfo.getAttachment().setPermission(permission, true);
return true;
}
}
PermissionAttachment attach = p.addAttachment(plugin);
attach.setPermission(permission, true);
return true;
}
@Override
public boolean playerRemove(String world, String player, String permission) {
if (world != null) {
@ -163,21 +138,8 @@ public class Permission_PermissionsBukkit extends Permission {
return plugin.getServer().dispatchCommand(ccs, "permissions player unsetperm " + player + " " + permission);
}
@Override
public boolean playerRemoveTransient(String world, String player, String permission) {
Player p = plugin.getServer().getPlayer(player);
if (p == null) {
throw new UnsupportedOperationException(getName() + " does not support offline player transient permissions!");
}
for (PermissionAttachmentInfo paInfo : p.getEffectivePermissions()) {
if (paInfo.getAttachment() != null && paInfo.getAttachment().getPlugin().equals(plugin)) {
paInfo.getAttachment().unsetPermission(permission);
return true;
}
}
return false;
}
// use superclass implementation of playerAddTransient() and playerRemoveTransient()
@Override
public boolean groupHas(String world, String group, String permission) {
if (world != null && !world.isEmpty()) {

4
src/net/milkbowl/vault/permission/plugins/Permission_PermissionsEx.java
View File

@ -19,8 +19,6 @@
package net.milkbowl.vault.permission.plugins;
import java.util.logging.Logger;
import net.milkbowl.vault.Vault;
import net.milkbowl.vault.permission.Permission;
@ -38,10 +36,8 @@ import ru.tehkode.permissions.PermissionUser;
import ru.tehkode.permissions.bukkit.PermissionsEx;
public class Permission_PermissionsEx extends Permission {
private static final Logger log = Logger.getLogger("Minecraft");
private final String name = "PermissionsEx";
private Vault plugin = null;
private PluginManager pluginManager = null;
private PermissionsEx permission = null;
private PermissionServerListener permissionServerListener = null;

35
src/net/milkbowl/vault/permission/plugins/Permission_SuperPerms.java
View File

@ -1,8 +1,6 @@
package net.milkbowl.vault.permission.plugins;
import org.bukkit.entity.Player;
import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo;
import net.milkbowl.vault.Vault;
import net.milkbowl.vault.permission.Permission;
@ -37,44 +35,13 @@ public class Permission_SuperPerms extends Permission {
return false;
}
@Override
public boolean playerAddTransient(String world, String player, String permission) {
Player p = plugin.getServer().getPlayer(player);
if (p == null)
return false;
for (PermissionAttachmentInfo paInfo : p.getEffectivePermissions()) {
if (paInfo.getAttachment().getPlugin().equals(plugin)) {
paInfo.getAttachment().setPermission(permission, true);
return true;
}
}
PermissionAttachment attach = p.addAttachment(plugin);
attach.setPermission(permission, true);
return true;
}
// use superclass implementation of playerAddTransient() and playerRemoveTransient()
@Override
public boolean playerRemove(String world, String player, String permission) {
return false;
}
@Override
public boolean playerRemoveTransient(String world, String player, String permission) {
Player p = plugin.getServer().getPlayer(player);
if (p == null)
return false;
for (PermissionAttachmentInfo paInfo : p.getEffectivePermissions()) {
if (paInfo.getAttachment().getPlugin().equals(plugin)) {
return paInfo.getAttachment().getPermissions().remove(permission);
}
}
return false;
}
@Override
public boolean groupHas(String world, String group, String permission) {
throw new UnsupportedOperationException(getName() + " no group permissions.");

40
src/net/milkbowl/vault/permission/plugins/Permission_bPermissions.java
View File

@ -1,7 +1,6 @@
package net.milkbowl.vault.permission.plugins;
import java.util.List;
import java.util.logging.Logger;
import org.bukkit.entity.Player;
import org.bukkit.event.Event.Priority;
@ -9,8 +8,6 @@ import org.bukkit.event.Event.Type;
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.event.server.ServerListener;
import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
@ -22,10 +19,8 @@ import net.milkbowl.vault.Vault;
import net.milkbowl.vault.permission.Permission;
public class Permission_bPermissions extends Permission {
private static final Logger log = Logger.getLogger("Minecraft");
private String name = "bPermissions";
private Vault plugin = null;
private PluginManager pluginManager = null;
private WorldPermissionsManager perms;
private PermissionServerListener permissionServerListener = null;
@ -95,44 +90,13 @@ public class Permission_bPermissions extends Permission {
throw new UnsupportedOperationException("Player specific permissions are not supported!");
}
@Override
public boolean playerAddTransient(String world, String player, String permission) {
Player p = plugin.getServer().getPlayer(player);
if (p == null)
return false;
for (PermissionAttachmentInfo paInfo : p.getEffectivePermissions()) {
if (paInfo.getAttachment().getPlugin().equals(plugin)) {
paInfo.getAttachment().setPermission(permission, true);
return true;
}
}
PermissionAttachment attach = p.addAttachment(plugin);
attach.setPermission(permission, true);
return true;
}
@Override
public boolean playerRemove(String world, String player, String permission) {
throw new UnsupportedOperationException("Player specific permissions are not supported!");
}
@Override
public boolean playerRemoveTransient(String world, String player, String permission) {
Player p = plugin.getServer().getPlayer(player);
if (p == null)
return false;
for (PermissionAttachmentInfo paInfo : p.getEffectivePermissions()) {
if (paInfo.getAttachment().getPlugin().equals(plugin)) {
return paInfo.getAttachment().getPermissions().remove(permission);
}
}
return false;
}
// use superclass implementation of playerAddTransient() and playerRemoveTransient()
@Override
public boolean groupHas(String world, String group, String permission) {
if (world == null)