X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpage%2FTemplatePage.java;h=6e0bebc17d65ec82826c2ccacfac4d5dbe0f98d6;hb=67a8ddd9cdd9ba3d08e1022ab8a5c3b5e1326324;hp=e6ee539c5935b6c5c138731e8a812d6ca4d09e8a;hpb=e234898b050cac1c9b2223fba60eb75a7b8ad90c;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/page/TemplatePage.java b/src/main/java/net/pterodactylus/sone/web/page/TemplatePage.java
index e6ee539..6e0bebc 100644
--- a/src/main/java/net/pterodactylus/sone/web/page/TemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/page/TemplatePage.java
@@ -25,8 +25,9 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.sone.web.page.Page.Request.Method;
 import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
+import net.pterodactylus.util.template.TemplateContextFactory;
 import freenet.clients.http.LinkEnabledCallback;
 import freenet.clients.http.PageMaker;
 import freenet.clients.http.PageNode;
@@ -46,6 +47,9 @@ public class TemplatePage implements Page, LinkEnabledCallback {
 	/** The path of the page. */
 	private final String path;
 
+	/** The template context factory. */
+	private final TemplateContextFactory templateContextFactory;
+
 	/** The template to render. */
 	private final Template template;
 
@@ -63,6 +67,8 @@ public class TemplatePage implements Page, LinkEnabledCallback {
 	 *
 	 * @param path
 	 *            The path of the page
+	 * @param templateContextFactory
+	 *            The template context factory
 	 * @param template
 	 *            The template to render
 	 * @param l10n
@@ -73,8 +79,9 @@ public class TemplatePage implements Page, LinkEnabledCallback {
 	 *            The target to redirect to if a POST request does not contain
 	 *            the correct form password
 	 */
-	public TemplatePage(String path, Template template, BaseL10n l10n, String pageTitleKey, String invalidFormPasswordRedirectTarget) {
+	public TemplatePage(String path, TemplateContextFactory templateContextFactory, Template template, BaseL10n l10n, String pageTitleKey, String invalidFormPasswordRedirectTarget) {
 		this.path = path;
+		this.templateContextFactory = templateContextFactory;
 		this.template = template;
 		this.l10n = l10n;
 		this.pageTitleKey = pageTitleKey;
@@ -117,10 +124,11 @@ public class TemplatePage implements Page, LinkEnabledCallback {
 			pageNode.addForwardLink("icon", shortcutIcon);
 		}
 
-		DataProvider dataProvider = template.createDataProvider();
+		TemplateContext templateContext = templateContextFactory.createTemplateContext();
+		templateContext.mergeContext(template.getInitialContext());
 		try {
 			long start = System.nanoTime();
-			processTemplate(request, dataProvider);
+			processTemplate(request, templateContext);
 			long finish = System.nanoTime();
 			logger.log(Level.FINEST, "Template was rendered in " + ((finish - start) / 1000) / 1000.0 + "ms.");
 		} catch (RedirectException re1) {
@@ -128,10 +136,10 @@ public class TemplatePage implements Page, LinkEnabledCallback {
 		}
 
 		StringWriter stringWriter = new StringWriter();
-		template.render(dataProvider, stringWriter);
+		template.render(templateContext, stringWriter);
 		pageNode.content.addChild("%", stringWriter.toString());
 
-		postProcess(request, dataProvider);
+		postProcess(request, templateContext);
 
 		return new Response(200, "OK", "text/html", pageNode.outer.generate());
 	}
@@ -161,29 +169,29 @@ public class TemplatePage implements Page, LinkEnabledCallback {
 	 *
 	 * @param request
 	 *            The request that is rendered
-	 * @param dataProvider
-	 *            The data provider to set variables in
+	 * @param templateContext
+	 *            The template context to set variables in
 	 * @throws RedirectException
 	 *             if the processing page wants to redirect after processing
 	 */
-	protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
+	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
 		/* do nothing. */
 	}
 
 	/**
 	 * This method will be called after
-	 * {@link #processTemplate(net.pterodactylus.sone.web.page.Page.Request, DataProvider)}
+	 * {@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, DataProvider)}
+	 * {@link #processTemplate(net.pterodactylus.sone.web.page.Page.Request, TemplateContext)}
 	 * throws a {@link RedirectException}!
 	 *
 	 * @param request
 	 *            The request being processed
-	 * @param dataProvider
-	 *            The data provider that supplied the rendered data
+	 * @param templateContext
+	 *            The template context that supplied the rendered data
 	 */
-	protected void postProcess(Request request, DataProvider dataProvider) {
+	protected void postProcess(Request request, TemplateContext templateContext) {
 		/* do nothing. */
 	}
 
@@ -214,12 +222,12 @@ public class TemplatePage implements Page, LinkEnabledCallback {
 	/**
 	 * Exception that can be thrown to signal that a subclassed {@link Page}
 	 * wants to redirect the user during the
-	 * {@link TemplatePage#processTemplate(net.pterodactylus.sone.web.page.Page.Request, DataProvider)}
+	 * {@link TemplatePage#processTemplate(net.pterodactylus.sone.web.page.Page.Request, TemplateContext)}
 	 * method call.
 	 *
 	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
-	public class RedirectException extends Exception {
+	public static class RedirectException extends Exception {
 
 		/** The target to redirect to. */
 		private final String target;