Optimize sorting to speedup permission tests.

2 files changed, 12 insertions, 3 deletions

diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index 580d8bc88..d12f96cda 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -75,4 +75,5 @@ v 1.5:
 	- Fixed a crash on reload due to bukkit not unloading plugins before reloading.

 v 1.6:

 	- Prevent Group.equals tests throwing a NullPointerException for GlobalGroups.

-	- Stop throwing errors on an empty users file.
\ No newline at end of file
+	- Stop throwing errors on an empty users file.

+	- Optimize sorting to speedup permission tests.
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
index 924da3616..25546a0ea 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
@@ -18,7 +18,7 @@ public abstract class DataUnit {
 
     private WorldDataHolder dataSource;
     private String name;
-    private boolean changed;
+    private boolean changed, sorted = false;
     private ArrayList<String> permissions = new ArrayList<String>();
 
     public DataUnit(WorldDataHolder dataSource, String name) {
@@ -91,6 +91,7 @@ public abstract class DataUnit {
 // for(StackTraceElement st: Thread.currentThread().getStackTrace()){
 // GroupManager.logger.finest(st.toString());
 // }
+        sorted = false;
         changed = true;
     }
 
@@ -135,8 +136,15 @@ public abstract class DataUnit {
     public ArrayList<String> getPermissionList() {
         return new ArrayList<String>(permissions);
     }
+    
+    public boolean isSorted() {
+    	return this.sorted;
+    }
 
     public void sortPermissions() {
-        Collections.sort(permissions, StringPermissionComparator.getInstance());
+        if (!isSorted()) {
+        	Collections.sort(permissions, StringPermissionComparator.getInstance());
+        	sorted = true;
+        }
     }
 }
\ No newline at end of file