X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FKnownSonesPage.java;h=ea6f786f9456f2a1ee04ecde10c12dbaeeb0270b;hb=bb0081d5e34a59ccfb275c166e5935a2acb65a2c;hp=01271724216ad23adf55d17c280c68fe6c6d4f5b;hpb=5a704af88b91a83ad78b5fb6dc3147a9b65d713d;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 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<Sone> knownSones = new ArrayList<Sone>(webInterface.core().getKnownSones());
+		Collections.sort(knownSones, new Comparator<Sone>() {
+
+			@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);
 	}
 
 }