X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=4ce771130dd3cdff0c1695a2c0572830f3110c35;hb=5ffd5b9a0722c7a95acccb86409f545ca5abf417;hp=b69c866c1c6c6d11b7b5ab2340a1923ba6017cc6;hpb=8b6ea0e3f05c3b9f3041158f3bc54ed00828b207;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 b69c866..4ce7711 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;
@@ -49,6 +53,7 @@ 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;
@@ -108,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;
 
@@ -228,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
 	//
 
@@ -2453,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));
 	}
 
 	//
@@ -2494,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));
 	}
 
 	/**
@@ -2503,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));
 	}
 
 	/**
@@ -2515,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));
 	}
 
 	/**
@@ -2524,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));
 	}
 
 	/**