X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=3923f667d2e2b1ebebf987488d3cbf2cef271a82;hb=a88e930a23b550dae75116d7759924d760941776;hp=63cdbcb81c8b10098e0655241f25eb3b91a07909;hpb=4314a29fdeb9766e198b7144a9724422d0df84dc;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 63cdbcb..3923f66 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 @@
 /*
- * Sone - Sone.java - Copyright © 2010 David Roden
+ * Sone - Sone.java - Copyright © 2010–2012 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
@@ -33,7 +33,7 @@ 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.collection.filter.Filter;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.validation.Validation;
 import freenet.keys.FreenetURI;
@@ -175,6 +175,9 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	/** The ID of this Sone. */
 	private final String id;
 
+	/** Whether the Sone is local. */
+	private final boolean local;
+
 	/** The identity of this Sone. */
 	private Identity identity;
 
@@ -200,6 +203,9 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	/** The client used by the Sone. */
 	private volatile Client client;
 
+	/** Whether this Sone is known. */
+	private volatile boolean known;
+
 	/** All friend Sones. */
 	private final Set<String> friendSones = new CopyOnWriteArraySet<String>();
 
@@ -226,9 +232,13 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	 *
 	 * @param id
 	 *            The ID of the Sone
+	 * @param local
+	 *            {@code true} if the Sone is a local Sone, {@code false}
+	 *            otherwise
 	 */
-	public Sone(String id) {
+	public Sone(String id, boolean local) {
 		this.id = id;
+		this.local = local;
 	}
 
 	//
@@ -281,6 +291,16 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	}
 
 	/**
+	 * Returns whether this Sone is a local Sone.
+	 *
+	 * @return {@code true} if this Sone is a local Sone, {@code false}
+	 *         otherwise
+	 */
+	public boolean isLocal() {
+		return local;
+	}
+
+	/**
 	 * Returns the request URI of this Sone.
 	 *
 	 * @return The request URI of this Sone
@@ -302,7 +322,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 			return this;
 		}
 		if (!this.requestUri.equalsKeypair(requestUri)) {
-			logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { requestUri, this.requestUri });
+			logger.log(Level.WARNING, String.format("Request URI %s tried to overwrite %s!", requestUri, this.requestUri));
 			return this;
 		}
 		return this;
@@ -330,7 +350,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 			return this;
 		}
 		if (!this.insertUri.equalsKeypair(insertUri)) {
-			logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { insertUri, this.insertUri });
+			logger.log(Level.WARNING, String.format("Request URI %s tried to overwrite %s!", insertUri, this.insertUri));
 			return this;
 		}
 		return this;
@@ -355,7 +375,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	 */
 	public void setLatestEdition(long latestEdition) {
 		if (!(latestEdition > this.latestEdition)) {
-			logger.log(Level.FINE, "New latest edition %d is not greater than current latest edition %d!", new Object[] { latestEdition, this.latestEdition });
+			logger.log(Level.FINE, String.format("New latest edition %d is not greater than current latest edition %d!", latestEdition, this.latestEdition));
 			return;
 		}
 		this.latestEdition = latestEdition;
@@ -451,6 +471,27 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	}
 
 	/**
+	 * Returns whether this Sone is known.
+	 *
+	 * @return {@code true} if this Sone is known, {@code false} otherwise
+	 */
+	public boolean isKnown() {
+		return known;
+	}
+
+	/**
+	 * Sets whether this Sone is known.
+	 *
+	 * @param known
+	 *            {@code true} if this Sone is known, {@code false} otherwise
+	 * @return This Sone
+	 */
+	public Sone setKnown(boolean known) {
+		this.known = known;
+		return this;
+	}
+
+	/**
 	 * Returns all friend Sones of this Sone.
 	 *
 	 * @return The friend Sones of this Sone
@@ -536,7 +577,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	 */
 	public void addPost(Post post) {
 		if (post.getSone().equals(this) && posts.add(post)) {
-			logger.log(Level.FINEST, "Adding %s to “%s”.", new Object[] { post, getName() });
+			logger.log(Level.FINEST, String.format("Adding %s to “%s”.", post, getName()));
 		}
 	}
 
@@ -767,7 +808,9 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	 */
 	public void addAlbum(Album album) {
 		Validation.begin().isNotNull("Album", album).check().isEqual("Album Owner", album.getSone(), this).check();
-		albums.add(album);
+		if (!albums.contains(album)) {
+			albums.add(album);
+		}
 	}
 
 	/**