X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=01c186184f6570292794a124aea4f539f2c4a1e3;hb=c2231a3969fb867c4a7e0ce952fae6af2c2561eb;hp=2f10567529d83399484cd4e88db66216018fd403;hpb=ca65e4c3c3eec57227b50db1f10df0d2901fe0b0;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 2f10567..01c1861 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -40,6 +40,8 @@ import net.pterodactylus.sone.template.CollectionAccessor;
 import net.pterodactylus.sone.template.CssClassNameFilter;
 import net.pterodactylus.sone.template.GetPagePlugin;
 import net.pterodactylus.sone.template.IdentityAccessor;
+import net.pterodactylus.sone.template.NotificationAccessor;
+import net.pterodactylus.sone.template.NotificationManagerAccessor;
 import net.pterodactylus.sone.template.PostAccessor;
 import net.pterodactylus.sone.template.ReplyAccessor;
 import net.pterodactylus.sone.template.RequestChangeFilter;
@@ -60,6 +62,8 @@ import net.pterodactylus.sone.web.page.PageToadlet;
 import net.pterodactylus.sone.web.page.PageToadletFactory;
 import net.pterodactylus.sone.web.page.StaticPage;
 import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.util.notify.Notification;
+import net.pterodactylus.util.notify.NotificationManager;
 import net.pterodactylus.util.template.DateFilter;
 import net.pterodactylus.util.template.DefaultTemplateFactory;
 import net.pterodactylus.util.template.MatchFilter;
@@ -94,6 +98,9 @@ public class WebInterface {
 	/** The form password. */
 	private final String formPassword;
 
+	/** The template factory. */
+	private DefaultTemplateFactory templateFactory;
+
 	/**
 	 * Creates a new web interface.
 	 *
@@ -103,6 +110,27 @@ public class WebInterface {
 	public WebInterface(SonePlugin sonePlugin) {
 		this.sonePlugin = sonePlugin;
 		formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
+
+		templateFactory = new DefaultTemplateFactory();
+		templateFactory.addAccessor(Object.class, new ReflectionAccessor());
+		templateFactory.addAccessor(Collection.class, new CollectionAccessor());
+		templateFactory.addAccessor(Sone.class, new SoneAccessor(getCore()));
+		templateFactory.addAccessor(Post.class, new PostAccessor(getCore()));
+		templateFactory.addAccessor(Reply.class, new ReplyAccessor(getCore()));
+		templateFactory.addAccessor(Identity.class, new IdentityAccessor(getCore()));
+		templateFactory.addAccessor(Notification.class, new NotificationAccessor());
+		templateFactory.addAccessor(NotificationManager.class, new NotificationManagerAccessor());
+		templateFactory.addFilter("date", new DateFilter());
+		templateFactory.addFilter("l10n", new L10nFilter(getL10n()));
+		templateFactory.addFilter("substring", new SubstringFilter());
+		templateFactory.addFilter("xml", new XmlFilter());
+		templateFactory.addFilter("change", new RequestChangeFilter());
+		templateFactory.addFilter("match", new MatchFilter());
+		templateFactory.addFilter("css", new CssClassNameFilter());
+		templateFactory.addPlugin("getpage", new GetPagePlugin());
+		templateFactory.addPlugin("paginate", new PaginationPlugin());
+		templateFactory.setTemplateProvider(new ClassPathTemplateProvider(templateFactory));
+		templateFactory.addTemplateObject("formPassword", formPassword);
 	}
 
 	//
@@ -176,25 +204,6 @@ public class WebInterface {
 	 * Register all toadlets.
 	 */
 	private void registerToadlets() {
-		DefaultTemplateFactory templateFactory = new DefaultTemplateFactory();
-		templateFactory.addAccessor(Object.class, new ReflectionAccessor());
-		templateFactory.addAccessor(Collection.class, new CollectionAccessor());
-		templateFactory.addAccessor(Sone.class, new SoneAccessor(getCore()));
-		templateFactory.addAccessor(Post.class, new PostAccessor(getCore()));
-		templateFactory.addAccessor(Reply.class, new ReplyAccessor(getCore()));
-		templateFactory.addAccessor(Identity.class, new IdentityAccessor(getCore()));
-		templateFactory.addFilter("date", new DateFilter());
-		templateFactory.addFilter("l10n", new L10nFilter(getL10n()));
-		templateFactory.addFilter("substring", new SubstringFilter());
-		templateFactory.addFilter("xml", new XmlFilter());
-		templateFactory.addFilter("change", new RequestChangeFilter());
-		templateFactory.addFilter("match", new MatchFilter());
-		templateFactory.addFilter("css", new CssClassNameFilter());
-		templateFactory.addPlugin("getpage", new GetPagePlugin());
-		templateFactory.addPlugin("paginate", new PaginationPlugin());
-		templateFactory.setTemplateProvider(new ClassPathTemplateProvider(templateFactory));
-		templateFactory.addTemplateObject("formPassword", formPassword);
-
 		Template loginTemplate = templateFactory.createTemplate(createReader("/templates/login.html"));
 		Template indexTemplate = templateFactory.createTemplate(createReader("/templates/index.html"));
 		Template knownSonesTemplate = templateFactory.createTemplate(createReader("/templates/knownSones.html"));
@@ -304,6 +313,7 @@ public class WebInterface {
 	private class ClassPathTemplateProvider implements TemplateProvider {
 
 		/** The template factory. */
+		@SuppressWarnings("hiding")
 		private final TemplateFactory templateFactory;
 
 		/**