Merge branch 'release-0.6'

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

diff --git a/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java b/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java
index 3c1b6ab..4ecf6e0 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java
@@ -22,8 +22,8 @@ import java.util.StringTokenizer;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * Page that lets the user mark a number of {@link Sone}s, {@link Post}s, or
@@ -42,7 +42,7 @@ public class MarkAsKnownPage extends SoneTemplatePage {
         *            The Sone web interface
         */
        public MarkAsKnownPage(Template template, WebInterface webInterface) {
-               super("markAsKnown.html", template, "Page.MarkRead.Title", webInterface);
+               super("markAsKnown.html", template, "Page.MarkAsKnown.Title", webInterface);
        }
 
        //
@@ -53,8 +53,8 @@ public class MarkAsKnownPage extends SoneTemplatePage {
         * {@inheritDoc}
         */
        @Override
-       protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
-               super.processTemplate(request, dataProvider);
+       protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+               super.processTemplate(request, templateContext);
                String type = request.getHttpRequest().getPartAsStringFailsafe("type", 5);
                if (!type.equals("sone") && !type.equals("post") && !type.equals("reply")) {
                        throw new RedirectException("invalid.html");
@@ -62,7 +62,6 @@ public class MarkAsKnownPage extends SoneTemplatePage {
                String ids = request.getHttpRequest().getPartAsStringFailsafe("id", 65536);
                for (StringTokenizer idTokenizer = new StringTokenizer(ids); idTokenizer.hasMoreTokens();) {
                        String id = idTokenizer.nextToken();
-                       System.out.println("id: " + id);
                        if (type.equals("post")) {
                                Post post = webInterface.getCore().getPost(id, false);
                                if (post == null) {
@@ -84,7 +83,6 @@ public class MarkAsKnownPage extends SoneTemplatePage {
                        }
                }
                String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
-               System.out.println("returnPage: " + returnPage);
                throw new RedirectException(returnPage);
        }