X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fdemoscenemusic%2Fcore%2FTemplateServlet.java;h=9b091080f670437123fa672e3a3b00864fe805dd;hb=552a91b0c8a42edf5e9288f333af9c2d1bbb8ec6;hp=acbb0346ed330b4a585bc9081c5eac9ccbfda489;hpb=efc386bbc23f81b3a73e40dd22708782e26d525d;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 acbb034..9b09108 100644 --- a/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java +++ b/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java @@ -40,7 +40,9 @@ 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.data.User; import net.pterodactylus.demoscenemusic.page.ServletRequest; +import net.pterodactylus.demoscenemusic.template.UserAccessor; import net.pterodactylus.util.io.Closer; import net.pterodactylus.util.io.StreamCopier; import net.pterodactylus.util.template.ClassPathTemplateProvider; @@ -79,6 +81,7 @@ public class TemplateServlet extends HttpServlet { core = (Core) config.getServletContext().getAttribute("core"); templateContextFactory.addAccessor(Object.class, new ReflectionAccessor()); + templateContextFactory.addAccessor(User.class, new UserAccessor()); templateContextFactory.addFilter("html", new HtmlFilter()); CollectionSortFilter sortFilter = new CollectionSortFilter(); @@ -86,7 +89,7 @@ public class TemplateServlet extends HttpServlet { @Override public int compare(Artist leftArtist, Artist rightArtist) { - return leftArtist.name().compareToIgnoreCase(rightArtist.name()); + return leftArtist.getName().compareToIgnoreCase(rightArtist.getName()); } }); @@ -94,7 +97,7 @@ public class TemplateServlet extends HttpServlet { @Override public int compare(Track leftTrack, Track rightTrack) { - return leftTrack.name().compareToIgnoreCase(rightTrack.name()); + return leftTrack.getName().compareToIgnoreCase(rightTrack.getName()); } }); @@ -102,7 +105,7 @@ public class TemplateServlet extends HttpServlet { @Override public int compare(Style leftStyle, Style rightStyle) { - return leftStyle.name().compareToIgnoreCase(rightStyle.name()); + return leftStyle.getName().compareToIgnoreCase(rightStyle.getName()); } }); @@ -154,7 +157,7 @@ public class TemplateServlet extends HttpServlet { if (page != null) { ServletRequest servletRequest; try { - servletRequest = new ServletRequest(request); + servletRequest = new ServletRequest(request, this); } catch (URISyntaxException use1) { throw new IOException("Could not create URI from " + request.getRequestURI(), use1); } @@ -173,6 +176,14 @@ public class TemplateServlet extends HttpServlet { } } + /** + * {@inheritDoc} + */ + @Override + protected void doPost(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException { + doGet(httpServletRequest, httpServletResponse); + } + // // PRIVATE METHODS //