X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=18aebedf5e1b5a0dc70569c003fca0817eb44452;hb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792;hp=dc4c4f09282e4027e136673c831944641ca5a435;hpb=9e9841452e9d17fe0b104b20e64bfe97cea6a302;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index dc4c4f0..18aebed 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -1,5 +1,5 @@
 /*
- * Sone - WebInterface.java - Copyright © 2010–2012 David Roden
+ * Sone - WebInterface.java - Copyright © 2010–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +36,10 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.Core;
-import net.pterodactylus.sone.core.CoreListener;
+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;
@@ -162,7 +165,7 @@ import freenet.support.api.HTTPRequest;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class WebInterface implements CoreListener {
+public class WebInterface {
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(WebInterface.class);
@@ -1036,44 +1039,52 @@ public class WebInterface implements CoreListener {
 		notificationManager.addNotification(newVersionNotification);
 	}
 
-	//
-	// CORELISTENER METHODS
-	//
-
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that an image insert was started
+	 *
+	 * @param imageInsertStartedEvent
+	 *            The event
 	 */
-	@Override
-	public void imageInsertStarted(Image image) {
-		insertingImagesNotification.add(image);
+	@Subscribe
+	public void imageInsertStarted(ImageInsertStartedEvent imageInsertStartedEvent) {
+		insertingImagesNotification.add(imageInsertStartedEvent.image());
 		notificationManager.addNotification(insertingImagesNotification);
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that an {@link Image} insert was aborted.
+	 *
+	 * @param imageInsertAbortedEvent
+	 *            The event
 	 */
-	@Override
-	public void imageInsertAborted(Image image) {
-		insertingImagesNotification.remove(image);
+	@Subscribe
+	public void imageInsertAborted(ImageInsertAbortedEvent imageInsertAbortedEvent) {
+		insertingImagesNotification.remove(imageInsertAbortedEvent.image());
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that an {@link Image} insert is finished.
+	 *
+	 * @param imageInsertFinishedEvent
+	 *            The event
 	 */
-	@Override
-	public void imageInsertFinished(Image image) {
-		insertingImagesNotification.remove(image);
-		insertedImagesNotification.add(image);
+	@Subscribe
+	public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) {
+		insertingImagesNotification.remove(imageInsertFinishedEvent.image());
+		insertedImagesNotification.add(imageInsertFinishedEvent.image());
 		notificationManager.addNotification(insertedImagesNotification);
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Notifies the web interface that an {@link Image} insert has failed.
+	 *
+	 * @param imageInsertFailedEvent
+	 *            The event
 	 */
-	@Override
-	public void imageInsertFailed(Image image, Throwable cause) {
-		insertingImagesNotification.remove(image);
-		imageInsertFailedNotification.add(image);
+	@Subscribe
+	public void imageInsertFailed(ImageInsertFailedEvent imageInsertFailedEvent) {
+		insertingImagesNotification.remove(imageInsertFailedEvent.image());
+		imageInsertFailedNotification.add(imageInsertFailedEvent.image());
 		notificationManager.addNotification(imageInsertFailedNotification);
 	}