projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace utils’ SetBuilder by Guava’s ImmutableSet.Builder.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
WebInterface.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index
20b1f82
..
188cc7f
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/
src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@
-103,8
+103,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.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;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.notify.Notification;
import net.pterodactylus.util.notify.NotificationManager;
@@
-132,6
+130,8
@@
import net.pterodactylus.util.web.RedirectPage;
import net.pterodactylus.util.web.StaticPage;
import net.pterodactylus.util.web.TemplatePage;
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.inject.Inject;
import freenet.clients.http.SessionManager;
import com.google.inject.Inject;
import freenet.clients.http.SessionManager;
@@
-462,7
+462,7
@@
public class WebInterface implements CoreListener {
* @return The new posts
*/
public Set<Post> getNewPosts() {
* @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
+472,7
@@
public class WebInterface implements CoreListener {
* @return The new replies
*/
public Set<PostReply> getNewReplies() {
* @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
+737,7
@@
public class WebInterface implements CoreListener {
* The text to parse
* @return All mentioned local Sones
*/
* 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 {
/* we need no context to find mentioned Sones. */
Set<Sone> mentionedSones = new HashSet<Sone>();
try {
@@
-749,7
+749,7
@@
public class WebInterface implements CoreListener {
} catch (IOException ioe1) {
logger.log(Level.WARNING, String.format("Could not parse post text: %s", text), ioe1);
}
} 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);
}
/**
}
/**