X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=ed8cc7295626d6ea87d0b0875a49164c30c61a75;hp=629c2d54dde88b52085358b2e73fa8e667d7d93b;hb=de3f83202862d1b12505eff4da668a736a355b72;hpb=68eb3683d2dda01e06c03d7e77d38b99be2b748f

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 629c2d5..ed8cc72 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -35,7 +35,16 @@ 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.PostRemovedEvent;
+import net.pterodactylus.sone.core.event.PostReplyRemovedEvent;
+import net.pterodactylus.sone.core.event.SoneLockedEvent;
+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;
@@ -790,7 +799,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	public void lockSone(Sone sone) {
 		synchronized (lockedSones) {
 			if (lockedSones.add(sone)) {
-				coreListenerManager.fireSoneLocked(sone);
+				eventBus.post(new SoneLockedEvent(sone));
 			}
 		}
 	}
@@ -1101,7 +1110,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 					for (Post post : storedSone.getPosts()) {
 						posts.remove(post.getId());
 						if (!sone.getPosts().contains(post)) {
-							coreListenerManager.firePostRemoved(post);
+							eventBus.post(new PostRemovedEvent(post));
 						}
 					}
 				}
@@ -1114,7 +1123,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);
@@ -1126,7 +1135,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 					for (PostReply reply : storedSone.getReplies()) {
 						replies.remove(reply.getId());
 						if (!sone.getReplies().contains(reply)) {
-							coreListenerManager.fireReplyRemoved(reply);
+							eventBus.post(new PostReplyRemovedEvent(reply));
 						}
 					}
 				}
@@ -1139,7 +1148,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);
@@ -1230,7 +1239,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
@@ -1241,7 +1250,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			synchronized (knownSones) {
 				knownSones.add(sone.getId());
 			}
-			coreListenerManager.fireMarkSoneKnown(sone);
+			eventBus.post(new MarkSoneKnownEvent(sone));
 			touchConfiguration();
 		}
 	}
@@ -1543,7 +1552,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() {
@@ -1574,7 +1583,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		synchronized (posts) {
 			posts.remove(post.getId());
 		}
-		coreListenerManager.firePostRemoved(post);
+		eventBus.post(new PostRemovedEvent(post));
 		markPostKnown(post);
 		touchConfiguration();
 	}
@@ -1589,7 +1598,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();
 			}
@@ -1682,7 +1691,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();
@@ -1732,7 +1741,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();
 			}
@@ -2413,7 +2422,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			synchronized (knownPosts) {
 				for (Post post : sone.getPosts()) {
 					posts.remove(post.getId());
-					coreListenerManager.firePostRemoved(post);
+					eventBus.post(new PostRemovedEvent(post));
 				}
 			}
 		}
@@ -2421,14 +2430,14 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			synchronized (knownReplies) {
 				for (PostReply reply : sone.getReplies()) {
 					replies.remove(reply.getId());
-					coreListenerManager.fireReplyRemoved(reply);
+					eventBus.post(new PostReplyRemovedEvent(reply));
 				}
 			}
 		}
 		synchronized (sones) {
 			sones.remove(identity.getId());
 		}
-		coreListenerManager.fireSoneRemoved(sone);
+		eventBus.post(new SoneRemovedEvent(sone));
 	}
 
 	//