X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=8984cdd4369fbbd62e47b2ca6f8ce19be78f31a3;hb=b65fce08b56a5d0966e95a602898aaebb6471b4b;hp=81e5e09ff571c26be946d8755119d51c04861c36;hpb=756202d801245428d09fa0f5174fde0a8b001bd0;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 81e5e09..8984cdd 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -35,6 +35,10 @@ 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.ImageInsertFailedEvent;
+import net.pterodactylus.sone.core.event.ImageInsertFinishedEvent;
+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;
@@ -42,7 +46,14 @@ 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;
@@ -102,9 +113,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	/** The preferences. */
 	private final Preferences preferences = new Preferences(options);
 
-	/** The core listener manager. */
-	private final CoreListenerManager coreListenerManager = new CoreListenerManager(this);
-
 	/** The event bus. */
 	private final EventBus eventBus;
 
@@ -222,30 +230,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	}
 
 	//
-	// LISTENER MANAGEMENT
-	//
-
-	/**
-	 * Adds a new core listener.
-	 *
-	 * @param coreListener
-	 *            The listener to add
-	 */
-	public void addCoreListener(CoreListener coreListener) {
-		coreListenerManager.addListener(coreListener);
-	}
-
-	/**
-	 * Removes a core listener.
-	 *
-	 * @param coreListener
-	 *            The listener to remove
-	 */
-	public void removeCoreListener(CoreListener coreListener) {
-		coreListenerManager.removeListener(coreListener);
-	}
-
-	//
 	// ACCESSORS
 	//
 
@@ -378,7 +362,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	@Override
 	public Sone getSone(String id, boolean create) {
 		synchronized (sones) {
-			if (!sones.containsKey(id)) {
+			if (!sones.containsKey(id) && create) {
 				Sone sone = new Sone(id, false);
 				sones.put(id, sone);
 			}
@@ -797,7 +781,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));
 			}
 		}
 	}
@@ -812,7 +796,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));
 			}
 		}
 	}
@@ -1133,7 +1117,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));
 						}
 					}
 				}
@@ -2428,7 +2412,7 @@ 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));
 				}
 			}
 		}
@@ -2447,7 +2431,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));
 	}
 
 	//
@@ -2459,7 +2443,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	@Override
 	public void insertStarted(Sone sone) {
-		coreListenerManager.fireSoneInserting(sone);
+		eventBus.post(new SoneInsertingEvent(sone));
 	}
 
 	/**
@@ -2467,7 +2451,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));
 	}
 
 	/**
@@ -2475,7 +2459,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));
 	}
 
 	//
@@ -2488,7 +2472,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));
 	}
 
 	/**
@@ -2497,7 +2481,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));
 	}
 
 	/**
@@ -2509,7 +2493,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		image.setKey(key.toString());
 		deleteTemporaryImage(image.getId());
 		touchConfiguration();
-		coreListenerManager.fireImageInsertFinished(image);
+		eventBus.post(new ImageInsertFinishedEvent(image));
 	}
 
 	/**
@@ -2518,7 +2502,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	@Override
 	public void imageInsertFailed(Image image, Throwable cause) {
 		logger.log(Level.WARNING, String.format("Image insert failed for %s." + image), cause);
-		coreListenerManager.fireImageInsertFailed(image, cause);
+		eventBus.post(new ImageInsertFailedEvent(image, cause));
 	}
 
 	/**