X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=1a1027d153529b12fb47f05559ff094139924d57;hb=65808c9c5b9c06d22e5386f29cea9de561e020e8;hp=1b4654b44eff6a89ae5a9799098080629e20602c;hpb=378e6fafef1f68f197a944713b926e03a0c06cb9;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 1b4654b..1a1027d 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -94,6 +94,9 @@ public class WebInterface {
 	/** The form password. */
 	private final String formPassword;
 
+	/** The template factory. */
+	private DefaultTemplateFactory templateFactory;
+
 	/**
 	 * Creates a new web interface.
 	 *
@@ -103,6 +106,25 @@ 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.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 +198,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"));
@@ -216,6 +219,7 @@ public class WebInterface {
 		Template logoutTemplate = templateFactory.createTemplate(createReader("/templates/logout.html"));
 		Template optionsTemplate = templateFactory.createTemplate(createReader("/templates/options.html"));
 		Template aboutTemplate = templateFactory.createTemplate(createReader("/templates/about.html"));
+		Template replyTemplate = templateFactory.createTemplate(createReader("/templates/include/viewReply.html"));
 
 		PageToadletFactory pageToadletFactory = new PageToadletFactory(sonePlugin.pluginRespirator().getHLSimpleClient(), "/Sone/");
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new IndexPage(indexTemplate, this), "Index"));
@@ -245,7 +249,7 @@ public class WebInterface {
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new GetTranslationPage(this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new GetSoneStatusPage(this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateReplyAjaxPage(this)));
-		pageToadlets.add(pageToadletFactory.createPageToadlet(new GetReplyAjaxPage(this)));
+		pageToadlets.add(pageToadletFactory.createPageToadlet(new GetReplyAjaxPage(this, replyTemplate)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new DeletePostAjaxPage(this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteReplyAjaxPage(this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new FollowSoneAjaxPage(this)));
@@ -303,6 +307,7 @@ public class WebInterface {
 	private class ClassPathTemplateProvider implements TemplateProvider {
 
 		/** The template factory. */
+		@SuppressWarnings("hiding")
 		private final TemplateFactory templateFactory;
 
 		/**