X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=5613828d870ff2d0eaad2f8583c06362c1adae63;hb=0d4c0d1807ed83cbed7fd11fde34944be2864908;hp=f6d5181ad8e4fbdea63ffd5b4cd3fb92fb876f93;hpb=544c75a3b539a2948d08f688e7c367baa3dac28b;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 f6d5181..5613828 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -24,7 +24,6 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -45,42 +44,42 @@ public class Sone {
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(Sone.class);
 
-	/** A GUID for this Sone. */
-	private final UUID id;
+	/** The ID of this Sone. */
+	private final String id;
 
 	/** The name of this Sone. */
-	private String name;
+	private volatile String name;
 
 	/** The URI under which the Sone is stored in Freenet. */
-	private FreenetURI requestUri;
+	private volatile FreenetURI requestUri;
 
 	/** The URI used to insert a new version of this Sone. */
 	/* This will be null for remote Sones! */
-	private FreenetURI insertUri;
+	private volatile FreenetURI insertUri;
 
 	/** The time of the last inserted update. */
-	private long time;
+	private volatile long time;
 
 	/** The profile of this Sone. */
-	private Profile profile;
+	private volatile Profile profile;
 
 	/** All friend Sones. */
-	private final Set<Sone> friendSones = new HashSet<Sone>();
+	private final Set<Sone> friendSones = Collections.synchronizedSet(new HashSet<Sone>());
 
 	/** All posts. */
-	private final Set<Post> posts = new HashSet<Post>();
+	private final Set<Post> posts = Collections.synchronizedSet(new HashSet<Post>());
 
 	/** All replies. */
-	private final Set<Reply> replies = new HashSet<Reply>();
+	private final Set<Reply> replies = Collections.synchronizedSet(new HashSet<Reply>());
 
 	/** The IDs of all blocked Sones. */
-	private final Set<String> blockedSoneIds = new HashSet<String>();
+	private final Set<String> blockedSoneIds = Collections.synchronizedSet(new HashSet<String>());
 
 	/** The IDs of all liked posts. */
-	private final Set<String> likedPostIds = new HashSet<String>();
+	private final Set<String> likedPostIds = Collections.synchronizedSet(new HashSet<String>());
 
 	/** The IDs of all liked replies. */
-	private final Set<String> likedReplyIds = new HashSet<String>();
+	private final Set<String> likedReplyIds = Collections.synchronizedSet(new HashSet<String>());
 
 	/** Modification count. */
 	private volatile long modificationCounter = 0;
@@ -92,7 +91,7 @@ public class Sone {
 	 *            The ID of this Sone
 	 */
 	public Sone(String id) {
-		this.id = UUID.fromString(id);
+		this.id = id;
 	}
 
 	//
@@ -105,7 +104,7 @@ public class Sone {
 	 * @return The ID of this Sone
 	 */
 	public String getId() {
-		return id.toString();
+		return id;
 	}
 
 	/**