X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=e1c039174d464f0877b8109c7abaed4094ebd8eb;hb=47ed7eaf00c35889781831d33d04e9f91c9ad266;hp=7fd5fa6e9582af2c0b59a9004b461aef73d77b4a;hpb=4f686e5c5ddcf94ffdf074b953493c148fb2ab32;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 7fd5fa6..e1c0391 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -1,5 +1,5 @@
 /*
- * FreenetSone - Sone.java - Copyright © 2010 David Roden
+ * Sone - Sone.java - Copyright © 2010 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,8 +27,12 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.core.Options;
 import net.pterodactylus.sone.freenet.wot.Identity;
+import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.sone.template.SoneAccessor;
+import net.pterodactylus.util.filter.Filter;
 import net.pterodactylus.util.logging.Logging;
 import freenet.keys.FreenetURI;
 
@@ -40,7 +44,7 @@ import freenet.keys.FreenetURI;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Sone {
+public class Sone implements Fingerprintable, Comparable<Sone> {
 
 	/** comparator that sorts Sones by their nice name. */
 	public static final Comparator<Sone> NICE_NAME_COMPARATOR = new Comparator<Sone>() {
@@ -56,6 +60,25 @@ public class Sone {
 
 	};
 
+	/** Filter to remove Sones that have not been downloaded. */
+	public static final Filter<Sone> EMPTY_SONE_FILTER = new Filter<Sone>() {
+
+		@Override
+		public boolean filterObject(Sone sone) {
+			return sone.getTime() != 0;
+		}
+	};
+
+	/** Filter that matches all {@link Core#isLocalSone(Sone) local Sones}. */
+	public static final Filter<Sone> LOCAL_SONE_FILTER = new Filter<Sone>() {
+
+		@Override
+		public boolean filterObject(Sone sone) {
+			return sone.getIdentity() instanceof OwnIdentity;
+		}
+
+	};
+
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(Sone.class);
 
@@ -79,7 +102,10 @@ public class Sone {
 	private volatile long time;
 
 	/** The profile of this Sone. */
-	private volatile Profile profile;
+	private volatile Profile profile = new Profile();
+
+	/** The client used by the Sone. */
+	private volatile Client client;
 
 	/** All friend Sones. */
 	private final Set<String> friendSones = Collections.synchronizedSet(new HashSet<String>());
@@ -96,6 +122,9 @@ public class Sone {
 	/** The IDs of all liked replies. */
 	private final Set<String> likedReplyIds = Collections.synchronizedSet(new HashSet<String>());
 
+	/** Sone-specific options. */
+	private final Options options = new Options();
+
 	/**
 	 * Creates a new Sone.
 	 *
@@ -173,7 +202,7 @@ public class Sone {
 	 */
 	public Sone setRequestUri(FreenetURI requestUri) {
 		if (this.requestUri == null) {
-			this.requestUri = requestUri.setDocName("Sone").setMetaString(new String[0]);
+			this.requestUri = requestUri.setKeyType("USK").setDocName("Sone").setMetaString(new String[0]);
 			return this;
 		}
 		if (!this.requestUri.equalsKeypair(requestUri)) {
@@ -201,7 +230,7 @@ public class Sone {
 	 */
 	public Sone setInsertUri(FreenetURI insertUri) {
 		if (this.insertUri == null) {
-			this.insertUri = insertUri.setDocName("Sone").setMetaString(new String[0]);
+			this.insertUri = insertUri.setKeyType("USK").setDocName("Sone").setMetaString(new String[0]);
 			return this;
 		}
 		if (!this.insertUri.equalsKeypair(insertUri)) {
@@ -281,6 +310,27 @@ public class Sone {
 	}
 
 	/**
+	 * Returns the client used by this Sone.
+	 *
+	 * @return The client used by this Sone, or {@code null}
+	 */
+	public Client getClient() {
+		return client;
+	}
+
+	/**
+	 * Sets the client used by this Sone.
+	 *
+	 * @param client
+	 *            The client used by this Sone, or {@code null}
+	 * @return This Sone (for method chaining)
+	 */
+	public Sone setClient(Client client) {
+		this.client = client;
+		return this;
+	}
+
+	/**
 	 * Returns all friend Sones of this Sone.
 	 *
 	 * @return The friend Sones of this Sone
@@ -363,8 +413,10 @@ public class Sone {
 	 * @return This Sone (for method chaining)
 	 */
 	public synchronized Sone setPosts(Collection<Post> posts) {
-		this.posts.clear();
-		this.posts.addAll(posts);
+		synchronized (this) {
+			this.posts.clear();
+			this.posts.addAll(posts);
+		}
 		return this;
 	}
 
@@ -557,35 +609,25 @@ public class Sone {
 	}
 
 	/**
-	 * Returns a fingerprint of this Sone. The fingerprint only depends on data
-	 * that is actually stored when a Sone is inserted. The fingerprint can be
-	 * used to detect changes in Sone data and can also be used to detect if
-	 * previous changes are reverted.
+	 * Returns Sone-specific options.
 	 *
-	 * @return The fingerprint of this Sone
+	 * @return The options of this Sone
 	 */
+	public Options getOptions() {
+		return options;
+	}
+
+	//
+	// FINGERPRINTABLE METHODS
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
 	public synchronized String getFingerprint() {
 		StringBuilder fingerprint = new StringBuilder();
-		fingerprint.append("Profile(");
-		if (profile.getFirstName() != null) {
-			fingerprint.append("FirstName(").append(profile.getFirstName()).append(')');
-		}
-		if (profile.getMiddleName() != null) {
-			fingerprint.append("MiddleName(").append(profile.getMiddleName()).append(')');
-		}
-		if (profile.getLastName() != null) {
-			fingerprint.append("LastName(").append(profile.getLastName()).append(')');
-		}
-		if (profile.getBirthDay() != null) {
-			fingerprint.append("BirthDay(").append(profile.getBirthDay()).append(')');
-		}
-		if (profile.getBirthMonth() != null) {
-			fingerprint.append("BirthMonth(").append(profile.getBirthMonth()).append(')');
-		}
-		if (profile.getBirthYear() != null) {
-			fingerprint.append("BirthYear(").append(profile.getBirthYear()).append(')');
-		}
-		fingerprint.append(")");
+		fingerprint.append(profile.getFingerprint());
 
 		fingerprint.append("Posts(");
 		for (Post post : getPosts()) {
@@ -621,6 +663,18 @@ public class Sone {
 	}
 
 	//
+	// INTERFACE Comparable<Sone>
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public int compareTo(Sone sone) {
+		return NICE_NAME_COMPARATOR.compare(this, sone);
+	}
+
+	//
 	// OBJECT METHODS
 	//