X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=b38f8be5339677ef4534f8063ae72335d039d6fa;hb=046f9eb545bb5b18fd7229c0325832be11148ecc;hp=9d594072b600c1d7f6873f9f38eb4a8473361642;hpb=4d23b48e1e973d3fab7fdad7c0aeda5557a9a03f;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index 9d59407..b38f8be 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;
 	}
 
 	/**
@@ -225,10 +238,9 @@ public class Sone {
 	 *            The new (and only) friends of this Sone
 	 * @return This Sone (for method chaining)
 	 */
-	public synchronized Sone setFriends(Collection<Sone> friends) {
+	public Sone setFriends(Collection<Sone> friends) {
 		friendSones.clear();
 		friendSones.addAll(friends);
-		modificationCounter++;
 		return this;
 	}
 
@@ -251,9 +263,9 @@ public class Sone {
 	 *            The friend Sone to add
 	 * @return This Sone (for method chaining)
 	 */
-	public synchronized Sone addFriend(Sone friendSone) {
-		if (!friendSone.equals(this) && friendSones.add(friendSone)) {
-			modificationCounter++;
+	public Sone addFriend(Sone friendSone) {
+		if (!friendSone.equals(this)) {
+			friendSones.add(friendSone);
 		}
 		return this;
 	}
@@ -265,10 +277,8 @@ public class Sone {
 	 *            The friend Sone to remove
 	 * @return This Sone (for method chaining)
 	 */
-	public synchronized Sone removeFriend(Sone friendSone) {
-		if (friendSones.remove(friendSone)) {
-			modificationCounter++;
-		}
+	public Sone removeFriend(Sone friendSone) {
+		friendSones.remove(friendSone);
 		return this;
 	}
 
@@ -407,8 +417,10 @@ public class Sone {
 	 * @param soneId
 	 *            The Sone ID to block
 	 */
-	public void addBlockedSoneId(String soneId) {
-		blockedSoneIds.add(soneId);
+	public synchronized void addBlockedSoneId(String soneId) {
+		if (blockedSoneIds.add(soneId)) {
+			modificationCounter++;
+		}
 	}
 
 	/**
@@ -417,8 +429,10 @@ public class Sone {
 	 * @param soneId
 	 *            The Sone ID to unblock
 	 */
-	public void removeBlockedSoneId(String soneId) {
-		blockedSoneIds.remove(soneId);
+	public synchronized void removeBlockedSoneId(String soneId) {
+		if (blockedSoneIds.remove(soneId)) {
+			modificationCounter++;
+		}
 	}
 
 	/**