From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 21 Oct 2010 18:03:18 +0000 (+0200)
Subject: Return friends sorted by name.
X-Git-Tag: 0.1-RC1~110
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=a4cd99055d3814bc087efb8fa77ae861dff4e0fd

Return friends sorted by name.
---

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index 3e808a8..bd24166 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -28,6 +28,7 @@ import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.template.SoneAccessor;
 import net.pterodactylus.util.logging.Logging;
 import freenet.keys.FreenetURI;
 
@@ -214,8 +215,20 @@ public class Sone {
 	 *
 	 * @return The friend Sones of this Sone
 	 */
-	public Set<Sone> getFriends() {
-		return Collections.unmodifiableSet(friendSones);
+	public List<Sone> getFriends() {
+		List<Sone> friends = new ArrayList<Sone>(friendSones);
+		Collections.sort(friends, new Comparator<Sone>() {
+
+			@Override
+			public int compare(Sone leftSone, Sone rightSone) {
+				int diff = SoneAccessor.getNiceName(leftSone).compareTo(SoneAccessor.getNiceName(rightSone));
+				if (diff != 0) {
+					return diff;
+				}
+				return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightSone.getTime() - leftSone.getTime()));
+			}
+		});
+		return friends;
 	}
 
 	/**