projects
/
demoscenemusic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add filter for concise numbers (three most significant digits only).
[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
df753f1
..
7b4f8c7
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/core/TemplateServlet.java
@@
-44,6
+44,8
@@
import net.pterodactylus.demoscenemusic.data.Track;
import net.pterodactylus.demoscenemusic.data.TrackDerivative;
import net.pterodactylus.demoscenemusic.data.User;
import net.pterodactylus.demoscenemusic.page.ServletRequest;
import net.pterodactylus.demoscenemusic.data.TrackDerivative;
import net.pterodactylus.demoscenemusic.data.User;
import net.pterodactylus.demoscenemusic.page.ServletRequest;
+import net.pterodactylus.demoscenemusic.template.ConciseNumberFilter;
+import net.pterodactylus.demoscenemusic.template.DurationFilter;
import net.pterodactylus.demoscenemusic.template.PropertiesAccessor;
import net.pterodactylus.demoscenemusic.template.TrackDerivativeAccessor;
import net.pterodactylus.demoscenemusic.template.UserAccessor;
import net.pterodactylus.demoscenemusic.template.PropertiesAccessor;
import net.pterodactylus.demoscenemusic.template.TrackDerivativeAccessor;
import net.pterodactylus.demoscenemusic.template.UserAccessor;
@@
-52,6
+54,7
@@
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.ClassPathTemplateProvider;
import net.pterodactylus.util.template.CollectionSortFilter;
import net.pterodactylus.util.template.HtmlFilter;
+import net.pterodactylus.util.template.MatchFilter;
import net.pterodactylus.util.template.ReflectionAccessor;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContextFactory;
import net.pterodactylus.util.template.ReflectionAccessor;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContextFactory;
@@
-68,6
+71,7
@@
import net.pterodactylus.util.web.Response;
public class TemplateServlet extends HttpServlet {
private Core core;
public class TemplateServlet extends HttpServlet {
private Core core;
+
private final TemplateContextFactory templateContextFactory = new TemplateContextFactory();
private final Map<String, Page<ServletRequest>> pages = new HashMap<String, Page<ServletRequest>>();
private final TemplateContextFactory templateContextFactory = new TemplateContextFactory();
private final Map<String, Page<ServletRequest>> pages = new HashMap<String, Page<ServletRequest>>();
@@
-116,6
+120,9
@@
public class TemplateServlet extends HttpServlet {
});
templateContextFactory.addFilter("sort", sortFilter);
});
templateContextFactory.addFilter("sort", sortFilter);
+ templateContextFactory.addFilter("matches", new MatchFilter());
+ templateContextFactory.addFilter("time", new DurationFilter());
+ templateContextFactory.addFilter("concise", new ConciseNumberFilter());
templateContextFactory.addTemplateObject("core", core);
templateContextFactory.addTemplateObject("dataManager", core.getDataManager());
templateContextFactory.addTemplateObject("core", core);
templateContextFactory.addTemplateObject("dataManager", core.getDataManager());