Merge branch 'release-0.6'

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

diff --git a/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java b/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
index 3f4d92d..758b93d 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
@@ -28,6 +28,7 @@ import java.util.Set;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.template.SoneAccessor;
 import net.pterodactylus.util.collection.Pagination;
 import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
@@ -49,7 +50,7 @@ public class ViewSonePage extends SoneTemplatePage {
         *            The Sone web interface
         */
        public ViewSonePage(Template template, WebInterface webInterface) {
-               super("viewSone.html", template, "Page.ViewSone.Title", webInterface, false);
+               super("viewSone.html", template, webInterface, false);
        }
 
        //
@@ -60,11 +61,29 @@ public class ViewSonePage extends SoneTemplatePage {
         * {@inheritDoc}
         */
        @Override
+       protected String getPageTitle(Request request) {
+               String soneId = request.getHttpRequest().getParam("sone");
+               Sone sone = webInterface.getCore().getSone(soneId, false);
+               if ((sone != null) && (sone.getTime() > 0)) {
+                       String soneName = SoneAccessor.getNiceName(sone);
+                       return soneName + " - " + webInterface.getL10n().getString("Page.ViewSone.Title");
+               }
+               return webInterface.getL10n().getString("Page.ViewSone.Page.TitleWithoutSone");
+       }
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
        protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
                super.processTemplate(request, templateContext);
                String soneId = request.getHttpRequest().getParam("sone");
                Sone sone = webInterface.getCore().getSone(soneId, false);
                templateContext.set("sone", sone);
+               List<Post> sonePosts = sone.getPosts();
+               Pagination<Post> postPagination = new Pagination<Post>(sonePosts, 10).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("postPage"), 0));
+               templateContext.set("postPagination", postPagination);
+               templateContext.set("posts", postPagination.getItems());
                Set<Reply> replies = sone.getReplies();
                final Map<Post, List<Reply>> repliedPosts = new HashMap<Post, List<Reply>>();
                for (Reply reply : replies) {
@@ -100,7 +119,7 @@ public class ViewSonePage extends SoneTemplatePage {
                        return;
                }
                webInterface.getCore().markSoneKnown(sone);
-               List<Post> posts = sone.getPosts();
+               List<Post> posts = (List<Post>) templateContext.get("posts");
                posts.addAll((List<Post>) templateContext.get("repliedPosts"));
                for (Post post : posts) {
                        if (post.getSone() != null) {