6 files changed, 75 insertions, 52 deletions

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
index 3eb7491dd..f17d8b21e 100644..100755
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
@@ -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());
     }
-}
+}
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
index c734b208e..7523831e7 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
@@ -4,6 +4,7 @@
  */
 package org.anjocaido.groupmanager.data;
 
+import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
 import java.util.ArrayList;
 import java.util.Map;
@@ -30,18 +31,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);
@@ -52,7 +53,7 @@ public class Group extends DataUnit implements Cloneable {
     /**
      * Use this to deliver a group from a different dataSource to another
      * @param dataSource
-     * @return
+     * @return Null or Clone
      */
     public Group clone(WorldDataHolder dataSource) {
         if (dataSource.groupExists(this.getName())) {
@@ -60,7 +61,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);
@@ -79,7 +80,7 @@ public class Group extends DataUnit implements Cloneable {
     }
 
     /**
-     * @param inherits the inherits to set
+     * @param inherit the inherits to set
      */
     public void addInherits(Group inherit) {
         if (!this.getDataSource().groupExists(inherit.getName())) {
@@ -89,6 +90,8 @@ public class Group extends DataUnit implements Cloneable {
             inherits.add(inherit.getName().toLowerCase());
         }
         flagAsChanged();
+        if (GroupManager.isLoaded)
+        	GroupManager.BukkitPermissions.updateAllPlayers();
     }
 
     public boolean removeInherits(String inherit) {
@@ -108,15 +111,17 @@ 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();
+        if (GroupManager.isLoaded)
+        	GroupManager.BukkitPermissions.updateAllPlayers();
     }
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java
index 87c34de2b..4775eac1f 100644..100755
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java
@@ -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) {
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
index ceecbfa21..e9bf79aa9 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
@@ -4,8 +4,10 @@
  */
 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.GroupManager;
 import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
 import java.util.Map;
 
@@ -27,13 +29,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 +46,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 +69,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();
@@ -103,6 +104,8 @@ public class User extends DataUnit implements Cloneable {
     public void setGroup(String group) {
         this.group = group;
         flagAsChanged();
+        if ((GroupManager.isLoaded) && (GroupManager.BukkitPermissions.player_join = false))
+        	GroupManager.BukkitPermissions.updateAllPlayers();
     }
 
     /**
@@ -115,45 +118,55 @@ public class User extends DataUnit implements Cloneable {
         group = getDataSource().getGroup(group.getName());
         this.group = group.getName();
         flagAsChanged();
+        if ((GroupManager.isLoaded) && (GroupManager.BukkitPermissions.player_join = false))
+        	GroupManager.BukkitPermissions.updateAllPlayers();
     }
 
-    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();
+        if ((GroupManager.isLoaded) && (GroupManager.BukkitPermissions.player_join = false))
+        	GroupManager.BukkitPermissions.updateAllPlayers();
     }
-    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();
+                if ((GroupManager.isLoaded) && (GroupManager.BukkitPermissions.player_join = false))
+                	GroupManager.BukkitPermissions.updateAllPlayers();
                 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 +174,8 @@ public class User extends DataUnit implements Cloneable {
         }
         return val;
     }
-    public ArrayList<String> subGroupListStringCopy(){
+
+    public ArrayList<String> subGroupListStringCopy() {
         return (ArrayList<String>) subGroups.clone();
     }
 
@@ -179,9 +193,11 @@ 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();
+        if ((GroupManager.isLoaded) && (GroupManager.BukkitPermissions.player_join = false))
+        	GroupManager.BukkitPermissions.updateAllPlayers();
     }
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java
index 45dfc31e7..3f3a6c374 100644..100755
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java
@@ -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;
     }
-
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
index 31ed0d795..547e6266d 100644..100755
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
@@ -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();
     }
 }