X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=dbe1b359938ab9a84612d76a80ce4381ed0f5b61;hb=8d298562a71682e0bbcdc311e741e00f85490a7d;hp=7c96443358b47660b1fd0423d13957474d77a804;hpb=d20339ba3ce709ac5c342e1511021aaa392376ee;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 7c96443..dbe1b35 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -17,20 +17,31 @@
package net.pterodactylus.sone.data;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
+import java.util.List;
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.
+ *
+ * Operations that modify the Sone need to synchronize on the Sone in question.
*
* @author David âBombeâ Roden
*/
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;
@@ -38,28 +49,47 @@ public class Sone {
/* This will be null for remote Sones! */
private final FreenetURI insertUri;
+ /** The profile of this Sone. */
+ private Profile profile;
+
/** All friend Sones. */
private final Set friendSones = new HashSet();
+ /** All posts. */
+ private final List posts = new ArrayList();
+
+ /** 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,11 +99,29 @@ 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
*/
- public FreenetURI requestUri() {
+ public FreenetURI getRequestUri() {
return requestUri;
}
@@ -82,11 +130,35 @@ public class Sone {
*
* @return The insert URI of this Sone
*/
- public FreenetURI insertUri() {
+ public FreenetURI getInsertUri() {
return insertUri;
}
/**
+ * Returns a copy of the profile. If you want to update values in the
+ * profile of this Sone, update the values in the returned {@link Profile}
+ * and use {@link #setProfile(Profile)} to change the profile in this Sone.
+ *
+ * @return A copy of the profile
+ */
+ public Profile getProfile() {
+ return new Profile(profile);
+ }
+
+ /**
+ * Sets the profile of this Sone. A copy of the given profile is stored so
+ * that subsequent modifications of the given profile are not reflected in
+ * this Sone!
+ *
+ * @param profile
+ * The profile to set
+ */
+ public synchronized void setProfile(Profile profile) {
+ this.profile = new Profile(profile);
+ modificationCounter++;
+ }
+
+ /**
* Returns all friend Sones of this Sone.
*
* @return The friend Sones of this Sone
@@ -114,8 +186,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 +200,66 @@ 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 list of posts of this Sone.
+ *
+ * @return All posts of this Sone
+ */
+ public List getPosts() {
+ return Collections.unmodifiableList(posts);
+ }
+
+ /**
+ * Adds the given post to this Sone. The post will not be added if its
+ * {@link Post#getSone() Sone} is not this Sone.
+ *
+ * @param post
+ * The post to add
+ */
+ public synchronized void addPost(Post post) {
+ if (post.getSone().equals(this) && posts.add(post)) {
+ modificationCounter++;
+ }
+ }
+
+ /**
+ * Removes the given post from this Sone.
+ *
+ * @param post
+ * The post to remove
+ */
+ public synchronized void removePost(Post post) {
+ if (post.getSone().equals(this) && posts.remove(post)) {
+ modificationCounter++;
+ }
+ }
+
+ /**
+ * 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 +269,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);
}
}