X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=51a831c54249174441df8e078be518431892e4cf;hb=06c97e457ce62ff258d85e6cfb9b4d94f9e9147f;hp=0a2c5346717d6e236f9a1a26222f1cf20e164d69;hpb=227e3e5aa520354a7744844f9345bf20920519e7;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 0a2c534..51a831c 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -35,9 +35,23 @@ 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.ImageInsertAbortedEvent;
+import net.pterodactylus.sone.core.event.ImageInsertStartedEvent;
+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.SoneInsertAbortedEvent;
+import net.pterodactylus.sone.core.event.SoneInsertedEvent;
+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.core.event.UpdateFoundEvent;
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Image;
@@ -792,7 +806,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));
 			}
 		}
 	}
@@ -807,7 +821,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));
 			}
 		}
 	}
@@ -1103,7 +1117,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));
 						}
 					}
 				}
@@ -1128,7 +1142,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));
 						}
 					}
 				}
@@ -1232,7 +1246,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
@@ -1243,7 +1257,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			synchronized (knownSones) {
 				knownSones.add(sone.getId());
 			}
-			coreListenerManager.fireMarkSoneKnown(sone);
+			eventBus.post(new MarkSoneKnownEvent(sone));
 			touchConfiguration();
 		}
 	}
@@ -1576,7 +1590,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();
 	}
@@ -1591,7 +1605,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();
 			}
@@ -1734,7 +1748,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();
 			}
@@ -2415,7 +2429,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));
 				}
 			}
 		}
@@ -2423,14 +2437,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));
 	}
 
 	//
@@ -2442,7 +2456,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	@Override
 	public void updateFound(Version version, long releaseTime, long latestEdition) {
-		coreListenerManager.fireUpdateFound(version, releaseTime, latestEdition);
+		eventBus.post(new UpdateFoundEvent(version, releaseTime, latestEdition));
 	}
 
 	//
@@ -2454,7 +2468,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	@Override
 	public void insertStarted(Sone sone) {
-		coreListenerManager.fireSoneInserting(sone);
+		eventBus.post(new SoneInsertingEvent(sone));
 	}
 
 	/**
@@ -2462,7 +2476,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	@Override
 	public void insertFinished(Sone sone, long insertDuration) {
-		coreListenerManager.fireSoneInserted(sone, insertDuration);
+		eventBus.post(new SoneInsertedEvent(sone, insertDuration));
 	}
 
 	/**
@@ -2470,7 +2484,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	@Override
 	public void insertAborted(Sone sone, Throwable cause) {
-		coreListenerManager.fireSoneInsertAborted(sone, cause);
+		eventBus.post(new SoneInsertAbortedEvent(sone, cause));
 	}
 
 	//
@@ -2483,7 +2497,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	@Override
 	public void imageInsertStarted(Image image) {
 		logger.log(Level.WARNING, String.format("Image insert started for %s...", image));
-		coreListenerManager.fireImageInsertStarted(image);
+		eventBus.post(new ImageInsertStartedEvent(image));
 	}
 
 	/**
@@ -2492,7 +2506,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	@Override
 	public void imageInsertAborted(Image image) {
 		logger.log(Level.WARNING, String.format("Image insert aborted for %s.", image));
-		coreListenerManager.fireImageInsertAborted(image);
+		eventBus.post(new ImageInsertAbortedEvent(image));
 	}
 
 	/**