Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-22 16:11:22 +01:00
Code Issues Projects Releases Wiki Activity

GroupManager update to Permissions 3.1.6 API done by ElgarL

Browse Source
This commit is contained in:
snowleo 2011-08-14 21:56:40 +02:00
parent 76eb00575b
commit a2fa666fd5
32 changed files with 816 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
EssentialsGroupBridge/nbproject/project.properties
View File

@ -4,6 +4,19 @@ annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=EssentialsGroupBridge
application.vendor=gabrielcouto
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-limit-width=120
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-line-wrap=none
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
@ -26,16 +39,16 @@ dist.jar=${dist.dir}/EssentialsGroupBridge.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
file.reference.Permissions.jar=..\\lib\\Permissions.jar
file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
file.reference.Permissions3.jar=../lib/Permissions3.jar
includes=**
jar.archive.disabled=${jnlp.enabled}
jar.compress=true
jar.index=${jnlp.enabled}
javac.classpath=\
${reference.EssentialsGroupManager.jar}:\
${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
${file.reference.Permissions.jar}
${file.reference.Permissions3.jar}:\
${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false

BIN
EssentialsGroupBridge/src/com/nijiko/Messaging.class
View File

Binary file not shown.

BIN
EssentialsGroupBridge/src/com/nijiko/Misc$string.class
View File

Binary file not shown.

BIN
EssentialsGroupBridge/src/com/nijiko/Misc.class
View File

Binary file not shown.

BIN
EssentialsGroupBridge/src/com/nijiko/configuration/ConfigurationHandler.class
View File

Binary file not shown.

BIN
EssentialsGroupBridge/src/com/nijiko/configuration/DefaultConfiguration.class
View File

Binary file not shown.

BIN
EssentialsGroupBridge/src/com/nijiko/database/Wrapper$Type.class
View File

Binary file not shown.

BIN
EssentialsGroupBridge/src/com/nijiko/database/Wrapper.class
View File

Binary file not shown.

BIN
EssentialsGroupBridge/src/com/nijiko/permissions/Control.class
View File

Binary file not shown.

BIN
EssentialsGroupBridge/src/com/nijiko/permissions/PermissionHandler.class
View File

Binary file not shown.

120
EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/Permissions.java Normal file → Executable file
View File

@ -1,16 +1,11 @@
package com.nijikokun.bukkit.Permissions;
import com.nijiko.Misc;
import com.nijiko.configuration.DefaultConfiguration;
import com.nijiko.permissions.PermissionHandler;
import java.util.logging.Logger;
import org.anjocaido.groupmanager.GroupManager;
import org.anjocaido.groupmanager.permissions.NijikoPermissionsProxy;
import org.bukkit.Server;
import org.bukkit.event.Event.Priority;
import org.bukkit.event.Event.Type;
import org.bukkit.event.player.PlayerChatEvent;
import org.bukkit.event.player.PlayerListener;
import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.event.server.ServerListener;
import org.bukkit.plugin.Plugin;
@ -19,110 +14,69 @@ import org.bukkit.plugin.java.JavaPlugin;
public class Permissions extends JavaPlugin {
private class Listener extends PlayerListener {
private Permissions plugin;
public Listener(Permissions plugin) {
//compiled code
throw new RuntimeException("Compiled Code");
}
public void onPlayerCommand(PlayerChatEvent event) {
//compiled code
throw new RuntimeException("Compiled Code");
}
}
public static final Logger log = Logger.getLogger("Fake Permissions");
public static String name = "Permissions";
public static String codename = "Hacked Permissions by AnjoCaido";
public static String version = "2.0";
public static PermissionHandler Security = null;
public static Misc Misc = new Misc();
public static Server Server;
private Listener Listener = null;
private DefaultConfiguration config = null;
private GroupManager groupManager;
@Override
public void onDisable() {
//compiled code
//throw new RuntimeException("Compiled Code");
// EXAMPLE: Custom code, here we just output some info so we can check all is well
PluginDescriptionFile pdfFile = this.getDescription();
System.out.println("Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " is disabled!");
}
@Override
public void onEnable() {
Server = this.getServer();
PluginDescriptionFile pdfFile = this.getDescription();
if (Security == null) {//make sure we have only one instance
Security = new NijikoPermissionsProxy(null);
}
Plugin p = (this.getServer() == null) ? null : this.getServer().getPluginManager().getPlugin("GroupManager");
if (p != null) {
if (p.isEnabled()) {
setGM(p);
} else {
if (this.getServer() != null) {
this.getServer().getPluginManager().registerEvent(Type.PLUGIN_ENABLE, new ServerListener() {
if (Security == null) {
//make sure we have only one instance
Security = new NijikoPermissionsProxy(null);
}
@Override
public void onPluginEnable(PluginEnableEvent event)
{
if (event.getPlugin().getDescription().getName().equals("GroupManager")) {
Permissions.this.setGM(event.getPlugin());
}
}
}, Priority.Normal, this);
}
}
} else {
System.err.println("OOOPS! Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " couldn't find GroupManager!");
this.getPluginLoader().disablePlugin(this);
}
// EXAMPLE: Custom code, here we just output some info so we can check all is well
if (pdfFile != null)
System.out.println("Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " is enabled!");
Plugin p = (this.getServer() == null) ? null : this.getServer().getPluginManager().getPlugin("GroupManager");
if (p != null) {
if (p.isEnabled()) {
setGM(p);
} else {
if (this.getServer() != null) {
this.getServer().getPluginManager().registerEvent(Type.PLUGIN_ENABLE, new ServerListener() {
@Override
public void onPluginEnable(PluginEnableEvent event) {
if (event.getPlugin().getDescription().getName().equals("GroupManager")) {
Permissions.this.setGM(event.getPlugin());
}
}
}, Priority.Normal, this);
}
}
} else {
System.err.println("OOOPS! Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " couldn't find GroupManager!");
this.getPluginLoader().disablePlugin(this);
}
if (pdfFile != null) {
System.out.println("Fake " + pdfFile.getName() + " version " + pdfFile.getVersion() + " is enabled!");
}
}
private void registerEvents() {
//compiled code
//throw new RuntimeException("Compiled Code");
private void setGM(final Plugin p) {
GroupManager groupManager = (GroupManager) p;
((NijikoPermissionsProxy) Security).setGM(p);
}
private void setGM(Plugin p) {
groupManager = (GroupManager)p;
((NijikoPermissionsProxy)Security).setGM(p);
}
public PermissionHandler getHandler() {
//compiled code
//throw new RuntimeException("Compiled Code");
//System.out.println("Alguem chamou o handler");
if (Security == null)
{
Security = new NijikoPermissionsProxy(null);
}
//checkEnable();
if (Security == null) {
Security = new NijikoPermissionsProxy(null);
}
return Security;
}
public void setupPermissions() {
if (Security == null)
{
Security = new NijikoPermissionsProxy(null);
}
//checkEnable();
}
private void checkEnable() {
if (!this.isEnabled() && Security == null && this.getServer() != null) {
this.getServer().getPluginManager().enablePlugin(this);
if (Security == null) {
Security = new NijikoPermissionsProxy(null);
}
}
}

469
EssentialsGroupBridge/src/org/anjocaido/groupmanager/permissions/NijikoPermissionsProxy.java Normal file → Executable file
View File

@ -4,26 +4,34 @@
*/
package org.anjocaido.groupmanager.permissions;
import com.nijiko.permissions.Control;
import com.nijiko.permissions.Group;
import com.nijiko.permissions.PermissionHandler;
import com.nijiko.permissions.User;
import java.io.File;
import java.util.Collection;
import java.util.Comparator;
import java.util.Map;
import java.util.Set;
import org.anjocaido.groupmanager.GroupManager;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.bukkit.util.config.Configuration;
/**
* Everything here maintains the model created by Nijikokun
*
* Everything here maintains the model created by Nijikokun
*
* But implemented to use GroupManager system. Which provides instant changes,
* without file access.
*
* @author gabrielcouto
*/
public class NijikoPermissionsProxy extends Control {
public class NijikoPermissionsProxy extends PermissionHandler {
GroupManager plugin;
public NijikoPermissionsProxy(GroupManager plugin){
super(null);
public NijikoPermissionsProxy(GroupManager plugin) {
super();
this.plugin = plugin;
}
@ -39,12 +47,12 @@ public class NijikoPermissionsProxy extends Control {
@Override
public void addGroupInfo(String world, String group, String node, Object data) {
throw new UnsupportedOperationException("Not supported yet.");
plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().addGroupInfo(group, node, data);
}
@Override
public void removeGroupInfo(String world, String group, String node) {
throw new UnsupportedOperationException("Not supported yet.");
plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().removeGroupInfo(group, node);
}
@Override
@ -59,62 +67,62 @@ public class NijikoPermissionsProxy extends Control {
@Override
public void addUserInfo(String world, String user, String node, Object data) {
throw new UnsupportedOperationException("Not supported yet.");
plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().addUserInfo(user, node, data);
}
@Override
public void removeUserInfo(String world, String user, String node) {
throw new UnsupportedOperationException("Not supported yet.");
plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().removeUserInfo(user, node);
}
@Override
@Deprecated
public void removeUserInfo(String user, String node) {
throw new UnsupportedOperationException("Not supported yet.");
plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().removeUserInfo(user, node);
}
@Override
@Deprecated
public void addGroupPermission(String group, String node) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
@Deprecated
public void removeGroupPermission(String group, String node) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
@Deprecated
public void addGroupInfo(String group, String node, Object data) {
throw new UnsupportedOperationException("Not supported yet.");
plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().addGroupInfo(group, node, data);
}
@Override
@Deprecated
public void removeGroupInfo(String group, String node) {
throw new UnsupportedOperationException("Not supported yet.");
plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().removeGroupInfo(group, node);
}
@Override
@Deprecated
public void addUserPermission(String user, String node) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
@Deprecated
public void removeUserPermission(String user, String node) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
@Deprecated
public void addUserInfo(String user, String node, Object data) {
throw new UnsupportedOperationException("Not supported yet.");
plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().addUserInfo(user, node, data);
}
@Override
public void setDefaultWorld(String world) {
//throw new UnsupportedOperationException("Not supported yet.");
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
@Deprecated
public void setDirectory(File directory) {
//throw new UnsupportedOperationException("Not supported yet.");
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
@ -124,7 +132,7 @@ public class NijikoPermissionsProxy extends Control {
@Override
public void forceLoadWorld(String world) {
//throw new UnsupportedOperationException("Not supported yet.");
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
@ -134,12 +142,7 @@ public class NijikoPermissionsProxy extends Control {
@Override
public void load() {
//throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void load(String world, Configuration config) {
//throw new UnsupportedOperationException("Not supported yet.");
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
@ -154,71 +157,6 @@ public class NijikoPermissionsProxy extends Control {
return true;
}
@Override
public void setCache(Map<String, Boolean> Cache) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void setCache(String world, Map<String, Boolean> Cache) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void setCacheItem(String player, String permission, boolean data) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void setCacheItem(String world, String player, String permission, boolean data) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Map<String, Boolean> getCache() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Map<String, Boolean> getCache(String world) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean getCacheItem(String player, String permission) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean getCacheItem(String world, String player, String permission) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void removeCachedItem(String player, String permission) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void removeCachedItem(String world, String player, String permission) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void clearCache() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void clearCache(String world) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void clearAllCache() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean has(Player player, String permission) {
//throw new UnsupportedOperationException("Not supported yet.");
@ -228,27 +166,56 @@ public class NijikoPermissionsProxy extends Control {
@Override
public boolean permission(Player player, String permission) {
//throw new UnsupportedOperationException("Not supported yet.");
if(permission==null || permission.equals("")){
if (permission == null || permission.equals("")) {
return false;
}
if(player==null){
GroupManager.logger.severe("A plugin is asking permission '"+permission+"' for a null player... Which plugin does that? Bastards!");
if (player == null) {
GroupManager.logger.severe("A plugin is asking permission '" + permission + "' for a null player... Which plugin does that? Bastards!");
return false;
}
if(player.getWorld()==null){
GroupManager.logger.warning("The player "+player.getName()+" has a null world? Treating as default world!");
if (player.getWorld() == null) {
GroupManager.logger.warning("The player " + player.getName() + " has a null world? Treating as default world!");
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().has(player, permission);
}
return plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getPermissionsHandler().has(player, permission);
}
@Override
public String getGroup(String world, String name) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroup(name);
public String getGroupRawPrefix(String world, String group) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPrefix(group);
}
@Override
public String getGroupRawSuffix(String world, String group) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupSuffix(group);
}
@Override
public String getUserPrefix(String world, String user) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPrefix(user);
}
@Override
public String getUserSuffix(String world, String user) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserSuffix(user);
}
@Override
public String getGroup(String world, String user) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroup(user);
}
@Override
public String getPrimaryGroup(String world, String user) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroup(user);
}
@Override
public boolean canUserBuild(String world, String user) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().canUserBuild(user);
}
@Deprecated
@Override
public String getGroup(String name) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroup(name);
}
@ -258,21 +225,14 @@ public class NijikoPermissionsProxy extends Control {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroups(name);
}
@Deprecated
@Override
public String[] getGroups(String name) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroups(name);
}
@Override
public boolean inGroup(String world, String name, String group) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().inGroup(name,group);
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().inGroup(name, group);
}
@Deprecated
@Override
public boolean inGroup(String name, String group) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().inGroup(name,group);
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().inGroup(name, group);
}
@Override
@ -280,7 +240,7 @@ public class NijikoPermissionsProxy extends Control {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPrefix(group);
}
@Override
@Deprecated
public String getGroupPrefix(String group) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPrefix(group);
}
@ -290,7 +250,7 @@ public class NijikoPermissionsProxy extends Control {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupSuffix(group);
}
@Override
@Deprecated
public String getGroupSuffix(String group) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupSuffix(group);
}
@ -301,134 +261,327 @@ public class NijikoPermissionsProxy extends Control {
}
@Deprecated
@Override
public boolean canGroupBuild(String group) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().canGroupBuild(group);
}
@Override
public String getGroupPermissionString(String world, String group, String permission) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionString(group,permission);
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionString(group, permission);
}
@Override
@Deprecated
public String getGroupPermissionString(String group, String permission) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionString(group,permission);
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionString(group, permission);
}
@Override
public int getGroupPermissionInteger(String world, String group, String permission) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionInteger(group,permission);
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionInteger(group, permission);
}
@Override
@Deprecated
public int getGroupPermissionInteger(String group, String permission) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionInteger(group,permission);
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionInteger(group, permission);
}
@Override
public boolean getGroupPermissionBoolean(String world, String group, String permission) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionBoolean(group,permission);
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionBoolean(group, permission);
}
@Override
@Deprecated
public boolean getGroupPermissionBoolean(String group, String permission) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionBoolean(group,permission);
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionBoolean(group, permission);
}
@Override
public double getGroupPermissionDouble(String world, String group, String permission) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionDouble(group,permission);
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getGroupPermissionDouble(group, permission);
}
@Override
@Deprecated
public double getGroupPermissionDouble(String group, String permission) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionDouble(group,permission);
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getGroupPermissionDouble(group, permission);
}
@Override
public String getUserPermissionString(String world, String name, String permission) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionString(name,permission);
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionString(name, permission);
}
@Override
@Deprecated
public String getUserPermissionString(String name, String permission) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionString(name,permission);
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionString(name, permission);
}
@Override
public int getUserPermissionInteger(String world, String name, String permission) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionInteger(name,permission);
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionInteger(name, permission);
}
@Override
@Deprecated
public int getUserPermissionInteger(String name, String permission) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionInteger(name,permission);
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionInteger(name, permission);
}
@Override
public boolean getUserPermissionBoolean(String world, String name, String permission) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionBoolean(name,permission);
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionBoolean(name, permission);
}
@Override
@Deprecated
public boolean getUserPermissionBoolean(String name, String permission) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionBoolean(name,permission);
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionBoolean(name, permission);
}
@Override
public double getUserPermissionDouble(String world, String name, String permission) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionDouble(name,permission);
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getUserPermissionDouble(name, permission);
}
@Override
@Deprecated
public double getUserPermissionDouble(String name, String permission) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionDouble(name,permission);
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getUserPermissionDouble(name, permission);
}
@Override
public String getPermissionString(String world, String name, String permission) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionString(name,permission);
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionString(name, permission);
}
@Override
@Deprecated
public String getPermissionString(String name, String permission) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionString(name,permission);
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionString(name, permission);
}
@Override
public int getPermissionInteger(String world, String name, String permission) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionInteger(name,permission);
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionInteger(name, permission);
}
@Override
@Deprecated
public int getPermissionInteger(String name, String permission) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionInteger(name,permission);
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionInteger(name, permission);
}
@Override
public boolean getPermissionBoolean(String world, String name, String permission) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionBoolean(name,permission);
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionBoolean(name, permission);
}
@Override
@Deprecated
public boolean getPermissionBoolean(String name, String permission) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionBoolean(name,permission);
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionBoolean(name, permission);
}
@Override
public double getPermissionDouble(String world, String name, String permission) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionDouble(name,permission);
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getPermissionDouble(name, permission);
}
@Deprecated
public double getPermissionDouble(String name, String permission) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionDouble(name, permission);
}
public void setGM(Plugin p) {
this.plugin = (GroupManager) p;
}
@Override
public double getPermissionDouble(String name, String permission) {
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().getPermissionDouble(name,permission);
public boolean canGroupRawBuild(String world, String group) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().canGroupBuild(group);
}
public void setGM(Plugin p)
{
this.plugin = (GroupManager)p;
}
@Override
public void closeAll() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public int compareWeights(String firstWorld, String first, String secondWorld, String second) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public int compareWeights(String world, String first, String second) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Map<String, Set<String>> getAllGroups(String world, String name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Group getDefaultGroup(String world) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Group getGroupObject(String world, String group) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public String getGroupProperName(String world, String group) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Boolean getInfoBoolean(String world, String entryName, String path,
boolean isGroup) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoBoolean(entryName, path, isGroup);
}
@Override
public Boolean getInfoBoolean(String world, String entryName, String path,
boolean isGroup, Comparator<Boolean> comparator) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Double getInfoDouble(String world, String entryName, String path, boolean isGroup) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoDouble(entryName, path, isGroup);
}
@Override
public Double getInfoDouble(String world, String entryName, String path,
boolean isGroup, Comparator<Double> comparator) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Integer getInfoInteger(String world, String entryName, String path,
boolean isGroup) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoInteger(entryName, path, isGroup);
}
@Override
public Integer getInfoInteger(String world, String entryName, String path,
boolean isGroup, Comparator<Integer> comparator) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public String getInfoString(String world, String entryName, String path, boolean isGroup) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().getInfoString(entryName, path, isGroup);
}
@Override
public String getInfoString(String world, String entryName, String path,
boolean isGroup, Comparator<String> comparator) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Boolean getRawInfoBoolean(String world, String entryName, String path,
boolean isGroup) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Double getRawInfoDouble(String world, String entryName, String path,
boolean isGroup) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Integer getRawInfoInteger(String world, String entryName, String path,
boolean isGroup) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public String getRawInfoString(String world, String entryName, String path,
boolean isGroup) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Set<String> getTracks(String world) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public User getUserObject(String world, String name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Collection<User> getUsers(String world) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Set<String> getWorlds() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean has(String world, String playerName, String permission) {
if (permission == null || permission.equals("")) {
return false;
}
if (playerName == null || playerName == "") {
GroupManager.logger.severe("A plugin is asking permission '" + permission + "' for a null player... Which plugin does that? Bastards!");
return false;
}
if (world == null) {
GroupManager.logger.warning("The player " + playerName + " has a null world? Treating as default world!");
return plugin.getWorldsHolder().getDefaultWorld().getPermissionsHandler().permission(playerName, permission);
}
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().permission(playerName, permission);
}
@Override
public boolean inGroup(String world, String user, String groupWorld, String group) {
return plugin.getWorldsHolder().getWorldData(world).getPermissionsHandler().inGroup(user, group);
}
@Override
public boolean inSingleGroup(String world, String user, String group) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean inSingleGroup(String world, String user, String groupWorld, String group) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean permission(String world, String name, String node) {
return has(world, name, node);
}
@Override
public Group safeGetGroup(String world, String name) throws Exception {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public User safeGetUser(String world, String name) throws Exception {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void save(String world) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void saveAll() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Collection<Group> getGroups(String world) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Group getPrimaryGroupObject(String string, String string1) {
throw new UnsupportedOperationException("Not supported yet.");
}
}

2
EssentialsGroupBridge/src/plugin.yml
View File

@ -1,4 +1,4 @@
name: Permissions
version: 2.7.2
version: 3.1.6
main: com.nijikokun.bukkit.Permissions.Permissions
depend: [GroupManager]

13
EssentialsGroupManager/nbproject/project.properties
View File

@ -4,6 +4,19 @@ annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=EssentialsGroupManager
application.vendor=gabrielcouto
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-limit-width=120
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-line-wrap=none
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:

2
EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java Normal file → Executable file
View File

@ -117,4 +117,4 @@ public class GMConfiguration {
}
GroupManager.logger.setLevel(Level.INFO);
}
}
}

28
EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java Normal file → Executable file
View File

@ -32,6 +32,7 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.java.JavaPlugin;
@SuppressWarnings("unused")
/**
*
* @author gabrielcouto
@ -48,7 +49,7 @@ public class GroupManager extends JavaPlugin {
private boolean validateOnlinePlayer = true;
private boolean isReady = false;
private GMConfiguration config;
private GMLoggerHandler ch;
private GMLoggerHandler ch;
public static final Logger logger = Logger.getLogger(GroupManager.class.getName());
@Override
@ -60,7 +61,7 @@ public class GroupManager extends JavaPlugin {
// EXAMPLE: Custom code, here we just output some info so we can check all is well
PluginDescriptionFile pdfFile = this.getDescription();
System.out.println(pdfFile.getName() + " version " + pdfFile.getVersion() + " is disabled!");
GroupManager.logger.removeHandler(ch);
GroupManager.logger.removeHandler(ch);
}
@Override
@ -166,7 +167,7 @@ public class GroupManager extends JavaPlugin {
}
/**
* A simple interface, for ones that don't want to mess with overloading.
* A simple interface, for ones that don't want to mess with overloading.
* Yet it is affected by overloading. But seamless.
* @return the dataholder with all information
*/
@ -176,8 +177,8 @@ public class GroupManager extends JavaPlugin {
}
/**
* Use this if you want to play with overloading.
* @return a dataholder with overloading interface
* Use this if you want to play with overloading.
* @return a dataholder with overloading interface
*/
@Deprecated
public OverloadedWorldHolder getOverloadedClassData() {
@ -186,10 +187,11 @@ public class GroupManager extends JavaPlugin {
/**
* Called when a command registered by this plugin is received.
* @param sender
* @param cmd
* @param sender
* @param cmd
* @param args
*/
@SuppressWarnings({"null", "deprecation"})
@Override
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
boolean playerCanDo = false;
@ -246,9 +248,9 @@ public class GroupManager extends JavaPlugin {
} catch (Exception e) {
//this error happened once with someone. now im prepared... i think
GroupManager.logger.severe("===================================================");
GroupManager.logger.severe("= ERROR REPORT START =");
GroupManager.logger.severe("= ERROR REPORT START =");
GroupManager.logger.severe("===================================================");
GroupManager.logger.severe("= COPY AND PASTE THIS TO GROUPMANAGER DEVELOPER =");
GroupManager.logger.severe("= COPY AND PASTE THIS TO GROUPMANAGER DEVELOPER =");
GroupManager.logger.severe("===================================================");
GroupManager.logger.severe(this.getDescription().getName());
GroupManager.logger.severe(this.getDescription().getVersion());
@ -265,7 +267,7 @@ public class GroupManager extends JavaPlugin {
GroupManager.logger.severe(val.name());
}
GroupManager.logger.severe("===================================================");
GroupManager.logger.severe("= ERROR REPORT ENDED =");
GroupManager.logger.severe("= ERROR REPORT ENDED =");
GroupManager.logger.severe("===================================================");
sender.sendMessage("An error occurred. Ask the admin to take a look at the console.");
}
@ -889,7 +891,7 @@ public class GroupManager extends JavaPlugin {
}
//PARECE OK
auxGroup.addInherits(auxGroup2);
sender.sendMessage(ChatColor.RED + "Group " + auxGroup2.getName() + " is now in " + auxGroup.getName() + " inheritance list.");
sender.sendMessage(ChatColor.RED + "Group " + auxGroup2.getName() + " is now in " + auxGroup.getName() + " inheritance list.");
return true;
case mangdeli:
@ -925,7 +927,7 @@ public class GroupManager extends JavaPlugin {
}
//PARECE OK
auxGroup.removeInherits(auxGroup2.getName());
sender.sendMessage(ChatColor.RED + "Group " + auxGroup2.getName() + " was removed from " + auxGroup.getName() + " inheritance list.");
sender.sendMessage(ChatColor.RED + "Group " + auxGroup2.getName() + " was removed from " + auxGroup.getName() + " inheritance list.");
return true;
case manuaddv:
@ -1633,4 +1635,4 @@ public class GroupManager extends JavaPlugin {
public File getBackupFolder() {
return backupFolder;
}
}
}

19
EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java Normal file → Executable file
View File

@ -27,7 +27,7 @@ public abstract class DataUnit {
}
/**
* Every group is matched only by their names and DataSources names.
* Every group is matched only by their names and DataSources names.
* @param o
* @return true if they are equal. false if not.
*/
@ -49,9 +49,6 @@ public abstract class DataUnit {
return hash;
}
/**
* @return the dataSource
*/
@ -67,10 +64,10 @@ public abstract class DataUnit {
}
public void flagAsChanged() {
GroupManager.logger.finest("DataSource: "+getDataSource().getName()+" - DataUnit: "+getName()+" flagged as changed!");
// for(StackTraceElement st: Thread.currentThread().getStackTrace()){
// GroupManager.logger.finest(st.toString());
// }
GroupManager.logger.finest("DataSource: " + getDataSource().getName() + " - DataUnit: " + getName() + " flagged as changed!");
// for(StackTraceElement st: Thread.currentThread().getStackTrace()){
// GroupManager.logger.finest(st.toString());
// }
changed = true;
}
@ -79,7 +76,7 @@ public abstract class DataUnit {
}
public void flagAsSaved() {
GroupManager.logger.finest("DataSource: "+getDataSource().getName()+" - DataUnit: "+getName()+" flagged as saved!");
GroupManager.logger.finest("DataSource: " + getDataSource().getName() + " - DataUnit: " + getName() + " flagged as saved!");
changed = false;
}
@ -108,7 +105,7 @@ public abstract class DataUnit {
return (ArrayList<String>) permissions.clone();
}
public void sortPermissions(){
public void sortPermissions() {
Collections.sort(permissions, StringPermissionComparator.getInstance());
}
}
}

12
EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java Normal file → Executable file
View File

@ -30,18 +30,18 @@ public class Group extends DataUnit implements Cloneable {
* @param name
*/
public Group(WorldDataHolder source, String name) {
super(source,name);
super(source, name);
}
/**
* Clone this group
* Clone this group
* @return a clone of this group
*/
@Override
public Group clone() {
Group clone = new Group(getDataSource(), this.getName());
clone.inherits = ((ArrayList<String>) this.getInherits().clone());
for(String perm: this.getPermissionList()){
for (String perm : this.getPermissionList()) {
clone.addPermission(perm);
}
clone.variables = ((GroupVariables) variables).clone(clone);
@ -60,7 +60,7 @@ public class Group extends DataUnit implements Cloneable {
}
Group clone = getDataSource().createGroup(this.getName());
clone.inherits = ((ArrayList<String>) this.getInherits().clone());
for(String perm: this.getPermissionList()){
for (String perm : this.getPermissionList()) {
clone.addPermission(perm);
}
clone.variables = variables.clone(clone);
@ -108,13 +108,13 @@ public class Group extends DataUnit implements Cloneable {
}
/**
*
*
* @param varList
*/
public void setVariables(Map<String, Object> varList) {
GroupVariables temp = new GroupVariables(this, varList);
variables.clearVars();
for(String key: temp.getVarKeyList()){
for (String key : temp.getVarKeyList()) {
variables.addVar(key, temp.getVarObject(key));
}
flagAsChanged();

2
EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java Normal file → Executable file
View File

@ -45,7 +45,7 @@ public class GroupVariables extends Variables implements Cloneable {
}
/**
* A clone of all vars here.
* A clone of all vars here.
* @return
*/
protected GroupVariables clone(Group newOwner) {

46
EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java Normal file → Executable file
View File

@ -4,7 +4,7 @@
*/
package org.anjocaido.groupmanager.data;
import com.sun.org.apache.bcel.internal.generic.AALOAD;
//import com.sun.org.apache.bcel.internal.generic.AALOAD;
import java.util.ArrayList;
import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
import java.util.Map;
@ -27,13 +27,12 @@ public class User extends DataUnit implements Cloneable {
*/
private UserVariables variables = new UserVariables(this);
/**
*
* @param name
*/
public User(WorldDataHolder source, String name) {
super(source,name);
super(source, name);
this.group = source.getDefaultGroup().getName();
}
@ -45,7 +44,7 @@ public class User extends DataUnit implements Cloneable {
public User clone() {
User clone = new User(getDataSource(), this.getName());
clone.group = this.group;
for(String perm: this.getPermissionList()){
for (String perm : this.getPermissionList()) {
clone.addPermission(perm);
}
//clone.variables = this.variables.clone();
@ -68,7 +67,7 @@ public class User extends DataUnit implements Cloneable {
} else {
clone.setGroup(this.getGroupName());
}
for(String perm: this.getPermissionList()){
for (String perm : this.getPermissionList()) {
clone.addPermission(perm);
}
//clone.variables = this.variables.clone();
@ -117,43 +116,47 @@ public class User extends DataUnit implements Cloneable {
flagAsChanged();
}
public void addSubGroup(Group subGroup){
if(this.group.equalsIgnoreCase(subGroup.getName())){
public void addSubGroup(Group subGroup) {
if (this.group.equalsIgnoreCase(subGroup.getName())) {
return;
}
if (!this.getDataSource().groupExists(subGroup.getName())) {
getDataSource().addGroup(subGroup);
}
}
subGroup = getDataSource().getGroup(subGroup.getName());
removeSubGroup(subGroup);
subGroups.add(subGroup.getName());
flagAsChanged();
}
public int subGroupsSize(){
public int subGroupsSize() {
return subGroups.size();
}
public boolean isSubGroupsEmpty(){
public boolean isSubGroupsEmpty() {
return subGroups.isEmpty();
}
public boolean containsSubGroup(Group subGroup){
public boolean containsSubGroup(Group subGroup) {
return subGroups.contains(subGroup.getName());
}
public boolean removeSubGroup(Group subGroup){
try{
if(subGroups.remove(subGroup.getName())){
public boolean removeSubGroup(Group subGroup) {
try {
if (subGroups.remove(subGroup.getName())) {
flagAsChanged();
return true;
}
} catch (Exception e){
} catch (Exception e) {
}
return false;
}
public ArrayList<Group> subGroupListCopy(){
public ArrayList<Group> subGroupListCopy() {
ArrayList<Group> val = new ArrayList<Group>();
for(String gstr: subGroups){
for (String gstr : subGroups) {
Group g = getDataSource().getGroup(gstr);
if(g==null){
if (g == null) {
removeSubGroup(g);
continue;
}
@ -161,7 +164,8 @@ public class User extends DataUnit implements Cloneable {
}
return val;
}
public ArrayList<String> subGroupListStringCopy(){
public ArrayList<String> subGroupListStringCopy() {
return (ArrayList<String>) subGroups.clone();
}
@ -179,7 +183,7 @@ public class User extends DataUnit implements Cloneable {
public void setVariables(Map<String, Object> varList) {
UserVariables temp = new UserVariables(this, varList);
variables.clearVars();
for(String key: temp.getVarKeyList()){
for (String key : temp.getVarKeyList()) {
variables.addVar(key, temp.getVarObject(key));
}
flagAsChanged();

13
EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java Normal file → Executable file
View File

@ -2,7 +2,6 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package org.anjocaido.groupmanager.data;
import java.util.Map;
@ -11,19 +10,23 @@ import java.util.Map;
*
* @author gabrielcouto
*/
public class UserVariables extends Variables{
public class UserVariables extends Variables {
private User owner;
public UserVariables(User owner){
public UserVariables(User owner) {
super(owner);
this.owner = owner;
}
public UserVariables(User owner, Map<String, Object> varList) {
super(owner);
this.variables = varList;
this.owner = owner;
}
/**
* A clone of all vars here.
* A clone of all vars here.
* @return
*/
protected UserVariables clone(User newOwner) {
@ -34,6 +37,7 @@ public class UserVariables extends Variables{
newOwner.flagAsChanged();
return clone;
}
/**
* @return the owner
*/
@ -41,5 +45,4 @@ public class UserVariables extends Variables{
public User getOwner() {
return owner;
}
}

14
EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java Normal file → Executable file
View File

@ -19,12 +19,14 @@ import java.util.Set;
* @author gabrielcouto
*/
public abstract class Variables implements Cloneable {
private DataUnit owner;
protected Map<String, Object> variables = new HashMap<String, Object>();
public Variables(DataUnit owner){
public Variables(DataUnit owner) {
this.owner = owner;
}
/**
* Add var to the the INFO node.
* examples:
@ -45,7 +47,7 @@ public abstract class Variables implements Cloneable {
}
/**
* Returns the object inside the var
* Returns the object inside the var
* @param name
* @return a Object if exists. null if doesn't exists
*/
@ -112,7 +114,7 @@ public abstract class Variables implements Cloneable {
}
/**
* All variable keys this is holding
* All variable keys this is holding
* @return
*/
public Set<String> getVarKeyList() {
@ -122,7 +124,7 @@ public abstract class Variables implements Cloneable {
}
/**
* verify is a var exists
* verify is a var exists
* @param name the key name of the var
* @return true if that var exists
*/
@ -174,7 +176,7 @@ public abstract class Variables implements Cloneable {
}
public void clearVars(){
public void clearVars() {
variables.clear();
owner.flagAsChanged();
}
@ -186,7 +188,7 @@ public abstract class Variables implements Cloneable {
return owner;
}
public boolean isEmpty(){
public boolean isEmpty() {
return variables.isEmpty();
}
}

7
EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java Normal file → Executable file
View File

@ -25,6 +25,7 @@ public class OverloadedWorldHolder extends WorldDataHolder {
*
* @param ph
*/
@SuppressWarnings("deprecation")
public OverloadedWorldHolder(WorldDataHolder ph) {
super(ph.getName());
this.f = ph.f;
@ -135,7 +136,7 @@ public class OverloadedWorldHolder extends WorldDataHolder {
}
/**
*
*
* @return
*/
@Override
@ -185,7 +186,7 @@ public class OverloadedWorldHolder extends WorldDataHolder {
}
/**
* Gets the user in normal state. Surpassing the overload state.
* Gets the user in normal state. Surpassing the overload state.
* It doesn't affect permissions. But it enables plugins change the
* actual user permissions even in overload mode.
* @param userName
@ -201,4 +202,4 @@ public class OverloadedWorldHolder extends WorldDataHolder {
User newUser = createUser(userName);
return newUser;
}
}
}

92
EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java Normal file → Executable file
View File

@ -42,7 +42,7 @@ public class WorldDataHolder {
*/
protected String name;
/**
* The actual groups holder
* The actual groups holder
*/
protected Map<String, Group> groups = new HashMap<String, Group>();
/**
@ -50,7 +50,7 @@ public class WorldDataHolder {
*/
protected Map<String, User> users = new HashMap<String, User>();
/**
* Points to the default group
* Points to the default group
*/
protected Group defaultGroup = null;
/**
@ -81,7 +81,7 @@ public class WorldDataHolder {
protected boolean haveGroupsChanged = false;
/**
* Prevent direct instantiation
* Prevent direct instantiation
* @param worldName
*/
protected WorldDataHolder(String worldName) {
@ -90,7 +90,7 @@ public class WorldDataHolder {
/**
* The main constructor for a new WorldDataHolder
* Please don't set the default group as null
* Please don't set the default group as null
* @param worldName
* @param defaultGroup the default group. its good to start with one
*/
@ -116,7 +116,7 @@ public class WorldDataHolder {
}
/**
* Add a user to the list. If it already exists, overwrite the old.
* Add a user to the list. If it already exists, overwrite the old.
* @param theUser the user you want to add to the permission list
*/
public void addUser(User theUser) {
@ -158,7 +158,7 @@ public class WorldDataHolder {
}
/**
* Change the default group of the file.
* Change the default group of the file.
* @param group the group you want make default.
*/
public void setDefaultGroup(Group group) {
@ -170,7 +170,7 @@ public class WorldDataHolder {
}
/**
* Returns the default group of the file
* Returns the default group of the file
* @return the default group
*/
public Group getDefaultGroup() {
@ -178,7 +178,7 @@ public class WorldDataHolder {
}
/**
* Returns a group of the given name
* Returns a group of the given name
* @param groupName the name of the group
* @return a group if it is found. null if not found.
*/
@ -187,7 +187,7 @@ public class WorldDataHolder {
}
/**
* Check if a group exists.
* Check if a group exists.
* Its the same of getGroup, but check if it is null.
* @param groupName the name of the group
* @return true if exists. false if not.
@ -210,7 +210,7 @@ public class WorldDataHolder {
}
/**
* Remove the group to the list
* Remove the group to the list
* @param groupName
* @return true if had something to remove. false the group was default or non-existant
*/
@ -277,7 +277,7 @@ public class WorldDataHolder {
}
/**
* reads the file again
* reads the file again
*/
public void reload() {
try {
@ -301,13 +301,14 @@ public class WorldDataHolder {
}
/**
* Returns a data holder for the given file
* Returns a data holder for the given file
* @param worldName
* @param file
* @return
* @throws Exception
* @deprecated
*/
@SuppressWarnings({"rawtypes", "unchecked"})
@Deprecated
public static WorldDataHolder load(String worldName, File file) throws Exception {
WorldDataHolder ph = new WorldDataHolder(worldName);
@ -387,7 +388,7 @@ public class WorldDataHolder {
}
} catch (Exception ex) {
ex.printStackTrace();
throw new Exception("Your Permissions config file is invalid. See console for details.");
throw new Exception("Your Permissions config file is invalid. See console for details.");
}
if (ph.defaultGroup == null) {
throw new IllegalArgumentException("There was no Default Group declared.");
@ -409,7 +410,7 @@ public class WorldDataHolder {
User thisUser = ph.createUser(usersKey);
if (thisUser == null) {
GroupManager.logger.warning("I think this user was declared more than once: " + usersKey);
continue;
continue;
}
if (thisUserNode.get("permissions") == null) {
thisUserNode.put("permissions", new ArrayList<String>());
@ -436,8 +437,8 @@ public class WorldDataHolder {
Group hisGroup = ph.getGroup(thisUserNode.get("group").toString());
if (hisGroup == null) {
GroupManager.logger.warning("There is no group " + thisUserNode.get("group").toString() + ", as stated for player " + thisUser.getName());
thisUser.setGroup(ph.defaultGroup);
}
thisUser.setGroup(ph.defaultGroup);
}
thisUser.setGroup(hisGroup);
} else {
thisUser.setGroup(ph.defaultGroup);
@ -447,7 +448,7 @@ public class WorldDataHolder {
}
/**
* Returns a data holder for the given file
* Returns a data holder for the given file
* @param worldName
* @param groupsFile
* @param usersFile
@ -455,6 +456,7 @@ public class WorldDataHolder {
* @throws FileNotFoundException
* @throws IOException
*/
@SuppressWarnings({"rawtypes", "unchecked"})
public static WorldDataHolder load(String worldName, File groupsFile, File usersFile) throws FileNotFoundException, IOException {
WorldDataHolder ph = new WorldDataHolder(worldName);
ph.groupsFile = groupsFile;
@ -539,7 +541,7 @@ public class WorldDataHolder {
}
} catch (Exception ex) {
ex.printStackTrace();
throw new IllegalArgumentException("Your Permissions config file is invalid. See console for details.");
throw new IllegalArgumentException("Your Permissions config file is invalid. See console for details.");
}
if (ph.defaultGroup == null) {
throw new IllegalArgumentException("There was no Default Group declared.");
@ -639,7 +641,7 @@ public class WorldDataHolder {
}
/**
* Write a dataHolder in a specified file
* Write a dataHolder in a specified file
* @param ph
* @param file
* @deprecated
@ -726,7 +728,7 @@ public class WorldDataHolder {
}
/**
* Write a dataHolder in a specified file
* Write a dataHolder in a specified file
* @param ph
* @param groupsFile
*/
@ -761,28 +763,28 @@ public class WorldDataHolder {
DumperOptions opt = new DumperOptions();
opt.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
final Yaml yaml = new Yaml(opt);
try {
yaml.dump(root, new OutputStreamWriter(new FileOutputStream(groupsFile), "UTF-8"));
} catch (UnsupportedEncodingException ex) {
} catch (FileNotFoundException ex) {
}
try {
yaml.dump(root, new OutputStreamWriter(new FileOutputStream(groupsFile), "UTF-8"));
} catch (UnsupportedEncodingException ex) {
} catch (FileNotFoundException ex) {
}
/*FileWriter tx = null;
try {
tx = new FileWriter(groupsFile, false);
tx.write(yaml.dump(root));
tx.flush();
tx = new FileWriter(groupsFile, false);
tx.write(yaml.dump(root));
tx.flush();
} catch (Exception e) {
} finally {
try {
tx.close();
} catch (IOException ex) {
}
try {
tx.close();
} catch (IOException ex) {
}
}*/
}
/**
* Write a dataHolder in a specified file
* Write a dataHolder in a specified file
* @param ph
* @param usersFile
*/
@ -823,22 +825,22 @@ public class WorldDataHolder {
DumperOptions opt = new DumperOptions();
opt.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
final Yaml yaml = new Yaml(opt);
try {
yaml.dump(root, new OutputStreamWriter(new FileOutputStream(usersFile), "UTF-8"));
} catch (UnsupportedEncodingException ex) {
} catch (FileNotFoundException ex) {
}
try {
yaml.dump(root, new OutputStreamWriter(new FileOutputStream(usersFile), "UTF-8"));
} catch (UnsupportedEncodingException ex) {
} catch (FileNotFoundException ex) {
}
/*FileWriter tx = null;
try {
tx = new FileWriter(usersFile, false);
tx.write(yaml.dump(root));
tx.flush();
tx = new FileWriter(usersFile, false);
tx.write(yaml.dump(root));
tx.flush();
} catch (Exception e) {
} finally {
try {
tx.close();
} catch (IOException ex) {
}
try {
tx.close();
} catch (IOException ex) {
}
}*/
}

17
EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java Normal file → Executable file
View File

@ -37,7 +37,7 @@ public class WorldsHolder {
* Map of mirrors: <nonExistingWorldName, existingAndLoadedWorldName>
* The key is the mirror.
* The object is the mirrored.
*
*
* Mirror shows the same data of mirrored.
*/
private Map<String, String> mirrors = new HashMap<String, String>();
@ -63,7 +63,8 @@ public class WorldsHolder {
initialWorldLoading();
mirrorSetUp();
}
private void initialWorldLoading(){
private void initialWorldLoading() {
//LOAD EVERY WORLD POSSIBLE
loadWorld(serverDefaultWorldName);
defaultWorld = worldsData.get(serverDefaultWorldName);
@ -77,7 +78,9 @@ public class WorldsHolder {
}
}
}
public void mirrorSetUp(){
@SuppressWarnings("rawtypes")
public void mirrorSetUp() {
mirrors.clear();
Map<String, Object> mirrorsMap = plugin.getConfig().getMirrorsMap();
if (mirrorsMap != null) {
@ -122,7 +125,7 @@ public class WorldsHolder {
}
/**
*
*
*/
public void saveChanges() {
ArrayList<WorldDataHolder> alreadyDone = new ArrayList<WorldDataHolder>();
@ -136,7 +139,7 @@ public class WorldsHolder {
continue;
}
if (w.haveGroupsChanged()) {
String groupsFolderName = w.getGroupsFile().getParentFile().getName();
//String groupsFolderName = w.getGroupsFile().getParentFile().getName();
File backupGroups = new File(plugin.getBackupFolder(), "bkp_" + w.getName() + "_g_" + Tasks.getDateString() + ".yml");
try {
Tasks.copy(w.getGroupsFile(), backupGroups);
@ -368,7 +371,7 @@ public class WorldsHolder {
GroupManager.logger.log(Level.SEVERE, null, ex);
return;
}
GroupManager.logger.severe("Failed to load world " + worldName + "...");
//GroupManager.logger.severe("Failed to load world " + worldName + "...");
}
}
@ -376,7 +379,7 @@ public class WorldsHolder {
* Tells if the such world has been mapped.
*
* It will return true if world is a mirror.
*
*
* @param worldName
* @return true if world is loaded or mirrored. false if not listed
*/

204
EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java Normal file → Executable file
View File

@ -13,10 +13,11 @@ import org.anjocaido.groupmanager.data.Group;
import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
import org.anjocaido.groupmanager.data.User;
import org.anjocaido.groupmanager.utils.PermissionCheckResult;
import org.anjocaido.groupmanager.utils.PermissionCheckResult.Type;
import org.bukkit.entity.Player;
/**
* Everything here maintains the model created by Nijikokun
* Everything here maintains the model created by Nijikokun
*
* But implemented to use GroupManager system. Which provides instant changes,
* without file access.
@ -49,7 +50,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
}
/**
* Checks if a player can use that permission node.
* Checks if a player can use that permission node.
* @param player
* @param permission
* @return
@ -59,6 +60,16 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
return checkUserPermission(ph.getUser(player.getName()), permission);
}
/**
* Checks if a player can use that permission node.
* @param playerName
* @param permission
* @return
*/
public boolean permission(String playerName, String permission) {
return checkUserPermission(ph.getUser(playerName), permission);
}
/**
* Returns the name of the group of that player name.
* @param userName
@ -70,7 +81,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
}
/**
* Verify if player is in suck group.
* Verify if player is in suck group.
* It will check it's groups inheritance.
*
* So if you have a group Admin > Moderator
@ -98,6 +109,75 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
return false;
}
/**
* Gets the appropriate prefix for the user.
* This method is a utility method for chat plugins to get the user's prefix
* without having to look at every one of the user's ancestors.
* Returns an empty string if user has no parent groups.
* @param user Player's name
* @return Player's prefix
*/
@Override
public String getUserPrefix(String user) {
String prefix = ph.getUser(user).getVariables().getVarString("prefix");
if (prefix.length() != 0) {
return prefix;
}
return getGroupPrefix(getGroup(user));
}
/**
* Gets the appropriate prefix for the user.
* This method is a utility method for chat plugins to get the user's prefix
* without having to look at every one of the user's ancestors.
* Returns an empty string if user has no parent groups.
* @param user Player's name
* @return Player's prefix
*/
@Override
public String getUserSuffix(String user) {
String suffix = ph.getUser(user).getVariables().getVarString("suffix");
if (suffix.length() != 0) {
return suffix;
}
return getGroupSuffix(getGroup(user));
}
/**
* Gets name of the primary group of the user.
* Returns the name of the default group if user has no parent groups,
* or "Default" if there is no default group for that world.
* @param user Player's name
* @return Name of player's primary group
*/
public String getPrimaryGroup(String user) {
return getGroup(user);
}
/**
* Check if user can build.
* @param world Player's world
* @param user Player's name
* @return Whether the user can build
*/
public boolean canUserBuild(String user) {
boolean test = ph.getUser(user).getVariables().getVarBoolean("build");
if (test) {
return test;
}
return canGroupBuild(getGroup(user));
}
/**
* Returns the String prefix for the given group
* @param groupName
@ -107,7 +187,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
public String getGroupPrefix(String groupName) {
Group g = ph.getGroup(groupName);
if (g == null) {
return null;
return "";
}
return g.getVariables().getVarString("prefix");
}
@ -121,7 +201,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
public String getGroupSuffix(String groupName) {
Group g = ph.getGroup(groupName);
if (g == null) {
return null;
return "";
}
return g.getVariables().getVarString("suffix");
}
@ -161,7 +241,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
}
/**
* It returns a Integer variable value
* It returns a Integer variable value
* It will harvest inheritance for value.
* @param groupName
* @param variable
@ -619,8 +699,8 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
@Deprecated
public boolean checkGroupPermissionWithInheritance(Group start, String permission, List<Group> alreadyChecked) {
PermissionCheckResult result = checkGroupPermissionWithInheritance(start, permission);
if (result.resultType.equals(result.resultType.EXCEPTION)
|| result.resultType.equals(result.resultType.FOUND)) {
if (result.resultType.equals(Type.EXCEPTION)
|| result.resultType.equals(Type.FOUND)) {
return true;
}
return false;
@ -682,8 +762,8 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
@Deprecated
public Group nextGroupWithPermission(Group start, String permission, List<Group> alreadyChecked) {
PermissionCheckResult result = checkGroupPermissionWithInheritance(start, permission);
if (result.resultType.equals(result.resultType.EXCEPTION)
|| result.resultType.equals(result.resultType.FOUND)) {
if (result.resultType.equals(Type.EXCEPTION)
|| result.resultType.equals(Type.FOUND)) {
return (Group) checkGroupPermissionWithInheritance(start, permission).owner;
}
return null;
@ -699,7 +779,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
* @param start
* @param alreadyChecked
* @return the group that passed on test. null if no group passed.
* @deprecated use the other method with same name, instead
* @deprecated use the other method with same name, instead
*/
@Deprecated
public ArrayList<String> listAllGroupsInherited(Group start, ArrayList<String> alreadyChecked) {
@ -807,9 +887,10 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
* @param userName
* @return
*/
@Override
public String[] getGroups(String userName) {
ArrayList<String> allGroups = listAllGroupsInherited(ph.getUser(userName).getGroup());
for(Group subg: ph.getUser(userName).subGroupListCopy()){
for (Group subg : ph.getUser(userName).subGroupListCopy()) {
allGroups.addAll(listAllGroupsInherited(subg));
}
String[] arr = new String[allGroups.size()];
@ -825,6 +906,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
* @param targerPermission
* @return
*/
@SuppressWarnings("unused")
private Group breadthFirstSearch(Group start, String targerPermission) {
if (start == null || targerPermission == null) {
return null;
@ -853,4 +935,102 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
}
return null;
}
@Override
public Group getDefaultGroup() {
return ph.getDefaultGroup();
}
@Override
public String getInfoString(String entryName, String path,
boolean isGroup) {
if (isGroup) {
Group data = ph.getGroup(entryName);
if (data == null) {
return null;
}
return data.getVariables().getVarString(path);
} else {
User data = ph.getUser(entryName);
if (data == null) {
return null;
}
return data.getVariables().getVarString(path);
}
}
@Override
public int getInfoInteger(String entryName, String path,
boolean isGroup) {
if (isGroup) {
Group data = ph.getGroup(entryName);
if (data == null) {
return -1;
}
return data.getVariables().getVarInteger(path);
} else {
User data = ph.getUser(entryName);
if (data == null) {
return -1;
}
return data.getVariables().getVarInteger(path);
}
}
@Override
public double getInfoDouble(String entryName, String path,
boolean isGroup) {
if (isGroup) {
Group data = ph.getGroup(entryName);
if (data == null) {
return -1;
}
return data.getVariables().getVarDouble(path);
} else {
User data = ph.getUser(entryName);
if (data == null) {
return -1;
}
return data.getVariables().getVarDouble(path);
}
}
@Override
public boolean getInfoBoolean(String entryName, String path,
boolean isGroup) {
if (isGroup) {
Group data = ph.getGroup(entryName);
if (data == null) {
return false;
}
return data.getVariables().getVarBoolean(path);
} else {
User data = ph.getUser(entryName);
if (data == null) {
return false;
}
return data.getVariables().getVarBoolean(path);
}
}
@Override
public void addUserInfo(String name, String path, Object data) {
ph.getUser(name).getVariables().addVar(path, data);
}
@Override
public void removeUserInfo(String name, String path) {
ph.getUser(name).getVariables().removeVar(path);
}
@Override
public void addGroupInfo(String name, String path, Object data) {
ph.getGroup(name).getVariables().addVar(path, data);
}
@Override
public void removeGroupInfo(String name, String path) {
ph.getGroup(name).getVariables().removeVar(path);
}
}

77
EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/PermissionsReaderInterface.java Normal file → Executable file
View File

@ -1,10 +1,15 @@
package org.anjocaido.groupmanager.permissions;
//import java.util.Collection;
//import java.util.Map;
//import java.util.Set;
import org.anjocaido.groupmanager.data.Group;
//import org.anjocaido.groupmanager.data.User;
import org.bukkit.entity.Player;
/**
* Made by Nijikokun. Changed by Gabriel Couto
*
* Made by Nijikokun. Changed by Gabriel Couto
*
* This class is intended to *read* permissions from a single world.
*
* @author Nijikokun
@ -12,7 +17,6 @@ import org.bukkit.entity.Player;
*/
public abstract class PermissionsReaderInterface {
/**
*
* @param player
@ -90,7 +94,7 @@ public abstract class PermissionsReaderInterface {
public abstract boolean getGroupPermissionBoolean(String string, String string1);
/**
*
*
* @param string
* @param string1
* @return
@ -160,4 +164,69 @@ public abstract class PermissionsReaderInterface {
* @return
*/
public abstract double getPermissionDouble(String string, String string1);
/////////////////////////////
/**
* Gets the appropriate prefix for the user.
* This method is a utility method for chat plugins to get the user's prefix
* without having to look at every one of the user's ancestors.
* Returns an empty string if user has no parent groups.
* @param world Player's world
* @param user Player's name
* @return Player's prefix
*/
public abstract String getUserPrefix(String user);
/**
* Gets the appropriate suffix for the user.
* This method is a utility method for chat plugins to get the user's suffix
* without having to look at every one of the user's ancestors.
* Returns an empty string if user has no parent groups.
* @param world Player's world
* @param user Player's name
* @return Player's suffix
*/
public abstract String getUserSuffix(String user);
/**
* Returns the group object representing the default group of the given world.
* This method will return null if the object does not exist or the world has no default group.
* @return Group object representing default world, or null if it doesn't exist or is not defined.
*/
public abstract Group getDefaultGroup();
/**
* Gets a array of the names of all parent groups in the same world.
* @param name Target user's name
* @return An array containing the names of all parent groups (including ancestors) that are in the same world
*/
public abstract String[] getGroups(String name);
public abstract String getInfoString(String entryName, String path, boolean isGroup);
//public abstract String getInfoString(String entryName, String path, boolean isGroup, Comparator<String> comparator);
public abstract int getInfoInteger(String entryName, String path, boolean isGroup);
//public abstract int getInfoInteger(String entryName, String path, boolean isGroup, Comparator<Integer> comparator);
/**
* Gets a double from the Info node without inheritance.
* @param entryName
* @param path
* @param isGroup
* @return
*/
public abstract double getInfoDouble(String entryName, String path, boolean isGroup);
//public abstract double getInfoDouble(String entryName, String path, boolean isGroup, Comparator<Double> comparator);
public abstract boolean getInfoBoolean(String entryName, String path, boolean isGroup);
//public abstract boolean getInfoBoolean(String entryName, String path, boolean isGroup, Comparator<Boolean> comparator);
public abstract void addUserInfo(String name, String path, Object data);
public abstract void removeUserInfo(String name, String path);
public abstract void addGroupInfo(String name, String path, Object data);
public abstract void removeGroupInfo(String name, String path);
//////////////////////////////
}

0
EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/GMLoggerHandler.java Normal file → Executable file
View File

1
EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/GroupManagerPermissions.java Normal file → Executable file
View File

@ -9,6 +9,7 @@ package org.anjocaido.groupmanager.utils;
* @author gabrielcouto
*/
public enum GroupManagerPermissions {
manuadd,
manudel,
manuaddsub,

1
EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/PermissionCheckResult.java Normal file → Executable file
View File

@ -11,6 +11,7 @@ import org.anjocaido.groupmanager.data.DataUnit;
* @author gabrielcouto
*/
public class PermissionCheckResult {
/**
* It should be the owner of the access level found.
*

19
EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/StringPermissionComparator.java Normal file → Executable file
View File

@ -2,7 +2,6 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package org.anjocaido.groupmanager.utils;
import java.util.Comparator;
@ -19,32 +18,32 @@ public class StringPermissionComparator implements Comparator<String> {
boolean bp = permB.startsWith("+");
boolean am = permA.startsWith("-");
boolean bm = permB.startsWith("-");
if(ap&&bp){
if (ap && bp) {
return 0;
}
if(ap&&!bp){
if (ap && !bp) {
return -1;
}
if(!ap&&bp){
if (!ap && bp) {
return 1;
}
if(am&&bm){
if (am && bm) {
return 0;
}
if(am&&!bm){
if (am && !bm) {
return -1;
}
if(!am&&bm){
if (!am && bm) {
return 1;
}
return permA.compareToIgnoreCase(permB);
}
private static StringPermissionComparator instance;
public static StringPermissionComparator getInstance(){
if(instance==null){
public static StringPermissionComparator getInstance() {
if (instance == null) {
instance = new StringPermissionComparator();
}
return instance;
}
}

53
EssentialsGroupManager/src/org/anjocaido/groupmanager/utils/Tasks.java Normal file → Executable file
View File

@ -10,7 +10,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.List;
import org.anjocaido.groupmanager.data.Group;
@ -62,48 +62,51 @@ public abstract class Tasks {
public static String getDateString() {
GregorianCalendar now = new GregorianCalendar();
String date = "";
date += now.get(GregorianCalendar.DAY_OF_MONTH);
date += now.get(Calendar.DAY_OF_MONTH);
date += "-";
date += now.get(GregorianCalendar.HOUR);
date += now.get(Calendar.HOUR);
date += "-";
date += now.get(GregorianCalendar.MINUTE);
date += now.get(Calendar.MINUTE);
return date;
}
public static String getStringListInString(List<String> list){
if(list==null){
public static String getStringListInString(List<String> list) {
if (list == null) {
return "";
}
String result="";
for(int i=0;i<list.size();i++){
result+=list.get(i);
if(i<list.size()-1){
result+=", ";
String result = "";
for (int i = 0; i < list.size(); i++) {
result += list.get(i);
if (i < list.size() - 1) {
result += ", ";
}
}
return result;
}
public static String getStringArrayInString(String[] list){
if(list==null){
public static String getStringArrayInString(String[] list) {
if (list == null) {
return "";
}
String result="";
for(int i=0;i<list.length;i++){
result+=list[i];
if(i<((list.length)-1)){
result+=", ";
String result = "";
for (int i = 0; i < list.length; i++) {
result += list[i];
if (i < ((list.length) - 1)) {
result += ", ";
}
}
return result;
}
public static String getGroupListInString(List<Group> list){
if(list==null){
public static String getGroupListInString(List<Group> list) {
if (list == null) {
return "";
}
String result="";
for(int i=0;i<list.size();i++){
result+=list.get(i).getName();
if(i<list.size()-1){
result+=", ";
String result = "";
for (int i = 0; i < list.size(); i++) {
result += list.get(i).getName();
if (i < list.size() - 1) {
result += ", ";
}
}
return result;