X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FLoginPage.java;h=c859cf607ed75e5764916adf4caea42ed2db37fb;hb=b2222ffddcd6ece5daa677619e9f14dc704d1ce4;hp=7e99b32e3e0fab31f65339dec6f1abd62962d9bc;hpb=8276173b917c67f253c59f5ddf99b4deb155a870;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/LoginPage.java b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
index 7e99b32..c859cf6 100644
--- a/src/main/java/net/pterodactylus/sone/web/LoginPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
@@ -17,9 +17,13 @@
 
 package net.pterodactylus.sone.web;
 
-import java.util.Set;
+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.sone.web.page.Page.Request.Method;
 import net.pterodactylus.util.template.Template;
 import freenet.clients.http.ToadletContext;
@@ -52,12 +56,25 @@ public class LoginPage extends SoneTemplatePage {
 	 */
 	@Override
 	protected void processTemplate(Request request, Template template) throws RedirectException {
-		Set<Sone> localSones = webInterface.core().localSones();
+		super.processTemplate(request, template);
+		List<Sone> localSones = new ArrayList<Sone>(webInterface.core().getSones());
+		Collections.sort(localSones, new Comparator<Sone>() {
+
+			@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()));
+			}
+
+		});
 		template.set("sones", localSones);
 		if (request.getMethod() == Method.POST) {
 			String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone-id", 100);
 			Sone selectedSone = null;
-			for (Sone sone : webInterface.core().localSones()) {
+			for (Sone sone : webInterface.core().getSones()) {
 				if (sone.getId().equals(soneId)) {
 					selectedSone = sone;
 					break;