X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpage%2FFreenetTemplatePage.java;h=14e48ac38496d1b4d05f883d4b7f9a7f25cbc1a1;hb=9a630573219dc555088b80374a6630709328d9ea;hp=97ee53bc1276a493a4bcba1495d2d78a769223ca;hpb=61fea0173ef87542cae35247e6356ef36f2664d3;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 97ee53b..14e48ac 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–2013 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,8 @@
 
 package net.pterodactylus.sone.web.page;
 
+import static java.util.logging.Logger.getLogger;
+
 import java.io.IOException;
 import java.io.StringWriter;
 import java.net.URI;
@@ -28,10 +30,10 @@ 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;
+import net.pterodactylus.util.web.Header;
 import net.pterodactylus.util.web.Method;
 import net.pterodactylus.util.web.Page;
 import net.pterodactylus.util.web.RedirectResponse;
@@ -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("Sone.Web.Freenet");
 
 	/** The path of the page. */
 	private final String path;
@@ -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, "Template was rendered in %dms.", ((finish - start) / 1000) / 1000.0);
+			logger.log(Level.FINEST, String.format("Template was rendered in %.2fms.", (finish - start) / 1000000.0));
 		} catch (RedirectException re1) {
 			return new RedirectResponse(re1.getTarget());
 		}
@@ -167,6 +169,12 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
 
 		postProcess(request, templateContext);
 
+		for (Header header : getAdditionalHeaders(request)) {
+			for (String value : header) {
+				response.addHeader(header.getName(), value);
+			}
+		}
+
 		return response.setStatusCode(200).setStatusText("OK").setContentType("text/html").write(pageNode.outer.generate());
 	}
 
@@ -235,6 +243,10 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
 		return null;
 	}
 
+	protected Iterable<Header> getAdditionalHeaders(FreenetRequest request) {
+		return Collections.emptyList();
+	}
+
 	/**
 	 * Returns additional &lt;link&gt; nodes for the HTML’s &lt;head&gt; node.
 	 *