X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCoreListenerManager.java;h=e9c08edcc5f2615f2017dfdbce351468e12f5367;hb=91cc17cf993ae2cb01864e48cf28a15afa2dc11e;hp=875a2b6e3dfcc7845df948323ddb029bfb82a71d;hpb=1bc78b582ac59f2438002997f5780db4dcee0a2a;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/CoreListenerManager.java b/src/main/java/net/pterodactylus/sone/core/CoreListenerManager.java
index 875a2b6..e9c08ed 100644
--- a/src/main/java/net/pterodactylus/sone/core/CoreListenerManager.java
+++ b/src/main/java/net/pterodactylus/sone/core/CoreListenerManager.java
@@ -1,5 +1,5 @@
 /*
- * Sone - CoreListenerManager.java - Copyright © 2010 David Roden
+ * Sone - CoreListenerManager.java - Copyright © 2010–2012 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
@@ -17,8 +17,7 @@
 
 package net.pterodactylus.sone.core;
 
-import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Reply;
+import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.util.event.AbstractListenerManager;
 import net.pterodactylus.util.version.Version;
@@ -45,204 +44,104 @@ public class CoreListenerManager extends AbstractListenerManager<Core, CoreListe
 	//
 
 	/**
-	 * Notifies all listeners that a new Sone has been discovered.
-	 *
-	 * @see CoreListener#newSoneFound(Sone)
-	 * @param sone
-	 *            The discovered sone
-	 */
-	void fireNewSoneFound(Sone sone) {
-		for (CoreListener coreListener : getListeners()) {
-			coreListener.newSoneFound(sone);
-		}
-	}
-
-	/**
-	 * Notifies all listeners that a new post has been found.
-	 *
-	 * @see CoreListener#newPostFound(Post)
-	 * @param post
-	 *            The new post
-	 */
-	void fireNewPostFound(Post post) {
-		for (CoreListener coreListener : getListeners()) {
-			coreListener.newPostFound(post);
-		}
-	}
-
-	/**
-	 * Notifies all listeners that a new reply has been found.
-	 *
-	 * @see CoreListener#newReplyFound(Reply)
-	 * @param reply
-	 *            The new reply
-	 */
-	void fireNewReplyFound(Reply reply) {
-		for (CoreListener coreListener : getListeners()) {
-			coreListener.newReplyFound(reply);
-		}
-	}
-
-	/**
-	 * Notifies all listeners that the given Sone is now marked as known.
+	 * Notifies all listeners that the insert of the given Sone has finished
+	 * successfully.
 	 *
-	 * @see CoreListener#markSoneKnown(Sone)
+	 * @see SoneInsertListener#insertFinished(Sone, long)
 	 * @param sone
-	 *            The known Sone
-	 */
-	void fireMarkSoneKnown(Sone sone) {
-		for (CoreListener coreListener : getListeners()) {
-			coreListener.markSoneKnown(sone);
-		}
-	}
-
-	/**
-	 * Notifies all listeners that the given post is now marked as known.
-	 *
-	 * @param post
-	 *            The known post
-	 */
-	void fireMarkPostKnown(Post post) {
-		for (CoreListener coreListener : getListeners()) {
-			coreListener.markPostKnown(post);
-		}
-	}
-
-	/**
-	 * Notifies all listeners that the given reply is now marked as known.
-	 *
-	 * @param reply
-	 *            The known reply
+	 *            The Sone that was inserted
+	 * @param insertDuration
+	 *            The insert duration (in milliseconds)
 	 */
-	void fireMarkReplyKnown(Reply reply) {
+	void fireSoneInserted(Sone sone, long insertDuration) {
 		for (CoreListener coreListener : getListeners()) {
-			coreListener.markReplyKnown(reply);
+			coreListener.soneInserted(sone, insertDuration);
 		}
 	}
 
 	/**
-	 * Notifies all listener that the given Sone was removed.
+	 * Notifies all listeners that the insert of the given Sone was aborted.
 	 *
-	 * @see CoreListener#soneRemoved(Sone)
+	 * @see SoneInsertListener#insertStarted(Sone)
 	 * @param sone
-	 *            The removed Sone
-	 */
-	void fireSoneRemoved(Sone sone) {
-		for (CoreListener coreListener : getListeners()) {
-			coreListener.soneRemoved(sone);
-		}
-	}
-
-	/**
-	 * Notifies all listener that the given post was removed.
-	 *
-	 * @see CoreListener#postRemoved(Post)
-	 * @param post
-	 *            The removed post
-	 */
-	void firePostRemoved(Post post) {
-		for (CoreListener coreListener : getListeners()) {
-			coreListener.postRemoved(post);
-		}
-	}
-
-	/**
-	 * Notifies all listener that the given reply was removed.
-	 *
-	 * @see CoreListener#replyRemoved(Reply)
-	 * @param reply
-	 *            The removed reply
+	 *            The Sone being inserted
+	 * @param cause
+	 *            The cause for the abortion (may be {@code null}
 	 */
-	void fireReplyRemoved(Reply reply) {
+	void fireSoneInsertAborted(Sone sone, Throwable cause) {
 		for (CoreListener coreListener : getListeners()) {
-			coreListener.replyRemoved(reply);
+			coreListener.soneInsertAborted(sone, cause);
 		}
 	}
 
 	/**
-	 * Notifies all listeners that the given Sone was locked.
+	 * Notifies all listeners that a new version was found.
 	 *
-	 * @see CoreListener#soneLocked(Sone)
-	 * @param sone
-	 *            The Sone that was locked
+	 * @see CoreListener#updateFound(Version, long, long)
+	 * @param version
+	 *            The new version
+	 * @param releaseTime
+	 *            The release time of the new version
+	 * @param latestEdition
+	 *            The latest edition of the Sone homepage
 	 */
-	void fireSoneLocked(Sone sone) {
+	void fireUpdateFound(Version version, long releaseTime, long latestEdition) {
 		for (CoreListener coreListener : getListeners()) {
-			coreListener.soneLocked(sone);
+			coreListener.updateFound(version, releaseTime, latestEdition);
 		}
 	}
 
 	/**
-	 * Notifies all listeners that the given Sone was unlocked.
+	 * Notifies all listeners that an image has started being inserted.
 	 *
-	 * @see CoreListener#soneUnlocked(Sone)
-	 * @param sone
-	 *            The Sone that was unlocked
+	 * @see CoreListener#imageInsertStarted(Image)
+	 * @param image
+	 *            The image that is now inserted
 	 */
-	void fireSoneUnlocked(Sone sone) {
+	void fireImageInsertStarted(Image image) {
 		for (CoreListener coreListener : getListeners()) {
-			coreListener.soneUnlocked(sone);
+			coreListener.imageInsertStarted(image);
 		}
 	}
 
 	/**
-	 * Notifies all listeners that the insert of the given Sone has started.
+	 * Notifies all listeners that an image insert was aborted by the user.
 	 *
-	 * @see SoneInsertListener#insertStarted(Sone)
-	 * @param sone
-	 *            The Sone being inserted
+	 * @see CoreListener#imageInsertAborted(Image)
+	 * @param image
+	 *            The image that is not inserted anymore
 	 */
-	void fireSoneInserting(Sone sone) {
+	void fireImageInsertAborted(Image image) {
 		for (CoreListener coreListener : getListeners()) {
-			coreListener.soneInserting(sone);
+			coreListener.imageInsertAborted(image);
 		}
 	}
 
 	/**
-	 * Notifies all listeners that the insert of the given Sone has finished
-	 * successfully.
+	 * Notifies all listeners that an image was successfully inserted.
 	 *
-	 * @see SoneInsertListener#insertFinished(Sone, long)
-	 * @param sone
-	 *            The Sone that was inserted
-	 * @param insertDuration
-	 *            The insert duration (in milliseconds)
+	 * @see CoreListener#imageInsertFinished(Image)
+	 * @param image
+	 *            The image that was inserted
 	 */
-	void fireSoneInserted(Sone sone, long insertDuration) {
+	void fireImageInsertFinished(Image image) {
 		for (CoreListener coreListener : getListeners()) {
-			coreListener.soneInserted(sone, insertDuration);
+			coreListener.imageInsertFinished(image);
 		}
 	}
 
 	/**
-	 * Notifies all listeners that the insert of the given Sone was aborted.
+	 * Notifies all listeners that an image failed to be inserted.
 	 *
-	 * @see SoneInsertListener#insertStarted(Sone)
-	 * @param sone
-	 *            The Sone being inserted
+	 * @see CoreListener#imageInsertFailed(Image, Throwable)
+	 * @param image
+	 *            The image that could not be inserted
 	 * @param cause
-	 *            The cause for the abortion (may be {@code null}
-	 */
-	void fireSoneInsertAborted(Sone sone, Throwable cause) {
-		for (CoreListener coreListener : getListeners()) {
-			coreListener.soneInsertAborted(sone, cause);
-		}
-	}
-
-	/**
-	 * Notifies all listeners that a new version was found.
-	 *
-	 * @see CoreListener#updateFound(Version, long, long)
-	 * @param version
-	 *            The new version
-	 * @param releaseTime
-	 *            The release time of the new version
-	 * @param latestEdition
-	 *            The latest edition of the Sone homepage
+	 *            The cause of the failure
 	 */
-	void fireUpdateFound(Version version, long releaseTime, long latestEdition) {
+	void fireImageInsertFailed(Image image, Throwable cause) {
 		for (CoreListener coreListener : getListeners()) {
-			coreListener.updateFound(version, releaseTime, latestEdition);
+			coreListener.imageInsertFailed(image, cause);
 		}
 	}