X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpage%2FFreenetTemplatePage.java;h=30c8da5570c9b7621ce81c3551ebacf969c02409;hb=179e7da4d8d8a474d0b622d60b5f5d32d6ab4052;hp=30071f5c8b32f4b6b24d8208a221b39651519a38;hpb=50ce65f69e49ed10abeedaeb6615ffb37a0c0772;p=Sone.git
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 30071f5..30c8da5 100644
--- 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â2019 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;
@@ -45,13 +47,11 @@ import freenet.support.HTMLNode;
/**
* Base class for all {@link Page}s that are rendered with {@link Template}s and
* fit into Freenetâs web interface.
- *
- * @author David âBombeâ Roden
*/
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;
@@ -100,6 +100,7 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
* The request to serve
* @return The title of the page
*/
+ @SuppressWarnings("static-method")
protected String getPageTitle(FreenetRequest request) {
return null;
}
@@ -116,7 +117,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);
@@ -155,7 +156,7 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
long start = System.nanoTime();
processTemplate(request, templateContext);
long finish = System.nanoTime();
- logger.log(Level.FINEST, "Template was rendered in %dms.", ((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());
}
@@ -175,6 +176,7 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
*
* @return Additional style sheets to load
*/
+ @SuppressWarnings("static-method")
protected Collection getStyleSheets() {
return Collections.emptySet();
}
@@ -184,6 +186,7 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
*
* @return The URL of the shortcut icon, or {@code null} for no icon
*/
+ @SuppressWarnings("static-method")
protected String getShortcutIcon() {
return null;
}
@@ -227,6 +230,7 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
* The request that is processed
* @return The URL to redirect to, or {@code null} to not redirect
*/
+ @SuppressWarnings("static-method")
protected String getRedirectTarget(FreenetRequest request) {
return null;
}
@@ -238,6 +242,7 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
* The request for which to return the link nodes
* @return All link nodes that should be added to the HTML head
*/
+ @SuppressWarnings("static-method")
protected List