GameRadio/SimplyPerms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code Cleaning (FFUUU more testings :'( )

Browse Source
This commit is contained in:
Michel Roux 2012-05-07 17:14:45 +02:00
parent fc023cc670
commit f1dc7ad362
1 changed files with 15 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/net/crystalyx/bukkit/simplyperms/SimplyPlugin.java
View File

@ -7,7 +7,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set;
import net.crystalyx.bukkit.simplyperms.io.ConfigFile; import net.crystalyx.bukkit.simplyperms.io.ConfigFile;
import net.crystalyx.bukkit.simplyperms.io.ConfigSQL; import net.crystalyx.bukkit.simplyperms.io.ConfigSQL;
@ -119,6 +118,15 @@ public class SimplyPlugin extends JavaPlugin {
return new SimplyAPI(this); return new SimplyAPI(this);
} }
public List<String> getKeys(YamlConfiguration config, String node) {
if (config.isConfigurationSection(node)) {
return new ArrayList<String>(config.getConfigurationSection(node).getKeys(false));
}
else {
return new ArrayList<String>();
}
}
// -- Plugin stuff // -- Plugin stuff
protected void registerPlayer(Player player) { protected void registerPlayer(Player player) {
@ -171,49 +179,12 @@ public class SimplyPlugin extends JavaPlugin {
return null; return null;
} }
protected HashMap<String, Boolean> getAllPerms(String desc, String path) {
HashMap<String, Boolean> result = new HashMap<String, Boolean>();
ConfigurationSection node = getNode(path);
int failures = 0;
String firstFailure = "";
Set<String> keys = node.getKeys(false);
for (String key : keys) {
if (node.isBoolean(key)) {
result.put(key, node.getBoolean(key));
} else {
++failures;
if (firstFailure.length() == 0) {
firstFailure = key;
}
}
}
if (failures == 1) {
getLogger().warning("In " + desc + ": " + firstFailure + " is non-boolean.");
} else if (failures > 1) {
getLogger().warning("In " + desc + ": " + firstFailure + " is non-boolean (+" + (failures-1) + " more).");
}
return result;
}
public void debug(String message) { public void debug(String message) {
if (getConfig().getBoolean("debug", false)) { if (getConfig().getBoolean("debug", false)) {
getLogger().info("Debug: " + message); getLogger().info("Debug: " + message);
} }
} }
public List<String> getKeys(YamlConfiguration config, String node) {
if (config.isConfigurationSection(node)) {
return new ArrayList<String>(config.getConfigurationSection(node).getKeys(false));
}
else {
return new ArrayList<String>();
}
}
protected void calculateAttachment(Player player) { protected void calculateAttachment(Player player) {
if (player == null) { if (player == null) {
return; return;
@ -272,15 +243,15 @@ public class SimplyPlugin extends JavaPlugin {
return new HashMap<String, Boolean>(); return new HashMap<String, Boolean>();
} }
Map<String, Boolean> perms = getNode("groups/" + group + "/permissions") == null ? Map<String, Boolean> perms = new HashMap<String, Boolean>();
new HashMap<String, Boolean>() : for (String key : getNode("groups/" + group + "/permissions").getKeys(false)) {
getAllPerms("group " + group, "groups/" + group + "/permissions"); perms.put(key, getNode("groups/" + group + "/permissions").getBoolean(key));
}
if (getNode("groups/" + group + "/worlds/" + world) != null) { if (getNode("groups/" + group + "/worlds/" + world) != null) {
for (Map.Entry<String, Boolean> entry : getAllPerms("group " + group, "groups/" + group + "/worlds/" + world).entrySet()) { for (String entry : getNode("groups/" + group + "/worlds/" + world).getKeys(false)) {
// No containskey; world overrides non-world // No containskey; world overrides non-world
perms.put(entry.getKey(), entry.getValue()); perms.put(entry, getNode("groups/" + group + "/worlds/" + world).getBoolean(entry));
} }
} }