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=8096a6ab48ebd94d58dd78bce109651605e1da8f;hpb=0df5e91852f737d760c5a9f54c5667309fbadcc2;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 8096a6a..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 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,8 +17,11 @@ 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; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -27,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; @@ -47,10 +50,10 @@ import freenet.support.HTMLNode; * * @author David ‘Bombe’ Roden */ -public class FreenetTemplatePage implements Page, LinkEnabledCallback { +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; @@ -99,6 +102,7 @@ public class FreenetTemplatePage implements Page, LinkEnabledCal * The request to serve * @return The title of the page */ + @SuppressWarnings("static-method") protected String getPageTitle(FreenetRequest request) { return null; } @@ -154,7 +158,7 @@ public class FreenetTemplatePage implements Page, LinkEnabledCal long start = System.nanoTime(); processTemplate(request, templateContext); long finish = System.nanoTime(); - logger.log(Level.FINEST, "Template was rendered in " + ((finish - start) / 1000) / 1000.0 + "ms."); + logger.log(Level.FINEST, String.format("Template was rendered in %.2fms.", (finish - start) / 1000000.0)); } catch (RedirectException re1) { return new RedirectResponse(re1.getTarget()); } @@ -165,6 +169,12 @@ public class FreenetTemplatePage implements Page, LinkEnabledCal 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()); } @@ -174,6 +184,7 @@ public class FreenetTemplatePage implements Page, LinkEnabledCal * * @return Additional style sheets to load */ + @SuppressWarnings("static-method") protected Collection getStyleSheets() { return Collections.emptySet(); } @@ -183,6 +194,7 @@ public class FreenetTemplatePage implements Page, LinkEnabledCal * * @return The URL of the shortcut icon, or {@code null} for no icon */ + @SuppressWarnings("static-method") protected String getShortcutIcon() { return null; } @@ -204,10 +216,9 @@ public class FreenetTemplatePage implements Page, LinkEnabledCal /** * This method will be called after - * {@link #processTemplate(net.pterodactylus.sone.web.page.Page.Request, TemplateContext)} - * has processed the template and the template was rendered. This method - * will not be called if - * {@link #processTemplate(net.pterodactylus.sone.web.page.Page.Request, TemplateContext)} + * {@link #processTemplate(FreenetRequest, TemplateContext)} has processed + * the template and the template was rendered. This method will not be + * called if {@link #processTemplate(FreenetRequest, TemplateContext)} * throws a {@link RedirectException}! * * @param request @@ -227,10 +238,15 @@ public class FreenetTemplatePage implements Page, LinkEnabledCal * 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; } + protected Iterable
getAdditionalHeaders(FreenetRequest request) { + return Collections.emptyList(); + } + /** * Returns additional <link> nodes for the HTML’s <head> node. * @@ -238,6 +254,7 @@ public class FreenetTemplatePage implements Page, LinkEnabledCal * 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> getAdditionalLinkNodes(FreenetRequest request) { return Collections.emptyList(); } @@ -249,10 +266,19 @@ public class FreenetTemplatePage implements Page, LinkEnabledCal * @return {@code true} if this page should only be allowed for hosts with * full access, {@code false} to allow this page for any host */ + @SuppressWarnings("static-method") protected boolean isFullAccessOnly() { return false; } + /** + * {@inheritDoc} + */ + @Override + public boolean isLinkExcepted(URI link) { + return false; + } + // // INTERFACE LinkEnabledCallback // @@ -268,7 +294,7 @@ public class FreenetTemplatePage implements Page, LinkEnabledCal /** * Exception that can be thrown to signal that a subclassed {@link Page} * wants to redirect the user during the - * {@link FreenetTemplatePage#processTemplate(net.pterodactylus.sone.web.page.Page.Request, TemplateContext)} + * {@link FreenetTemplatePage#processTemplate(FreenetRequest, TemplateContext)} * method call. * * @author David ‘Bombe’ Roden