From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 18 Oct 2010 20:09:42 +0000 (+0200)
Subject: Insert known Sones, too.
X-Git-Tag: 0.1-RC1~212
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=d4c8c5492c2e3743a83d6f49993bcf5289353e0c;p=Sone.git

Insert known Sones, too.
---

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index cabf544..4197067 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -258,7 +258,7 @@ public class Core extends AbstractService {
 	 */
 	public void addLocalSone(Sone sone) {
 		if (localSones.add(sone)) {
-			SoneInserter soneInserter = new SoneInserter(freenetInterface, sone);
+			SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
 			soneInserter.start();
 			soneInserters.put(sone, soneInserter);
 		}
diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 259667b..ba6f437 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -20,12 +20,15 @@ package net.pterodactylus.sone.core;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.StringBucket;
+import net.pterodactylus.util.filter.Filter;
+import net.pterodactylus.util.filter.Filters;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
@@ -58,6 +61,9 @@ public class SoneInserter extends AbstractService {
 	/** The UTF-8 charset. */
 	private static final Charset utf8Charset = Charset.forName("UTF-8");
 
+	/** The core. */
+	private final Core core;
+
 	/** The Freenet interface. */
 	private final FreenetInterface freenetInterface;
 
@@ -67,13 +73,16 @@ public class SoneInserter extends AbstractService {
 	/**
 	 * Creates a new Sone inserter.
 	 *
+	 * @param core
+	 *            The core
 	 * @param freenetInterface
 	 *            The freenet interface
 	 * @param sone
 	 *            The Sone to insert
 	 */
-	public SoneInserter(FreenetInterface freenetInterface, Sone sone) {
+	public SoneInserter(Core core, FreenetInterface freenetInterface, Sone sone) {
 		super("Sone Inserter for “" + sone.getName() + "”");
+		this.core = core;
 		this.freenetInterface = freenetInterface;
 		this.sone = sone;
 	}
@@ -234,7 +243,19 @@ public class SoneInserter extends AbstractService {
 			} finally {
 				Closer.close(templateInputStreamReader);
 			}
+			Collection<Sone> knownSones = Filters.filteredCollection(core.getKnownSones(), new Filter<Sone>() {
+
+				/**
+				 * {@inheritDoc}
+				 */
+				@Override
+				public boolean filterObject(Sone object) {
+					return !sone.isSoneBlocked(object.getId()) && !object.equals(sone);
+				}
+			});
+
 			template.set("currentSone", sone);
+			template.set("knownSones", knownSones);
 			StringWriter writer = new StringWriter();
 			StringBucket bucket = null;
 			try {