X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=430973cf6064883f56a38f80f32df2bdffcdf7ac;hb=f740e30811efaa1f1a0e110218984e242755f897;hp=21ffd6f6d908f8886b435e1bd9520c6d204aa24a;hpb=44084738faad1c0c2609f332beef51feb148e66b;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 21ffd6f..430973c 100644
--- 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,7 +176,7 @@ 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)) {
@@ -172,7 +193,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,7 +205,7 @@ 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)) {
@@ -598,7 +619,7 @@ public class Sone {
 	 */
 	@Override
 	public int hashCode() {
-		return identity.getId().hashCode();
+		return id.hashCode();
 	}
 
 	/**
@@ -609,7 +630,7 @@ public class Sone {
 		if (!(object instanceof Sone)) {
 			return false;
 		}
-		return ((Sone) object).identity.getId().equals(identity.getId());
+		return ((Sone) object).id.equals(id);
 	}
 
 	/**