X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=c62a06f1bbce722455cc3389e625e701cf91d18c;hb=455d843a2d2c785a317085e085d4265988b3c0da;hp=6f32230b30153a1bbf07d6666fcb3d611b82354f;hpb=5d8f3ac133544177412ec3c533e5f5f92a7b1c35;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 6f32230..c62a06f 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -35,6 +35,13 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.core.Options.DefaultOption;
 import net.pterodactylus.sone.core.Options.Option;
 import net.pterodactylus.sone.core.Options.OptionWatcher;
+import net.pterodactylus.sone.core.event.MarkPostKnownEvent;
+import net.pterodactylus.sone.core.event.MarkPostReplyKnownEvent;
+import net.pterodactylus.sone.core.event.MarkSoneKnownEvent;
+import net.pterodactylus.sone.core.event.NewPostFoundEvent;
+import net.pterodactylus.sone.core.event.NewPostReplyFoundEvent;
+import net.pterodactylus.sone.core.event.NewSoneFoundEvent;
+import net.pterodactylus.sone.core.event.SoneRemovedEvent;
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Image;
@@ -70,6 +77,7 @@ import net.pterodactylus.util.version.Version;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
+import com.google.common.eventbus.EventBus;
 import com.google.inject.Inject;
 
 import freenet.keys.FreenetURI;
@@ -96,6 +104,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	/** The core listener manager. */
 	private final CoreListenerManager coreListenerManager = new CoreListenerManager(this);
 
+	/** The event bus. */
+	private final EventBus eventBus;
+
 	/** The configuration. */
 	private Configuration configuration;
 
@@ -193,9 +204,11 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 *            The identity manager
 	 * @param webOfTrustUpdater
 	 *            The WebOfTrust updater
+	 * @param eventBus
+	 *            The event bus
 	 */
 	@Inject
-	public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, WebOfTrustUpdater webOfTrustUpdater) {
+	public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus) {
 		super("Sone Core");
 		this.configuration = configuration;
 		this.freenetInterface = freenetInterface;
@@ -204,6 +217,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		this.imageInserter = new ImageInserter(this, freenetInterface);
 		this.updateChecker = new UpdateChecker(freenetInterface);
 		this.webOfTrustUpdater = webOfTrustUpdater;
+		this.eventBus = eventBus;
 	}
 
 	//
@@ -419,7 +433,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 				sone = new Sone(id, true);
 				sones.put(id, sone);
 			}
-			if (!sone.isLocal()) {
+			if ((sone != null) && !sone.isLocal()) {
 				sone = new Sone(id, true);
 				sones.put(id, sone);
 			}
@@ -885,7 +899,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 				}
 				sone.setKnown(!newSone);
 				if (newSone) {
-					coreListenerManager.fireNewSoneFound(sone);
+					eventBus.post(new NewSoneFoundEvent(sone));
 					for (Sone localSone : getLocalSones()) {
 						if (localSone.getOptions().getBooleanOption("AutoFollow").get()) {
 							followSone(localSone, sone);
@@ -1106,7 +1120,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 								knownPosts.add(post.getId());
 								post.setKnown(true);
 							} else if (!knownPosts.contains(post.getId())) {
-								coreListenerManager.fireNewPostFound(post);
+								eventBus.post(new NewPostFoundEvent(post));
 							}
 						}
 						posts.put(post.getId(), post);
@@ -1131,7 +1145,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 								knownReplies.add(reply.getId());
 								reply.setKnown(true);
 							} else if (!knownReplies.contains(reply.getId())) {
-								coreListenerManager.fireNewReplyFound(reply);
+								eventBus.post(new NewPostReplyFoundEvent(reply));
 							}
 						}
 						replies.put(reply.getId(), reply);
@@ -1222,7 +1236,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 
 	/**
 	 * Marks the given Sone as known. If the Sone was not {@link Post#isKnown()
-	 * known} before, a {@link CoreListener#markSoneKnown(Sone)} event is fired.
+	 * known} before, a {@link MarkSoneKnownEvent} is fired.
 	 *
 	 * @param sone
 	 *            The Sone to mark as known
@@ -1233,7 +1247,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			synchronized (knownSones) {
 				knownSones.add(sone.getId());
 			}
-			coreListenerManager.fireMarkSoneKnown(sone);
+			eventBus.post(new MarkSoneKnownEvent(sone));
 			touchConfiguration();
 		}
 	}
@@ -1535,7 +1549,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		synchronized (posts) {
 			posts.put(post.getId(), post);
 		}
-		coreListenerManager.fireNewPostFound(post);
+		eventBus.post(new NewPostFoundEvent(post));
 		sone.addPost(post);
 		touchConfiguration();
 		localElementTicker.registerEvent(System.currentTimeMillis() + 10 * 1000, new Runnable() {
@@ -1581,7 +1595,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	public void markPostKnown(Post post) {
 		post.setKnown(true);
 		synchronized (knownPosts) {
-			coreListenerManager.fireMarkPostKnown(post);
+			eventBus.post(new MarkPostKnownEvent(post));
 			if (knownPosts.add(post.getId())) {
 				touchConfiguration();
 			}
@@ -1674,7 +1688,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			replies.put(reply.getId(), reply);
 		}
 		synchronized (knownReplies) {
-			coreListenerManager.fireNewReplyFound(reply);
+			eventBus.post(new NewPostReplyFoundEvent(reply));
 		}
 		sone.addReply(reply);
 		touchConfiguration();
@@ -1724,7 +1738,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	public void markReplyKnown(PostReply reply) {
 		reply.setKnown(true);
 		synchronized (knownReplies) {
-			coreListenerManager.fireMarkReplyKnown(reply);
+			eventBus.post(new MarkPostReplyKnownEvent(reply));
 			if (knownReplies.add(reply.getId())) {
 				touchConfiguration();
 			}
@@ -2420,7 +2434,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		synchronized (sones) {
 			sones.remove(identity.getId());
 		}
-		coreListenerManager.fireSoneRemoved(sone);
+		eventBus.post(new SoneRemovedEvent(sone));
 	}
 
 	//