Render templates in a thread-safe way.

[Sone.git] / src / main / java / net / pterodactylus / sone / web / CreateReplyPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java b/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
index e48232e..d4a9775 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
@@ -20,6 +20,7 @@ package net.pterodactylus.sone.web;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.page.Page.Request.Method;
+import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.Template;
 
 /**
@@ -38,7 +39,7 @@ public class CreateReplyPage extends SoneTemplatePage {
         *            The Sone web interface
         */
        public CreateReplyPage(Template template, WebInterface webInterface) {
-               super("createReply.html", template, "Page.CreateReply.Title", webInterface);
+               super("createReply.html", template, "Page.CreateReply.Title", webInterface, true);
        }
 
        //
@@ -49,32 +50,23 @@ public class CreateReplyPage extends SoneTemplatePage {
         * {@inheritDoc}
         */
        @Override
-       protected void processTemplate(Request request, Template template) throws RedirectException {
-               String postId = request.getHttpRequest().getPartAsStringFailsafe("postId", 36);
+       protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
+               super.processTemplate(request, dataProvider);
+               String postId = request.getHttpRequest().getPartAsStringFailsafe("post", 36);
                String text = request.getHttpRequest().getPartAsStringFailsafe("text", 65536).trim();
+               String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
                if (request.getMethod() == Method.POST) {
-                       Post post = webInterface.core().getPost(postId);
+                       Post post = webInterface.getCore().getPost(postId);
                        if (text.length() > 0) {
                                Sone currentSone = getCurrentSone(request.getToadletContext());
-                               webInterface.core().createReply(currentSone, post, text);
-                               throw new RedirectException("viewPost.html?post=" + post.getId());
+                               webInterface.getCore().createReply(currentSone, post, text);
+                               throw new RedirectException(returnPage);
                        }
-                       template.set("errorTextEmpty", true);
+                       dataProvider.set("errorTextEmpty", true);
                }
-               template.set("postId", postId);
-               template.set("text", text);
-       }
-
-       //
-       // SONETEMPLATEPAGE METHODS
-       //
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected boolean requiresLogin() {
-               return true;
+               dataProvider.set("postId", postId);
+               dataProvider.set("text", text);
+               dataProvider.set("returnPage", returnPage);
        }
 
 }