X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=80255a13581ebeb08e103d41bd32a82d491f7e65;hb=4276233daae926e02a1bbb8939645242f99918c7;hp=534985a5be2754a670e7894eaac6c908a7578ab8;hpb=50ce65f69e49ed10abeedaeb6615ffb37a0c0772;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 534985a..80255a1 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -20,22 +20,21 @@ package net.pterodactylus.sone.core;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.core.event.SoneInsertAbortedEvent;
+import net.pterodactylus.sone.core.event.SoneInsertedEvent;
+import net.pterodactylus.sone.core.event.SoneInsertingEvent;
 import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
 import net.pterodactylus.sone.freenet.StringBucket;
 import net.pterodactylus.sone.main.SonePlugin;
-import net.pterodactylus.util.collection.ListBuilder;
-import net.pterodactylus.util.collection.ReverseComparator;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
@@ -47,6 +46,10 @@ import net.pterodactylus.util.template.TemplateContextFactory;
 import net.pterodactylus.util.template.TemplateException;
 import net.pterodactylus.util.template.TemplateParser;
 import net.pterodactylus.util.template.XmlFilter;
+
+import com.google.common.collect.Ordering;
+import com.google.common.eventbus.EventBus;
+
 import freenet.client.async.ManifestElement;
 import freenet.keys.FreenetURI;
 
@@ -78,15 +81,15 @@ public class SoneInserter extends AbstractService {
 	/** The core. */
 	private final Core core;
 
+	/** The event bus. */
+	private final EventBus eventBus;
+
 	/** The Freenet interface. */
 	private final FreenetInterface freenetInterface;
 
 	/** The Sone to insert. */
 	private final Sone sone;
 
-	/** The insert listener manager. */
-	private SoneInsertListenerManager soneInsertListenerManager;
-
 	/** Whether a modification has been detected. */
 	private volatile boolean modified = false;
 
@@ -98,41 +101,19 @@ public class SoneInserter extends AbstractService {
 	 *
 	 * @param core
 	 *            The core
+	 * @param eventBus
+	 *            The event bus
 	 * @param freenetInterface
 	 *            The freenet interface
 	 * @param sone
 	 *            The Sone to insert
 	 */
-	public SoneInserter(Core core, FreenetInterface freenetInterface, Sone sone) {
+	public SoneInserter(Core core, EventBus eventBus, FreenetInterface freenetInterface, Sone sone) {
 		super("Sone Inserter for “" + sone.getName() + "”", false);
 		this.core = core;
+		this.eventBus = eventBus;
 		this.freenetInterface = freenetInterface;
 		this.sone = sone;
-		this.soneInsertListenerManager = new SoneInsertListenerManager(sone);
-	}
-
-	//
-	// LISTENER MANAGEMENT
-	//
-
-	/**
-	 * Adds a listener for Sone insert events.
-	 *
-	 * @param soneInsertListener
-	 *            The Sone insert listener
-	 */
-	public void addSoneInsertListener(SoneInsertListener soneInsertListener) {
-		soneInsertListenerManager.addListener(soneInsertListener);
-	}
-
-	/**
-	 * Removes a listener for Sone insert events.
-	 *
-	 * @param soneInsertListener
-	 *            The Sone insert listener
-	 */
-	public void removeSoneInsertListener(SoneInsertListener soneInsertListener) {
-		soneInsertListenerManager.removeListener(soneInsertListener);
 	}
 
 	//
@@ -302,8 +283,8 @@ public class SoneInserter extends AbstractService {
 			soneProperties.put("requestUri", sone.getRequestUri());
 			soneProperties.put("insertUri", sone.getInsertUri());
 			soneProperties.put("profile", sone.getProfile());
-			soneProperties.put("posts", new ListBuilder<Post>(new ArrayList<Post>(sone.getPosts())).sort(Post.TIME_COMPARATOR).get());
-			soneProperties.put("replies", new ListBuilder<PostReply>(new ArrayList<PostReply>(sone.getReplies())).sort(new ReverseComparator<Reply<?>>(Reply.TIME_COMPARATOR)).get());
+			soneProperties.put("posts", Ordering.from(Post.TIME_COMPARATOR).sortedCopy(sone.getPosts()));
+			soneProperties.put("replies", Ordering.from(Reply.TIME_COMPARATOR).reverse().sortedCopy(sone.getReplies()));
 			soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
 			soneProperties.put("likedReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
 			soneProperties.put("albums", sone.getAllAlbums());