Use Sone comparator.

[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 21ffd6f..145dca4 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -59,8 +59,11 @@ public class Sone {
        /** The logger. */
        private static final Logger logger = Logging.getLogger(Sone.class);
 
+       /** The ID of this Sone. */
+       private final String id;
+
        /** The identity of this Sone. */
-       private final Identity identity;
+       private Identity identity;
 
        /** The URI under which the Sone is stored in Freenet. */
        private volatile FreenetURI requestUri;
@@ -99,11 +102,11 @@ public class Sone {
        /**
         * Creates a new Sone.
         *
-        * @param identity
-        *            The identity of the Sone
+        * @param id
+        *            The ID of the Sone
         */
-       public Sone(Identity identity) {
-               this.identity = identity;
+       public Sone(String id) {
+               this.id = id;
        }
 
        //
@@ -116,7 +119,7 @@ public class Sone {
         * @return The identity of this Sone
         */
        public String getId() {
-               return identity.getId();
+               return id;
        }
 
        /**
@@ -129,12 +132,30 @@ public class Sone {
        }
 
        /**
+        * Sets the identity of this Sone. The {@link Identity#getId() ID} of the
+        * identity has to match this Sone’s {@link #getId()}.
+        *
+        * @param identity
+        *            The identity of this Sone
+        * @return This Sone (for method chaining)
+        * @throws IllegalArgumentException
+        *             if the ID of the identity does not match this Sone’s ID
+        */
+       public Sone setIdentity(Identity identity) throws IllegalArgumentException {
+               if (!identity.getId().equals(id)) {
+                       throw new IllegalArgumentException("Identity’s ID does not match Sone’s ID!");
+               }
+               this.identity = identity;
+               return this;
+       }
+
+       /**
         * Returns the name of this Sone.
         *
         * @return The name of this Sone
         */
        public String getName() {
-               return identity.getNickname();
+               return (identity != null) ? identity.getNickname() : null;
        }
 
        /**
@@ -155,14 +176,13 @@ public class Sone {
         */
        public Sone setRequestUri(FreenetURI requestUri) {
                if (this.requestUri == null) {
-                       this.requestUri = requestUri;
+                       this.requestUri = requestUri.setDocName("Sone").setMetaString(new String[0]);
                        return this;
                }
                if (!this.requestUri.equalsKeypair(requestUri)) {
                        logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { requestUri, this.requestUri });
                        return this;
                }
-               setLatestEdition(requestUri.getEdition());
                return this;
        }
 
@@ -172,7 +192,7 @@ public class Sone {
         * @return The insert URI of this Sone
         */
        public FreenetURI getInsertUri() {
-               return insertUri.setSuggestedEdition(latestEdition);
+               return (insertUri != null) ? insertUri.setSuggestedEdition(latestEdition) : null;
        }
 
        /**
@@ -184,14 +204,13 @@ public class Sone {
         */
        public Sone setInsertUri(FreenetURI insertUri) {
                if (this.insertUri == null) {
-                       this.insertUri = insertUri;
+                       this.insertUri = insertUri.setDocName("Sone").setMetaString(new String[0]);
                        return this;
                }
                if (!this.insertUri.equalsKeypair(insertUri)) {
                        logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { insertUri, this.insertUri });
                        return this;
                }
-               setLatestEdition(insertUri.getEdition());
                return this;
        }
 
@@ -272,17 +291,7 @@ public class Sone {
         */
        public List<Sone> getFriends() {
                List<Sone> friends = new ArrayList<Sone>(friendSones);
-               Collections.sort(friends, new Comparator<Sone>() {
-
-                       @Override
-                       public int compare(Sone leftSone, Sone rightSone) {
-                               int diff = SoneAccessor.getNiceName(leftSone).compareToIgnoreCase(SoneAccessor.getNiceName(rightSone));
-                               if (diff != 0) {
-                                       return diff;
-                               }
-                               return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightSone.getTime() - leftSone.getTime()));
-                       }
-               });
+               Collections.sort(friends, NICE_NAME_COMPARATOR);
                return friends;
        }
 
@@ -343,15 +352,11 @@ public class Sone {
         * @return All posts of this Sone
         */
        public List<Post> getPosts() {
-               List<Post> sortedPosts = new ArrayList<Post>(posts);
-               Collections.sort(sortedPosts, new Comparator<Post>() {
-
-                       @Override
-                       public int compare(Post leftPost, Post rightPost) {
-                               return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightPost.getTime() - leftPost.getTime()));
-                       }
-
-               });
+               List<Post> sortedPosts;
+               synchronized (this) {
+                       sortedPosts = new ArrayList<Post>(posts);
+               }
+               Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
                return sortedPosts;
        }
 
@@ -401,7 +406,6 @@ public class Sone {
         * @return All replies this Sone made
         */
        public Set<Reply> getReplies() {
-               logger.log(Level.FINEST, "Friends of %s: %s", new Object[] { this, friendSones });
                return Collections.unmodifiableSet(replies);
        }
 
@@ -598,7 +602,7 @@ public class Sone {
         */
        @Override
        public int hashCode() {
-               return identity.getId().hashCode();
+               return id.hashCode();
        }
 
        /**
@@ -609,7 +613,7 @@ public class Sone {
                if (!(object instanceof Sone)) {
                        return false;
                }
-               return ((Sone) object).identity.getId().equals(identity.getId());
+               return ((Sone) object).id.equals(id);
        }
 
        /**