Fix ALL the logging!

[Sone.git] / src / main / java / net / pterodactylus / sone / web / SearchPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/SearchPage.java b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
index 91e2a08..54b6f49 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@ -28,6 +28,7 @@ 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;
@@ -66,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>();
@@ -228,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;
@@ -248,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;
                        }
@@ -365,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());
                        }