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=8318d03c358fac450d376f02dc8e924552b3c2ea;hpb=9e9841452e9d17fe0b104b20e64bfe97cea6a302;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 8318d03..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;
@@ -109,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;
 
@@ -229,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
 	//
 
@@ -385,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);
 			}
@@ -2495,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));
 	}
 
 	/**
@@ -2504,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));
 	}
 
 	/**
@@ -2516,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));
 	}
 
 	/**
@@ -2525,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));
 	}
 
 	/**