X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FImageBrowserPage.java;h=93d35b9b75bc26ac9f4f9685cf20825c4e2a758b;hp=406a762affa54517929c195670670999e3386354;hb=a47643aed43d118ca68044f95451bb5374cdb332;hpb=7bfd17c9c8b2fd5717308019bd2821ca643b4814 diff --git a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java index 406a762..93d35b9 100644 --- a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java @@ -1,5 +1,5 @@ /* - * Sone - ImageBrowserPage.java - Copyright © 2011 David Roden + * Sone - ImageBrowserPage.java - Copyright © 2011–2012 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 @@ -18,8 +18,9 @@ package net.pterodactylus.sone.web; import java.net.URI; -import java.util.HashSet; -import java.util.Set; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import net.pterodactylus.sone.data.Album; import net.pterodactylus.sone.data.Image; @@ -81,10 +82,11 @@ public class ImageBrowserPage extends SoneTemplatePage { String mode = request.getHttpRequest().getParam("mode", null); if ("gallery".equals(mode)) { templateContext.set("galleryRequested", true); - Set albums = new HashSet(); + List albums = new ArrayList(); for (Sone sone : webInterface.getCore().getSones()) { albums.addAll(sone.getAllAlbums()); } + Collections.sort(albums, Album.TITLE_COMPARATOR); templateContext.set("albums", albums); return; }