X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=3d131c851fb4442980f3170a79706f5a05350d55;hp=d2479938df5d6c357d95f8ef180cedff87b651be;hb=110a933c2724aba6a604fc5eed6372ff1e1e6144;hpb=459a10b6fecbb12ca2359b34a85d4e884224f794

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index d247993..3d131c8 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -609,82 +609,56 @@ public class WebInterface implements SessionProvider {
 	 * Register all toadlets.
 	 */
 	private void registerToadlets() {
-		Template emptyTemplate = parse(new StringReader(""));
-		Template loginTemplate = loaders.loadTemplate("/templates/login.html");
-		Template indexTemplate = loaders.loadTemplate("/templates/index.html");
-		Template newTemplate = loaders.loadTemplate("/templates/new.html");
-		Template knownSonesTemplate = loaders.loadTemplate("/templates/knownSones.html");
-		Template createSoneTemplate = loaders.loadTemplate("/templates/createSone.html");
-		Template createPostTemplate = loaders.loadTemplate("/templates/createPost.html");
-		Template createReplyTemplate = loaders.loadTemplate("/templates/createReply.html");
-		Template bookmarksTemplate = loaders.loadTemplate("/templates/bookmarks.html");
-		Template searchTemplate = loaders.loadTemplate("/templates/search.html");
-		Template editProfileTemplate = loaders.loadTemplate("/templates/editProfile.html");
-		Template editProfileFieldTemplate = loaders.loadTemplate("/templates/editProfileField.html");
-		Template deleteProfileFieldTemplate = loaders.loadTemplate("/templates/deleteProfileField.html");
-		Template viewSoneTemplate = loaders.loadTemplate("/templates/viewSone.html");
-		Template viewPostTemplate = loaders.loadTemplate("/templates/viewPost.html");
-		Template deletePostTemplate = loaders.loadTemplate("/templates/deletePost.html");
-		Template deleteReplyTemplate = loaders.loadTemplate("/templates/deleteReply.html");
-		Template deleteSoneTemplate = loaders.loadTemplate("/templates/deleteSone.html");
-		Template imageBrowserTemplate = loaders.loadTemplate("/templates/imageBrowser.html");
-		Template createAlbumTemplate = loaders.loadTemplate("/templates/createAlbum.html");
-		Template deleteAlbumTemplate = loaders.loadTemplate("/templates/deleteAlbum.html");
-		Template deleteImageTemplate = loaders.loadTemplate("/templates/deleteImage.html");
-		Template optionsTemplate = loaders.loadTemplate("/templates/options.html");
-		Template rescueTemplate = loaders.loadTemplate("/templates/rescue.html");
-		Template aboutTemplate = loaders.loadTemplate("/templates/about.html");
-		Template invalidTemplate = loaders.loadTemplate("/templates/invalid.html");
 		Template postTemplate = loaders.loadTemplate("/templates/include/viewPost.html");
 		Template replyTemplate = loaders.loadTemplate("/templates/include/viewReply.html");
 		Template openSearchTemplate = loaders.loadTemplate("/templates/xml/OpenSearch.xml");
 
 		pageToadletRegistry.addPage(new RedirectPage<FreenetRequest>("", "index.html"));
-		pageToadletRegistry.addPage(new IndexPage(indexTemplate, this, loaders, templateRenderer, postVisibilityFilter));
-		pageToadletRegistry.addPage(new NewPage(newTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new CreateSonePage(createSoneTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new KnownSonesPage(knownSonesTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new EditProfilePage(editProfileTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new EditProfileFieldPage(editProfileFieldTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new DeleteProfileFieldPage(deleteProfileFieldTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new CreatePostPage(createPostTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new CreateReplyPage(createReplyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new ViewSonePage(viewSoneTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new ViewPostPage(viewPostTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new LikePage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new UnlikePage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new DeletePostPage(deletePostTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new DeleteReplyPage(deleteReplyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new LockSonePage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new UnlockSonePage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new FollowSonePage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new UnfollowSonePage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new ImageBrowserPage(imageBrowserTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new CreateAlbumPage(createAlbumTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new EditAlbumPage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new DeleteAlbumPage(deleteAlbumTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new UploadImagePage(invalidTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new EditImagePage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new DeleteImagePage(deleteImageTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new TrustPage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new DistrustPage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new UntrustPage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new MarkAsKnownPage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new BookmarkPage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new UnbookmarkPage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new BookmarksPage(bookmarksTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new SearchPage(searchTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new DeleteSonePage(deleteSoneTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new LoginPage(loginTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new LogoutPage(emptyTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new OptionsPage(optionsTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new RescuePage(rescueTemplate, this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new AboutPage(aboutTemplate, this, loaders, templateRenderer, new PluginVersion(SonePlugin.getPluginVersion()), new PluginYear(sonePlugin.getYear()), new PluginHomepage(sonePlugin.getHomepage())));
+		pageToadletRegistry.addPage(new IndexPage(this, loaders, templateRenderer, postVisibilityFilter));
+		pageToadletRegistry.addPage(new NewPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new CreateSonePage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new KnownSonesPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new EditProfilePage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new EditProfileFieldPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new DeleteProfileFieldPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new CreatePostPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new CreateReplyPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new ViewSonePage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new ViewPostPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new LikePage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new UnlikePage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new DeletePostPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new DeleteReplyPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new LockSonePage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new UnlockSonePage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new FollowSonePage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new UnfollowSonePage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new ImageBrowserPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new CreateAlbumPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new EditAlbumPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new DeleteAlbumPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new UploadImagePage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new EditImagePage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new DeleteImagePage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new TrustPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new DistrustPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new UntrustPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new MarkAsKnownPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new BookmarkPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new UnbookmarkPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new BookmarksPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new SearchPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new DeleteSonePage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new LoginPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new LogoutPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new OptionsPage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new RescuePage(this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new AboutPage(this, loaders, templateRenderer, new PluginVersion(SonePlugin.getPluginVersion()), new PluginYear(sonePlugin.getYear()), new PluginHomepage(sonePlugin.getHomepage())));
 		pageToadletRegistry.addPage(new InvalidPage(this, loaders, templateRenderer));
 		pageToadletRegistry.addPage(new NoPermissionPage(this, loaders, templateRenderer));
 		pageToadletRegistry.addPage(new EmptyImageTitlePage(this, loaders, templateRenderer));
 		pageToadletRegistry.addPage(new EmptyAlbumTitlePage(this, loaders, templateRenderer));
-		pageToadletRegistry.addPage(new DismissNotificationPage(emptyTemplate, this, loaders, templateRenderer));
+		pageToadletRegistry.addPage(new DismissNotificationPage(this, loaders, templateRenderer));
 		pageToadletRegistry.addPage(loaders.<FreenetRequest>loadStaticPage("css/", "/static/css/", "text/css"));
 		pageToadletRegistry.addPage(loaders.<FreenetRequest>loadStaticPage("javascript/", "/static/javascript/", "text/javascript"));
 		pageToadletRegistry.addPage(loaders.<FreenetRequest>loadStaticPage("images/", "/static/images/", "image/png"));