X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=deac56621963f3edfc7e6a2c87907a4fd66cfda9;hb=91cc17cf993ae2cb01864e48cf28a15afa2dc11e;hp=ab6623b67a0bfc9ceb5dda709e232e2040c27408;hpb=45bec66b94d51f9f6f896fe3705274c7890a2ed6;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 ab6623b..deac566 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -35,10 +35,18 @@ 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.SoneInsertingEvent;
+import net.pterodactylus.sone.core.event.SoneLockedEvent;
+import net.pterodactylus.sone.core.event.SoneRemovedEvent;
+import net.pterodactylus.sone.core.event.SoneUnlockedEvent;
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Image;
@@ -793,7 +801,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));
 			}
 		}
 	}
@@ -808,7 +816,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	public void unlockSone(Sone sone) {
 		synchronized (lockedSones) {
 			if (lockedSones.remove(sone)) {
-				coreListenerManager.fireSoneUnlocked(sone);
+				eventBus.post(new SoneUnlockedEvent(sone));
 			}
 		}
 	}
@@ -1104,7 +1112,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));
 						}
 					}
 				}
@@ -1129,7 +1137,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));
 						}
 					}
 				}
@@ -1233,7 +1241,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
@@ -1577,7 +1585,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();
 	}
@@ -1592,7 +1600,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();
 			}
@@ -1735,7 +1743,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();
 			}
@@ -2416,7 +2424,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));
 				}
 			}
 		}
@@ -2424,14 +2432,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));
 	}
 
 	//
@@ -2455,7 +2463,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	@Override
 	public void insertStarted(Sone sone) {
-		coreListenerManager.fireSoneInserting(sone);
+		eventBus.post(new SoneInsertingEvent(sone));
 	}
 
 	/**