From: David ‘Bombe’ Roden Date: Mon, 18 Oct 2010 19:07:59 +0000 (+0200) Subject: Sort known Sones by nice name and last update time. X-Git-Tag: 0.1-RC1~222 X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=bb0081d5e34a59ccfb275c166e5935a2acb65a2c;p=Sone.git Sort known Sones by nice name and last update time. --- diff --git a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java index 0127172..ea6f786 100644 --- a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java +++ b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java @@ -17,6 +17,13 @@ package net.pterodactylus.sone.web; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.template.SoneAccessor; import net.pterodactylus.util.template.Template; /** @@ -48,7 +55,20 @@ public class KnownSonesPage extends SoneTemplatePage { @Override protected void processTemplate(Request request, Template template) throws RedirectException { super.processTemplate(request, template); - template.set("knownSones", webInterface.core().getKnownSones()); + List knownSones = new ArrayList(webInterface.core().getKnownSones()); + Collections.sort(knownSones, new Comparator() { + + @Override + public int compare(Sone leftSone, Sone rightSone) { + int diff = SoneAccessor.getNiceName(leftSone).compareTo(SoneAccessor.getNiceName(rightSone)); + if (diff != 0) { + return diff; + } + return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightSone.getTime() - leftSone.getTime())); + } + + }); + template.set("knownSones", knownSones); } }