X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=4195484225b2719e08d32a209f5fe27ff7297a8e;hb=refs%2Ftags%2F0.2-RC3;hp=bc7e5f4623bdfdd20512a8680c8f0d3ccdda0109;hpb=e1ac2d9e820587574e3e039a984dd36dec7c6681;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 bc7e5f4..4195484 100644 --- a/src/main/java/net/pterodactylus/sone/data/Sone.java +++ b/src/main/java/net/pterodactylus/sone/data/Sone.java @@ -183,7 +183,6 @@ public class Sone { logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { requestUri, this.requestUri }); return this; } - setLatestEdition(requestUri.getEdition()); return this; } @@ -212,7 +211,6 @@ public class Sone { logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { insertUri, this.insertUri }); return this; } - setLatestEdition(insertUri.getEdition()); return this; } @@ -293,17 +291,7 @@ public class Sone { */ public List getFriends() { List friends = new ArrayList(friendSones); - Collections.sort(friends, new Comparator() { - - @Override - public int compare(Sone leftSone, Sone rightSone) { - int diff = SoneAccessor.getNiceName(leftSone).compareToIgnoreCase(SoneAccessor.getNiceName(rightSone)); - if (diff != 0) { - return diff; - } - return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightSone.getTime() - leftSone.getTime())); - } - }); + Collections.sort(friends, NICE_NAME_COMPARATOR); return friends; } @@ -364,15 +352,11 @@ public class Sone { * @return All posts of this Sone */ public List getPosts() { - List sortedPosts = new ArrayList(posts); - Collections.sort(sortedPosts, new Comparator() { - - @Override - public int compare(Post leftPost, Post rightPost) { - return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightPost.getTime() - leftPost.getTime())); - } - - }); + List sortedPosts; + synchronized (this) { + sortedPosts = new ArrayList(posts); + } + Collections.sort(sortedPosts, Post.TIME_COMPARATOR); return sortedPosts; } @@ -421,7 +405,7 @@ public class Sone { * * @return All replies this Sone made */ - public Set getReplies() { + public synchronized Set getReplies() { return Collections.unmodifiableSet(replies); }