Don’t use the Sone’s ID but (maybe) also the Sone’s shell’s ID.

[Sone.git] / src / main / java / net / pterodactylus / sone / data / Sone.java

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index 3baed89..6d729c3 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -24,7 +24,10 @@ 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;
 
+import net.pterodactylus.util.logging.Logging;
 import freenet.keys.FreenetURI;
 
 /**
@@ -37,6 +40,9 @@ import freenet.keys.FreenetURI;
  */
 public class Sone {
 
+       /** The logger. */
+       private static final Logger logger = Logging.getLogger(Sone.class);
+
        /** A GUID for this Sone. */
        private final UUID id;
 
@@ -44,11 +50,11 @@ public class Sone {
        private final String name;
 
        /** The URI under which the Sone is stored in Freenet. */
-       private final FreenetURI requestUri;
+       private FreenetURI requestUri;
 
        /** The URI used to insert a new version of this Sone. */
        /* This will be null for remote Sones! */
-       private final FreenetURI insertUri;
+       private FreenetURI insertUri;
 
        /** The profile of this Sone. */
        private Profile profile;
@@ -167,7 +173,7 @@ public class Sone {
         *
         * @return The friend Sones of this Sone
         */
-       public Set<Sone> getFriendSones() {
+       public Set<Sone> getFriends() {
                return Collections.unmodifiableSet(friendSones);
        }
 
@@ -179,7 +185,7 @@ public class Sone {
         * @return {@code true} if this Sone has the given Sone as a friend,
         *         {@code false} otherwise
         */
-       public boolean hasFriendSone(Sone friendSone) {
+       public boolean hasFriend(Sone friendSone) {
                return friendSones.contains(friendSone);
        }
 
@@ -190,8 +196,8 @@ public class Sone {
         *            The friend Sone to add
         * @return This Sone (for method chaining)
         */
-       public synchronized Sone addFriendSone(Sone friendSone) {
-               if (friendSones.add(friendSone)) {
+       public synchronized Sone addFriend(Sone friendSone) {
+               if (!friendSone.equals(this) && friendSones.add(friendSone)) {
                        modificationCounter++;
                }
                return this;
@@ -204,7 +210,7 @@ public class Sone {
         *            The friend Sone to remove
         * @return This Sone (for method chaining)
         */
-       public synchronized Sone removeFriendSone(Sone friendSone) {
+       public synchronized Sone removeFriend(Sone friendSone) {
                if (friendSones.remove(friendSone)) {
                        modificationCounter++;
                }
@@ -238,6 +244,7 @@ public class Sone {
         */
        public synchronized void addPost(Post post) {
                if (post.getSone().equals(this) && posts.add(post)) {
+                       logger.log(Level.FINEST, "Adding %s to “%s”.", new Object[] { post, getName() });
                        modificationCounter++;
                }
        }
@@ -307,6 +314,19 @@ public class Sone {
                this.modificationCounter = modificationCounter;
        }
 
+       /**
+        * Updates the suggested edition in both the request URI and the insert URI.
+        *
+        * @param requestUri
+        *            The request URI that resulted from an insert
+        */
+       public void updateUris(FreenetURI requestUri) {
+               /* TODO - check for the correct URI. */
+               long latestEdition = requestUri.getSuggestedEdition();
+               this.requestUri = this.requestUri.setSuggestedEdition(latestEdition);
+               this.insertUri = this.insertUri.setSuggestedEdition(latestEdition);
+       }
+
        //
        // OBJECT METHODS
        //
@@ -316,7 +336,7 @@ public class Sone {
         */
        @Override
        public int hashCode() {
-               return id.hashCode();
+               return getId().hashCode();
        }
 
        /**
@@ -327,7 +347,15 @@ public class Sone {
                if (!(object instanceof Sone)) {
                        return false;
                }
-               return ((Sone) object).id.equals(id);
+               return ((Sone) object).id.equals(getId());
+       }
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       public String toString() {
+               return getClass().getName() + "[id=" + getId() + ",name=" + getName() + ",requestUri=" + getRequestUri() + ",insertUri=" + getInsertUri() + ",friends(" + friendSones.size() + "),posts(" + posts.size() + "),replies(" + replies.size() + ")]";
        }
 
 }