X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=42fd355245d1f3b0544e868b83e4a3cb76ac181c;hb=76402ddc863287224b17e413ec87208dcc562762;hp=20b1f822357fe7cfab52ce069158eb788a6b679a;hpb=27016b27da63e194efebda98f388b4074b223d52;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 20b1f82..42fd355 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -37,6 +37,8 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.CoreListener;
+import net.pterodactylus.sone.core.event.NewPostFoundEvent;
+import net.pterodactylus.sone.core.event.NewSoneFoundEvent;
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
@@ -103,8 +105,6 @@ import net.pterodactylus.sone.web.ajax.UntrustAjaxPage;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.sone.web.page.PageToadlet;
 import net.pterodactylus.sone.web.page.PageToadletFactory;
-import net.pterodactylus.util.collection.SetBuilder;
-import net.pterodactylus.util.collection.filter.Filters;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.notify.NotificationManager;
@@ -132,6 +132,9 @@ import net.pterodactylus.util.web.RedirectPage;
 import net.pterodactylus.util.web.StaticPage;
 import net.pterodactylus.util.web.TemplatePage;
 
+import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 
 import freenet.clients.http.SessionManager;
@@ -462,7 +465,7 @@ public class WebInterface implements CoreListener {
 	 * @return The new posts
 	 */
 	public Set<Post> getNewPosts() {
-		return new SetBuilder<Post>().addAll(newPostNotification.getElements()).addAll(localPostNotification.getElements()).get();
+		return ImmutableSet.<Post> builder().addAll(newPostNotification.getElements()).addAll(localPostNotification.getElements()).build();
 	}
 
 	/**
@@ -472,7 +475,7 @@ public class WebInterface implements CoreListener {
 	 * @return The new replies
 	 */
 	public Set<PostReply> getNewReplies() {
-		return new SetBuilder<PostReply>().addAll(newReplyNotification.getElements()).addAll(localReplyNotification.getElements()).get();
+		return ImmutableSet.<PostReply> builder().addAll(newReplyNotification.getElements()).addAll(localReplyNotification.getElements()).build();
 	}
 
 	/**
@@ -737,7 +740,7 @@ public class WebInterface implements CoreListener {
 	 *            The text to parse
 	 * @return All mentioned local Sones
 	 */
-	private Set<Sone> getMentionedSones(String text) {
+	private Collection<Sone> getMentionedSones(String text) {
 		/* we need no context to find mentioned Sones. */
 		Set<Sone> mentionedSones = new HashSet<Sone>();
 		try {
@@ -749,7 +752,7 @@ public class WebInterface implements CoreListener {
 		} catch (IOException ioe1) {
 			logger.log(Level.WARNING, String.format("Could not parse post text: %s", text), ioe1);
 		}
-		return Filters.filteredSet(mentionedSones, Sone.LOCAL_SONE_FILTER);
+		return Collections2.filter(mentionedSones, Sone.LOCAL_SONE_FILTER);
 	}
 
 	/**
@@ -774,15 +777,15 @@ public class WebInterface implements CoreListener {
 	}
 
 	//
-	// CORELISTENER METHODS
+	// EVENT HANDLERS
 	//
 
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override
-	public void newSoneFound(Sone sone) {
-		newSoneNotification.add(sone);
+	@Subscribe
+	public void newSoneFound(NewSoneFoundEvent newSoneFoundEvent) {
+		newSoneNotification.add(newSoneFoundEvent.sone());
 		if (!hasFirstStartNotification()) {
 			notificationManager.addNotification(newSoneNotification);
 		}
@@ -791,8 +794,9 @@ public class WebInterface implements CoreListener {
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override
-	public void newPostFound(Post post) {
+	@Subscribe
+	public void newPostFound(NewPostFoundEvent newPostFoundEvent) {
+		Post post = newPostFoundEvent.post();
 		boolean isLocal = post.getSone().isLocal();
 		if (isLocal) {
 			localPostNotification.add(post);
@@ -810,6 +814,10 @@ public class WebInterface implements CoreListener {
 		}
 	}
 
+	//
+	// CORELISTENER METHODS
+	//
+
 	/**
 	 * {@inheritDoc}
 	 */