X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=cc54697cf50f328552786affe42f0e1e53e1b332;hb=13b6e1517335f9e1bcf883ddd6f27fde95ce551b;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..cc54697 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -40,7 +40,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>() {
@@ -79,7 +79,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>());
@@ -173,7 +176,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 +204,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 +284,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
@@ -556,36 +580,17 @@ public class Sone {
 		return this;
 	}
 
+	//
+	// FINGERPRINTABLE METHODS
+	//
+
 	/**
-	 * 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.
-	 *
-	 * @return The fingerprint of this Sone
+	 * {@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 +626,18 @@ public class Sone {
 	}
 
 	//
+	// INTERFACE Comparable<Sone>
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public int compareTo(Sone sone) {
+		return NICE_NAME_COMPARATOR.compare(this, sone);
+	}
+
+	//
 	// OBJECT METHODS
 	//