X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fdemoscenemusic%2Fcore%2FTemplateServlet.java;h=acbb0346ed330b4a585bc9081c5eac9ccbfda489;hb=8b071d9a54a88e82a86d8948ea0ed3885576ad78;hp=9cfd7f576aff62ba55fa14466ce5886fb7a96d55;hpb=5fddefcaa9c8d2531210910ab34636dd25611c31;p=demoscenemusic.git

diff --git a/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java b/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java
index 9cfd7f5..acbb034 100644
--- a/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java
@@ -38,9 +38,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import net.pterodactylus.demoscenemusic.data.Artist;
+import net.pterodactylus.demoscenemusic.data.Style;
+import net.pterodactylus.demoscenemusic.data.Track;
 import net.pterodactylus.demoscenemusic.page.ServletRequest;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.io.StreamCopier;
+import net.pterodactylus.util.template.ClassPathTemplateProvider;
 import net.pterodactylus.util.template.CollectionSortFilter;
 import net.pterodactylus.util.template.HtmlFilter;
 import net.pterodactylus.util.template.ReflectionAccessor;
@@ -87,11 +90,29 @@ public class TemplateServlet extends HttpServlet {
 			}
 
 		});
+		sortFilter.addComparator(Track.class, new Comparator<Track>() {
+
+			@Override
+			public int compare(Track leftTrack, Track rightTrack) {
+				return leftTrack.name().compareToIgnoreCase(rightTrack.name());
+			}
+
+		});
+		sortFilter.addComparator(Style.class, new Comparator<Style>() {
+
+			@Override
+			public int compare(Style leftStyle, Style rightStyle) {
+				return leftStyle.name().compareToIgnoreCase(rightStyle.name());
+			}
+
+		});
 		templateContextFactory.addFilter("sort", sortFilter);
 
 		templateContextFactory.addTemplateObject("core", core);
 		templateContextFactory.addTemplateObject("dataManager", core.getDataManager());
 
+		templateContextFactory.addProvider(new ClassPathTemplateProvider(getClass(), "/templates/"));
+
 		for (@SuppressWarnings("rawtypes")
 		Enumeration parameterNames = config.getInitParameterNames(); parameterNames.hasMoreElements();) {
 			String pageName = (String) parameterNames.nextElement();