X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=e278629302ef5229b6c5639afa7d7e64e099960a;hb=9f3bbe5bb4450085d23bfa39c95da13267104916;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..e278629 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -35,6 +35,7 @@ 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.ImageInsertFinishedEvent;
 import net.pterodactylus.sone.core.event.MarkPostKnownEvent;
 import net.pterodactylus.sone.core.event.MarkPostReplyKnownEvent;
 import net.pterodactylus.sone.core.event.MarkSoneKnownEvent;
@@ -86,6 +87,7 @@ import net.pterodactylus.util.version.Version;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 
 import freenet.keys.FreenetURI;
@@ -95,7 +97,7 @@ import freenet.keys.FreenetURI;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Core extends AbstractService implements IdentityListener, UpdateListener, SoneProvider, PostProvider, SoneInsertListener, ImageInsertListener {
+public class Core extends AbstractService implements IdentityListener, UpdateListener, SoneProvider, PostProvider, SoneInsertListener {
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(Core.class);
@@ -109,9 +111,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,37 +221,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		this.freenetInterface = freenetInterface;
 		this.identityManager = identityManager;
 		this.soneDownloader = new SoneDownloader(this, freenetInterface);
-		this.imageInserter = new ImageInserter(this, freenetInterface);
+		this.imageInserter = new ImageInserter(freenetInterface);
 		this.updateChecker = new UpdateChecker(freenetInterface);
 		this.webOfTrustUpdater = webOfTrustUpdater;
 		this.eventBus = eventBus;
 	}
 
 	//
-	// 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 +360,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);
 			}
@@ -2485,47 +2460,18 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		eventBus.post(new SoneInsertAbortedEvent(sone, cause));
 	}
 
-	//
-	// SONEINSERTLISTENER METHODS
-	//
-
 	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void imageInsertStarted(Image image) {
-		logger.log(Level.WARNING, String.format("Image insert started for %s...", image));
-		coreListenerManager.fireImageInsertStarted(image);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void imageInsertAborted(Image image) {
-		logger.log(Level.WARNING, String.format("Image insert aborted for %s.", image));
-		coreListenerManager.fireImageInsertAborted(image);
-	}
-
-	/**
-	 * {@inheritDoc}
+	 * Deletes the temporary image.
+	 *
+	 * @param imageInsertFinishedEvent
+	 *            The event
 	 */
-	@Override
-	public void imageInsertFinished(Image image, FreenetURI key) {
-		logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", image, key));
-		image.setKey(key.toString());
-		deleteTemporaryImage(image.getId());
+	@Subscribe
+	public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) {
+		logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", imageInsertFinishedEvent.image(), imageInsertFinishedEvent.resultingUri()));
+		imageInsertFinishedEvent.image().setKey(imageInsertFinishedEvent.resultingUri().toString());
+		deleteTemporaryImage(imageInsertFinishedEvent.image().getId());
 		touchConfiguration();
-		coreListenerManager.fireImageInsertFinished(image);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@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);
 	}
 
 	/**