X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSearchPage.java;h=a4da9f4c83b2e8b550e0a1157ab513c61deb0f5b;hp=fab7a5751d6a6f5aeb5af55e3214cad100196e71;hb=480691a26222e035e53bda56029524e160fdf898;hpb=1bc78b582ac59f2438002997f5780db4dcee0a2a

diff --git a/src/main/java/net/pterodactylus/sone/web/SearchPage.java b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
index fab7a57..a4da9f4 100644
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SearchPage.java - Copyright © 2010 David Roden
+ * Sone - SearchPage.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
@@ -28,22 +28,24 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Profile.Field;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.cache.Cache;
 import net.pterodactylus.util.cache.CacheException;
 import net.pterodactylus.util.cache.CacheItem;
 import net.pterodactylus.util.cache.DefaultCacheItem;
 import net.pterodactylus.util.cache.MemoryCache;
 import net.pterodactylus.util.cache.ValueRetriever;
-import net.pterodactylus.util.collection.Mapper;
-import net.pterodactylus.util.collection.Mappers;
 import net.pterodactylus.util.collection.Pagination;
 import net.pterodactylus.util.collection.TimedMap;
-import net.pterodactylus.util.filter.Filter;
-import net.pterodactylus.util.filter.Filters;
+import net.pterodactylus.util.collection.filter.Filter;
+import net.pterodactylus.util.collection.filter.Filters;
+import net.pterodactylus.util.collection.mapper.Mapper;
+import net.pterodactylus.util.collection.mapper.Mappers;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
@@ -65,6 +67,7 @@ public class SearchPage extends SoneTemplatePage {
 	/** Short-term cache. */
 	private final Cache<List<Phrase>, Set<Hit<Post>>> hitCache = new MemoryCache<List<Phrase>, Set<Hit<Post>>>(new ValueRetriever<List<Phrase>, Set<Hit<Post>>>() {
 
+		@Override
 		@SuppressWarnings("synthetic-access")
 		public CacheItem<Set<Hit<Post>>> retrieve(List<Phrase> phrases) throws CacheException {
 			Set<Post> posts = new HashSet<Post>();
@@ -96,7 +99,7 @@ public class SearchPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		String query = request.getHttpRequest().getParam("query").trim();
 		if (query.length() == 0) {
@@ -227,7 +230,7 @@ public class SearchPage extends SoneTemplatePage {
 	 * @return The score of the expression
 	 */
 	private double calculateScore(List<Phrase> phrases, String expression) {
-		logger.log(Level.FINEST, "Calculating Score for “%s”…", expression);
+		logger.log(Level.FINEST, String.format("Calculating Score for “%s”…", expression));
 		double optionalHits = 0;
 		double requiredHits = 0;
 		int forbiddenHits = 0;
@@ -247,10 +250,10 @@ public class SearchPage extends SoneTemplatePage {
 				}
 				score += Math.pow(1 - position / (double) expression.length(), 2);
 				index = position + phraseString.length();
-				logger.log(Level.FINEST, "Got hit at position %d.", position);
+				logger.log(Level.FINEST, String.format("Got hit at position %d.", position));
 				++matches;
 			}
-			logger.log(Level.FINEST, "Score: %f", score);
+			logger.log(Level.FINEST, String.format("Score: %f", score));
 			if (matches == 0) {
 				continue;
 			}
@@ -364,7 +367,7 @@ public class SearchPage extends SoneTemplatePage {
 			if (post.getRecipient() != null) {
 				postString.append(' ').append(SoneStringGenerator.NAME_GENERATOR.generateString(post.getRecipient()));
 			}
-			for (Reply reply : Filters.filteredList(webInterface.getCore().getReplies(post), Reply.FUTURE_REPLIES_FILTER)) {
+			for (PostReply reply : Filters.filteredList(webInterface.getCore().getReplies(post), Reply.FUTURE_REPLY_FILTER)) {
 				postString.append(' ').append(SoneStringGenerator.NAME_GENERATOR.generateString(reply.getSone()));
 				postString.append(' ').append(reply.getText());
 			}