X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FKnownSonesPage.java;h=da93a0223f161d80fa22164048301fa83cbbd3ef;hp=bc928c4b75c1be834fbae214bc7c2b6cd8613875;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=26dbc1f7ba2c4243d8cc07986b0e943a2238ea08

diff --git a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
index bc928c4..da93a02 100644
--- 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,14 +27,13 @@ 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.collection.ReverseComparator;
-import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
+import com.google.common.collect.Ordering;
 
 /**
  * This page shows all known Sones.
@@ -41,6 +42,9 @@ import com.google.common.collect.Collections2;
  */
 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);
@@ -117,30 +120,30 @@ public class KnownSonesPage extends SoneTemplatePage {
 		List<Sone> sortedSones = new ArrayList<Sone>(knownSones);
 		if ("activity".equals(sortField)) {
 			if ("asc".equals(sortOrder)) {
-				Collections.sort(sortedSones, new ReverseComparator<Sone>(Sone.LAST_ACTIVITY_COMPARATOR));
+				Collections.sort(sortedSones, Ordering.from(Sone.LAST_ACTIVITY_COMPARATOR).reverse());
 			} else {
 				Collections.sort(sortedSones, Sone.LAST_ACTIVITY_COMPARATOR);
 			}
 		} else if ("posts".equals(sortField)) {
 			if ("asc".equals(sortOrder)) {
-				Collections.sort(sortedSones, new ReverseComparator<Sone>(Sone.POST_COUNT_COMPARATOR));
+				Collections.sort(sortedSones, Ordering.from(Sone.POST_COUNT_COMPARATOR).reverse());
 			} else {
 				Collections.sort(sortedSones, Sone.POST_COUNT_COMPARATOR);
 			}
 		} else if ("images".equals(sortField)) {
 			if ("asc".equals(sortOrder)) {
-				Collections.sort(sortedSones, new ReverseComparator<Sone>(Sone.IMAGE_COUNT_COMPARATOR));
+				Collections.sort(sortedSones, Ordering.from(Sone.IMAGE_COUNT_COMPARATOR).reverse());
 			} else {
 				Collections.sort(sortedSones, Sone.IMAGE_COUNT_COMPARATOR);
 			}
 		} else {
 			if ("desc".equals(sortOrder)) {
-				Collections.sort(sortedSones, new ReverseComparator<Sone>(Sone.NICE_NAME_COMPARATOR));
+				Collections.sort(sortedSones, Ordering.from(Sone.NICE_NAME_COMPARATOR).reverse());
 			} else {
 				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());
 	}