X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FKnownSonesPage.java;h=edb9980454fcaadc7dd06a6b5faa6b5a601a1790;hp=f476bbb9346c173ee8ea2b8d20d4371c7b455193;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=1da9b83e9a95fc269cb20a1ee7941872a684797f

diff --git a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
index f476bbb..edb9980 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–2013 David Roden
+ * Sone - KnownSonesPage.java - Copyright © 2010–2015 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;
 
@@ -66,11 +67,11 @@ public class KnownSonesPage extends SoneTemplatePage {
 	@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");
+		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 : defaultSortField);
-		templateContext.set("order", (sortOrder != null) ? sortOrder : defaultSortOrder);
+		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);
@@ -143,7 +144,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());
 	}