X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FSoneImpl.java;h=44111aad0748f7282c70500db955528196c1c5ae;hb=f5c7590a5a340597f8127440a20058f65ed0abd1;hp=eccce4b0193a8b2cc7ce0312fd2e3aaf1aabeb64;hpb=f333f58180a7f112394cd768d86c95a3c9edf794;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java b/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java index eccce4b..44111aa 100644 --- a/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java +++ b/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java @@ -47,6 +47,7 @@ import net.pterodactylus.sone.freenet.wot.OwnIdentity; import freenet.keys.FreenetURI; +import com.google.common.collect.FluentIterable; import com.google.common.hash.Hasher; import com.google.common.hash.Hashing; @@ -87,7 +88,7 @@ public class SoneImpl implements LocalSone { private volatile Profile profile = new Profile(this); /** The client used by the Sone. */ - private volatile Client client; + private final Client client; /** Whether this Sone is known. */ private volatile boolean known; @@ -119,12 +120,13 @@ public class SoneImpl implements LocalSone { * @param local * {@code true} if the Sone is a local Sone, {@code false} otherwise */ - public SoneImpl(Database database, Identity identity, boolean local, long time) { + public SoneImpl(Database database, Identity identity, boolean local, long time, Client client) { this.database = database; this.id = identity.getId(); this.identity = identity; this.local = local; this.time = time; + this.client = client; } // @@ -302,7 +304,6 @@ public class SoneImpl implements LocalSone { * @return This Sone (for method chaining) */ public Sone setClient(Client client) { - this.client = client; return this; } @@ -354,12 +355,9 @@ public class SoneImpl implements LocalSone { * @return All posts of this Sone */ public List getPosts() { - List sortedPosts; synchronized (this) { - sortedPosts = new ArrayList(posts); + return FluentIterable.from(posts).toSortedList(Post.TIME_COMPARATOR); } - Collections.sort(sortedPosts, Post.TIME_COMPARATOR); - return sortedPosts; } /**