Merge branch 'release-0.9.7'

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

diff --git a/src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java
index 67884bd..9cfd026 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - FreenetTemplatePage.java - Copyright © 2010–2012 David Roden
+ * Sone - FreenetTemplatePage.java - Copyright © 2010–2016 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
@@ -17,6 +17,9 @@
 
 package net.pterodactylus.sone.web.page;
 
+import static java.lang.String.format;
+import static java.util.logging.Logger.getLogger;
+
 import java.io.IOException;
 import java.io.StringWriter;
 import java.net.URI;
@@ -28,7 +31,6 @@ import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.template.TemplateContextFactory;
@@ -51,7 +53,7 @@ import freenet.support.HTMLNode;
 public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
 
        /** The logger. */
-       private static final Logger logger = Logging.getLogger(FreenetTemplatePage.class);
+       private static final Logger logger = getLogger(FreenetTemplatePage.class.getName());
 
        /** The path of the page. */
        private final String path;
@@ -117,7 +119,7 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
         * {@inheritDoc}
         */
        @Override
-       public Response handleRequest(FreenetRequest request, Response response) throws IOException {
+       public final Response handleRequest(FreenetRequest request, Response response) throws IOException {
                String redirectTarget = getRedirectTarget(request);
                if (redirectTarget != null) {
                        return new RedirectResponse(redirectTarget);
@@ -156,7 +158,7 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
                        long start = System.nanoTime();
                        processTemplate(request, templateContext);
                        long finish = System.nanoTime();
-                       logger.log(Level.FINEST, String.format("Template was rendered in %.2fms.", ((finish - start) / 1000) / 1000.0));
+                       logger.log(Level.FINEST, format("Template was rendered in %.2fms.", (finish - start) / 1000000.0));
                } catch (RedirectException re1) {
                        return new RedirectResponse(re1.getTarget());
                }
@@ -311,6 +313,11 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
                        return target;
                }
 
+               @Override
+               public String toString() {
+                       return format("RedirectException{target='%s'}", target);
+               }
+
        }
 
 }