X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FKnownSonesPage.java;h=dd1b1fc41f8df56f18321ac843f3cdd7c4a8116b;hb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792;hp=bc928c4b75c1be834fbae214bc7c2b6cd8613875;hpb=26dbc1f7ba2c4243d8cc07986b0e943a2238ea08;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java index bc928c4..dd1b1fc 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–2013 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 @@ -25,7 +25,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.collection.ReverseComparator; import net.pterodactylus.util.number.Numbers; import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; @@ -33,6 +32,7 @@ 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. @@ -117,25 +117,25 @@ public class KnownSonesPage extends SoneTemplatePage { List sortedSones = new ArrayList(knownSones); if ("activity".equals(sortField)) { if ("asc".equals(sortOrder)) { - Collections.sort(sortedSones, new ReverseComparator(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.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.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.NICE_NAME_COMPARATOR)); + Collections.sort(sortedSones, Ordering.from(Sone.NICE_NAME_COMPARATOR).reverse()); } else { Collections.sort(sortedSones, Sone.NICE_NAME_COMPARATOR); }