X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FKnownSonesPage.java;h=d413f6177d1e9393630e453c46c3505458038355;hb=bd2cbb229f68fb2535cf6010befa9c4a276d2ee6;hp=09046199a74da98ff057a3da1ec59a079a343ce1;hpb=b2222ffddcd6ece5daa677619e9f14dc704d1ce4;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 0904619..d413f61 100644 --- a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java +++ b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java @@ -19,11 +19,9 @@ 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; /** @@ -42,7 +40,7 @@ public class KnownSonesPage extends SoneTemplatePage { * The Sone web interface */ public KnownSonesPage(Template template, WebInterface webInterface) { - super("knownSones.html", template, "Page.KnownSones.Title", webInterface); + super("knownSones.html", template, "Page.KnownSones.Title", webInterface, false); } // @@ -55,19 +53,8 @@ public class KnownSonesPage extends SoneTemplatePage { @Override protected void processTemplate(Request request, Template template) throws RedirectException { super.processTemplate(request, template); - 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).compareToIgnoreCase(SoneAccessor.getNiceName(rightSone)); - if (diff != 0) { - return diff; - } - return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightSone.getTime() - leftSone.getTime())); - } - - }); + List knownSones = new ArrayList(webInterface.getCore().getSones()); + Collections.sort(knownSones, Sone.NICE_NAME_COMPARATOR); template.set("knownSones", knownSones); }