diff options
author | snowleo <schneeleo@gmail.com> | 2011-08-14 21:56:40 +0200 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2011-08-14 21:56:40 +0200 |
commit | a2fa666fd5b1cd3f6fac82da1063268589fd967a (patch) | |
tree | 13ad9b3787832f0ced78de98e01ff035a58885af /EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java | |
parent | 76eb00575bcd855f74c1cf284a09a9c58f928f7d (diff) | |
download | Essentials-a2fa666fd5b1cd3f6fac82da1063268589fd967a.tar Essentials-a2fa666fd5b1cd3f6fac82da1063268589fd967a.tar.gz Essentials-a2fa666fd5b1cd3f6fac82da1063268589fd967a.tar.lz Essentials-a2fa666fd5b1cd3f6fac82da1063268589fd967a.tar.xz Essentials-a2fa666fd5b1cd3f6fac82da1063268589fd967a.zip |
GroupManager update to Permissions 3.1.6 API done by ElgarL
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java')
-rwxr-xr-x[-rw-r--r--] | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java index ceecbfa21..b90cf4ff1 100644..100755 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java @@ -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(); |