X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=8b2367be94fbe01ca919c215199e1f738f83b7a4;hb=1f6a99de95988a0299faff512ab457ae1172dc46;hp=b194bcb9038bee88e970c897145d1ba031b73eb5;hpb=9227e9192e2a593a8c5acbe26e3bcd0af4530adf;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 b194bcb..8b2367b 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -20,17 +20,26 @@ package net.pterodactylus.sone.data;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.UUID;
 
 import freenet.keys.FreenetURI;
 
 /**
  * A Sone defines everything about a user: the {@link User} itself, her profile,
  * her status updates.
+ * <p>
+ * Operations that modify the Sone need to synchronize on the Sone in question.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class Sone {
 
+	/** A GUID for this Sone. */
+	private final UUID id;
+
+	/** The name of this Sone. */
+	private final String name;
+
 	/** The URI under which the Sone is stored in Freenet. */
 	private final FreenetURI requestUri;
 
@@ -41,25 +50,38 @@ public class Sone {
 	/** All friend Sones. */
 	private final Set<Sone> friendSones = new HashSet<Sone>();
 
+	/** Modification count. */
+	private volatile long modificationCounter = 0;
+
 	/**
 	 * Creates a new Sone.
 	 *
+	 * @param id
+	 *            The ID of this Sone
+	 * @param name
+	 *            The name of the Sone
 	 * @param requestUri
 	 *            The request URI of the Sone
 	 */
-	public Sone(FreenetURI requestUri) {
-		this(requestUri, null);
+	public Sone(UUID id, String name, FreenetURI requestUri) {
+		this(id, name, requestUri, null);
 	}
 
 	/**
 	 * Creates a new Sone.
 	 *
+	 * @param id
+	 *            The ID of this Sone
+	 * @param name
+	 *            The name of the Sone
 	 * @param requestUri
 	 *            The request URI of the Sone
 	 * @param insertUri
 	 *            The insert URI of the Sone
 	 */
-	public Sone(FreenetURI requestUri, FreenetURI insertUri) {
+	public Sone(UUID id, String name, FreenetURI requestUri, FreenetURI insertUri) {
+		this.id = id;
+		this.name = name;
 		this.requestUri = requestUri;
 		this.insertUri = insertUri;
 	}
@@ -69,6 +91,24 @@ public class Sone {
 	//
 
 	/**
+	 * Returns the ID of this Sone.
+	 *
+	 * @return The ID of this Sone
+	 */
+	public String getId() {
+		return id.toString();
+	}
+
+	/**
+	 * Returns the name of this Sone.
+	 *
+	 * @return The name of this Sone
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
 	 * Returns the request URI of this Sone.
 	 *
 	 * @return The request URI of this Sone
@@ -114,8 +154,10 @@ public class Sone {
 	 *            The friend Sone to add
 	 * @return This Sone (for method chaining)
 	 */
-	public Sone addFriendSone(Sone friendSone) {
-		friendSones.add(friendSone);
+	public synchronized Sone addFriendSone(Sone friendSone) {
+		if (friendSones.add(friendSone)) {
+			modificationCounter++;
+		}
 		return this;
 	}
 
@@ -126,11 +168,32 @@ public class Sone {
 	 *            The friend Sone to remove
 	 * @return This Sone (for method chaining)
 	 */
-	public Sone removeFriendSone(Sone friendSone) {
-		friendSones.remove(friendSone);
+	public synchronized Sone removeFriendSone(Sone friendSone) {
+		if (friendSones.remove(friendSone)) {
+			modificationCounter++;
+		}
 		return this;
 	}
 
+	/**
+	 * Returns the modification counter.
+	 *
+	 * @return The modification counter
+	 */
+	public synchronized long getModificationCounter() {
+		return modificationCounter;
+	}
+
+	/**
+	 * Sets the modification counter.
+	 *
+	 * @param modificationCounter
+	 *            The new modification counter
+	 */
+	public synchronized void setModificationCounter(long modificationCounter) {
+		this.modificationCounter = modificationCounter;
+	}
+
 	//
 	// OBJECT METHODS
 	//
@@ -140,8 +203,18 @@ public class Sone {
 	 */
 	@Override
 	public int hashCode() {
-		/* TODO improve */
-		return requestUri.hashCode();
+		return id.hashCode();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof Sone)) {
+			return false;
+		}
+		return ((Sone) object).id.equals(id);
 	}
 
 }