From 25646b55bfde18b148ca27e56d7e7a949943f2cc Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Tue, 25 Sep 2012 13:23:19 +0100
Subject: Add alphabetically sorted user lists.

---
 EssentialsGroupManager/src/Changelog.txt                   |  3 ++-
 .../anjocaido/groupmanager/dataholder/WorldDataHolder.java | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'EssentialsGroupManager/src')

diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index a877078d8..0c9b13a47 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -199,4 +199,5 @@ v 2.0:
 	- Include the GM version when logging errors.
 	- Fix Synchronization on adding subgroups (thanks snowleo).
 	- Remove info node support from GlobalGroups. It should not have them as GlobalGroups are only permission collections.
-	- Change order of data in Users.yml to [name, Group, SubGroup, Permissions, Info nodes].
\ No newline at end of file
+	- Change order of data in Users.yml to [name, Group, SubGroup, Permissions, Info nodes].
+	- Add alphabetically sorted user lists.
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
index 9790efa2a..30a7e19e4 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
@@ -15,8 +15,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.anjocaido.groupmanager.GroupManager;
@@ -1018,17 +1020,21 @@ public class WorldDataHolder {
 	public static void writeUsers(WorldDataHolder ph, File usersFile) {
 
 		Map<String, Object> root = new HashMap<String, Object>();
-
-		Map<String, Object> usersMap = new HashMap<String, Object>();
+		LinkedHashMap<String, Object> usersMap = new LinkedHashMap<String, Object>();
+		
 		root.put("users", usersMap);
 		synchronized (ph.getUsers()) {
-			for (String userKey : ph.getUsers().keySet()) {
+			
+			// A sorted list of users.
+			ArrayList<String> names = new ArrayList<String>(new TreeSet<String>(ph.getUsers().keySet()));
+			
+			for (String userKey : names) {
 				User user = ph.getUsers().get(userKey);
 				if ((user.getGroup() == null || user.getGroup().equals(ph.getDefaultGroup())) && user.getPermissionList().isEmpty() && user.getVariables().isEmpty() && user.isSubGroupsEmpty()) {
 					continue;
 				}
 
-				Map<String, Object> aUserMap = new HashMap<String, Object>();
+				LinkedHashMap<String, Object> aUserMap = new LinkedHashMap<String, Object>();
 				usersMap.put(user.getName(), aUserMap);
 
 				// GROUP NODE
-- 
cgit v1.2.3