Merge remote branch 'remotes/ess/groupmanager' into essmaster

3 files changed, 5 insertions, 5 deletions

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
index f17d8b21e..7b027a94d 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
@@ -102,7 +102,7 @@ public abstract class DataUnit {
      * @return a copy of the permission list
      */
     public ArrayList<String> getPermissionList() {
-        return (ArrayList<String>) permissions.clone();
+        return new ArrayList<String>(permissions);
     }
 
     public void sortPermissions() {
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
index c881fc95d..84d4fceed 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java
@@ -41,7 +41,7 @@ public class Group extends DataUnit implements Cloneable {
     @Override
     public Group clone() {
         Group clone = new Group(getDataSource(), this.getName());
-        clone.inherits = ((ArrayList<String>) this.getInherits().clone());
+        clone.inherits = new ArrayList<String>(this.getInherits());
         for (String perm : this.getPermissionList()) {
             clone.addPermission(perm);
         }
@@ -60,7 +60,7 @@ public class Group extends DataUnit implements Cloneable {
             return null;
         }
         Group clone = getDataSource().createGroup(this.getName());
-        clone.inherits = ((ArrayList<String>) this.getInherits().clone());
+        clone.inherits = new ArrayList<String>(this.getInherits());
         for (String perm : this.getPermissionList()) {
             clone.addPermission(perm);
         }
@@ -76,7 +76,7 @@ public class Group extends DataUnit implements Cloneable {
      * @return the inherits
      */
     public ArrayList<String> getInherits() {
-        return (ArrayList<String>) inherits.clone();
+        return new ArrayList<String>(inherits);
     }
 
     /**
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
index a95018fa9..8a0e6cdbb 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java
@@ -183,7 +183,7 @@ public class User extends DataUnit implements Cloneable {
     }
 
     public ArrayList<String> subGroupListStringCopy() {
-        return (ArrayList<String>) subGroups.clone();
+        return new ArrayList<String>(subGroups);
     }
 
     /**