Store servlet in servlet request, too.

[demoscenemusic.git] / src / main / java / net / pterodactylus / demoscenemusic / core / TemplateServlet.java

diff --git a/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java b/src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java
index c0edf44..9b09108 100644 (file)
--- 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();
@@ -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
        //