X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FTemplatePart.java;h=ac5694c0f072ad848474c30eed6189ed4b673c55;hb=64561f92233e7105055714a9de3db8eead92dd44;hp=1663e089e8c67671a0d8c3e7552314143d942b1b;hpb=10cf7b38ffd899a6fbfd4f4df17b48f2ea190aef;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/text/TemplatePart.java b/src/main/java/net/pterodactylus/sone/text/TemplatePart.java
index 1663e08..ac5694c 100644
--- a/src/main/java/net/pterodactylus/sone/text/TemplatePart.java
+++ b/src/main/java/net/pterodactylus/sone/text/TemplatePart.java
@@ -18,16 +18,23 @@
 package net.pterodactylus.sone.text;
 
 import java.io.IOException;
+import java.io.StringWriter;
 import java.io.Writer;
 
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
+import net.pterodactylus.util.template.TemplateContextFactory;
+import net.pterodactylus.util.template.TemplateException;
 
 /**
  * {@link Part} implementation that is rendered using a {@link Template}.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class TemplatePart implements Part {
+public class TemplatePart implements Part, net.pterodactylus.util.template.Part {
+
+	/** The template context factory. */
+	private final TemplateContextFactory templateContextFactory;
 
 	/** The template to render for this part. */
 	private final Template template;
@@ -35,10 +42,13 @@ public class TemplatePart implements Part {
 	/**
 	 * Creates a new template part.
 	 *
+	 * @param templateContextFactory
+	 *            The template context factory
 	 * @param template
 	 *            The template to render
 	 */
-	public TemplatePart(Template template) {
+	public TemplatePart(TemplateContextFactory templateContextFactory, Template template) {
+		this.templateContextFactory = templateContextFactory;
 		this.template = template;
 	}
 
@@ -56,7 +66,7 @@ public class TemplatePart implements Part {
 	 * @return This template part (for method chaining)
 	 */
 	public TemplatePart set(String key, Object value) {
-		template.set(key, value);
+		template.getInitialContext().set(key, value);
 		return this;
 	}
 
@@ -69,7 +79,33 @@ public class TemplatePart implements Part {
 	 */
 	@Override
 	public void render(Writer writer) throws IOException {
-		template.render(writer);
+		template.render(templateContextFactory.createTemplateContext().mergeContext(template.getInitialContext()), writer);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void render(TemplateContext templateContext, Writer writer) throws TemplateException {
+		template.render(templateContext.mergeContext(template.getInitialContext()), writer);
+	}
+
+	//
+	// OBJECT METHODS
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String toString() {
+		StringWriter stringWriter = new StringWriter();
+		try {
+			render(stringWriter);
+		} catch (IOException ioe1) {
+			/* should never throw, ignore. */
+		}
+		return stringWriter.toString();
 	}
 
 }