Merge branch 'release-0.9.6'

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

diff --git a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
index d001ea7..da93a02 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - KnownSonesPage.java - Copyright © 2010–2012 David Roden
+ * Sone - KnownSonesPage.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.web;
 
+import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -25,7 +27,6 @@ import java.util.List;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.collection.Pagination;
-import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 
@@ -41,6 +42,9 @@ import com.google.common.collect.Ordering;
  */
 public class KnownSonesPage extends SoneTemplatePage {
 
+       private static final String defaultSortField = "activity";
+       private static final String defaultSortOrder = "desc";
+
        /**
         * Creates a “known Sones” page.
         *
@@ -61,13 +65,12 @@ public class KnownSonesPage extends SoneTemplatePage {
         * {@inheritDoc}
         */
        @Override
-       protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-               super.processTemplate(request, templateContext);
-               String sortField = request.getHttpRequest().getParam("sort");
-               String sortOrder = request.getHttpRequest().getParam("order");
+       protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
+               String sortField = request.getHttpRequest().getParam("sort", defaultSortField);
+               String sortOrder = request.getHttpRequest().getParam("order", defaultSortOrder);
                String filter = request.getHttpRequest().getParam("filter");
-               templateContext.set("sort", (sortField != null) ? sortField : "name");
-               templateContext.set("order", (sortOrder != null) ? sortOrder : "asc");
+               templateContext.set("sort", sortField);
+               templateContext.set("order", sortOrder);
                templateContext.set("filter", filter);
                final Sone currentSone = getCurrentSone(request.getToadletContext(), false);
                Collection<Sone> knownSones = Collections2.filter(webInterface.getCore().getSones(), Sone.EMPTY_SONE_FILTER);
@@ -140,7 +143,7 @@ public class KnownSonesPage extends SoneTemplatePage {
                                Collections.sort(sortedSones, Sone.NICE_NAME_COMPARATOR);
                        }
                }
-               Pagination<Sone> sonePagination = new Pagination<Sone>(sortedSones, 25).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
+               Pagination<Sone> sonePagination = new Pagination<Sone>(sortedSones, 25).setPage(parseInt(request.getHttpRequest().getParam("page"), 0));
                templateContext.set("pagination", sonePagination);
                templateContext.set("knownSones", sonePagination.getItems());
        }