🔥 Replace BaseL10n with Translation

[Sone.git] / src / main / java / net / pterodactylus / sone / web / WebInterface.java

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index efc4291..588ffb7 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -19,9 +19,7 @@ package net.pterodactylus.sone.web;
 
 import static com.google.common.collect.FluentIterable.from;
 import static java.util.logging.Logger.getLogger;
-import static net.pterodactylus.util.template.TemplateParser.parse;
 
-import java.io.StringReader;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -40,30 +38,13 @@ import javax.annotation.Nullable;
 
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.ElementLoader;
-import net.pterodactylus.sone.core.event.ImageInsertAbortedEvent;
-import net.pterodactylus.sone.core.event.ImageInsertFailedEvent;
-import net.pterodactylus.sone.core.event.ImageInsertFinishedEvent;
-import net.pterodactylus.sone.core.event.ImageInsertStartedEvent;
-import net.pterodactylus.sone.core.event.MarkPostKnownEvent;
-import net.pterodactylus.sone.core.event.MarkPostReplyKnownEvent;
-import net.pterodactylus.sone.core.event.MarkSoneKnownEvent;
-import net.pterodactylus.sone.core.event.NewPostFoundEvent;
-import net.pterodactylus.sone.core.event.NewPostReplyFoundEvent;
-import net.pterodactylus.sone.core.event.NewSoneFoundEvent;
-import net.pterodactylus.sone.core.event.PostRemovedEvent;
-import net.pterodactylus.sone.core.event.PostReplyRemovedEvent;
-import net.pterodactylus.sone.core.event.SoneInsertAbortedEvent;
-import net.pterodactylus.sone.core.event.SoneInsertedEvent;
-import net.pterodactylus.sone.core.event.SoneInsertingEvent;
-import net.pterodactylus.sone.core.event.SoneLockedEvent;
-import net.pterodactylus.sone.core.event.SoneRemovedEvent;
-import net.pterodactylus.sone.core.event.SoneUnlockedEvent;
-import net.pterodactylus.sone.core.event.UpdateFoundEvent;
+import net.pterodactylus.sone.core.event.*;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.L10nFilter;
+import net.pterodactylus.sone.freenet.Translation;
 import net.pterodactylus.sone.main.Loaders;
 import net.pterodactylus.sone.main.PluginHomepage;
 import net.pterodactylus.sone.main.PluginVersion;
@@ -113,49 +94,7 @@ import net.pterodactylus.sone.web.ajax.UnlockSoneAjaxPage;
 import net.pterodactylus.sone.web.ajax.UntrustAjaxPage;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.sone.web.page.TemplateRenderer;
-import net.pterodactylus.sone.web.pages.AboutPage;
-import net.pterodactylus.sone.web.pages.BookmarkPage;
-import net.pterodactylus.sone.web.pages.BookmarksPage;
-import net.pterodactylus.sone.web.pages.CreateAlbumPage;
-import net.pterodactylus.sone.web.pages.CreatePostPage;
-import net.pterodactylus.sone.web.pages.CreateReplyPage;
-import net.pterodactylus.sone.web.pages.CreateSonePage;
-import net.pterodactylus.sone.web.pages.DeleteAlbumPage;
-import net.pterodactylus.sone.web.pages.DeleteImagePage;
-import net.pterodactylus.sone.web.pages.DeletePostPage;
-import net.pterodactylus.sone.web.pages.DeleteProfileFieldPage;
-import net.pterodactylus.sone.web.pages.DeleteReplyPage;
-import net.pterodactylus.sone.web.pages.DeleteSonePage;
-import net.pterodactylus.sone.web.pages.DismissNotificationPage;
-import net.pterodactylus.sone.web.pages.DistrustPage;
-import net.pterodactylus.sone.web.pages.EditAlbumPage;
-import net.pterodactylus.sone.web.pages.EditImagePage;
-import net.pterodactylus.sone.web.pages.EditProfileFieldPage;
-import net.pterodactylus.sone.web.pages.EditProfilePage;
-import net.pterodactylus.sone.web.pages.FollowSonePage;
-import net.pterodactylus.sone.web.pages.GetImagePage;
-import net.pterodactylus.sone.web.pages.ImageBrowserPage;
-import net.pterodactylus.sone.web.pages.IndexPage;
-import net.pterodactylus.sone.web.pages.KnownSonesPage;
-import net.pterodactylus.sone.web.pages.LikePage;
-import net.pterodactylus.sone.web.pages.LockSonePage;
-import net.pterodactylus.sone.web.pages.LoginPage;
-import net.pterodactylus.sone.web.pages.LogoutPage;
-import net.pterodactylus.sone.web.pages.MarkAsKnownPage;
-import net.pterodactylus.sone.web.pages.NewPage;
-import net.pterodactylus.sone.web.pages.OptionsPage;
-import net.pterodactylus.sone.web.pages.RescuePage;
-import net.pterodactylus.sone.web.pages.SearchPage;
-import net.pterodactylus.sone.web.pages.SoneTemplatePage;
-import net.pterodactylus.sone.web.pages.TrustPage;
-import net.pterodactylus.sone.web.pages.UnbookmarkPage;
-import net.pterodactylus.sone.web.pages.UnfollowSonePage;
-import net.pterodactylus.sone.web.pages.UnlikePage;
-import net.pterodactylus.sone.web.pages.UnlockSonePage;
-import net.pterodactylus.sone.web.pages.UntrustPage;
-import net.pterodactylus.sone.web.pages.UploadImagePage;
-import net.pterodactylus.sone.web.pages.ViewPostPage;
-import net.pterodactylus.sone.web.pages.ViewSonePage;
+import net.pterodactylus.sone.web.pages.*;
 import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.notify.NotificationManager;
 import net.pterodactylus.util.notify.TemplateNotification;
@@ -167,8 +106,8 @@ import net.pterodactylus.util.web.TemplatePage;
 import freenet.clients.http.SessionManager;
 import freenet.clients.http.SessionManager.Session;
 import freenet.clients.http.ToadletContext;
-import freenet.l10n.BaseL10n;
 
+import com.codahale.metrics.*;
 import com.google.common.base.Optional;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableSet;
@@ -218,6 +157,8 @@ public class WebInterface implements SessionProvider {
        private final L10nFilter l10nFilter;
 
        private final PageToadletRegistry pageToadletRegistry;
+       private final MetricRegistry metricRegistry;
+       private final Translation translation;
 
        /** The “new Sone” notification. */
        private final ListNotification<Sone> newSoneNotification;
@@ -269,7 +210,7 @@ public class WebInterface implements SessionProvider {
                        ParserFilter parserFilter, ShortenFilter shortenFilter,
                        RenderFilter renderFilter,
                        LinkedElementRenderFilter linkedElementRenderFilter,
-                       PageToadletRegistry pageToadletRegistry) {
+                       PageToadletRegistry pageToadletRegistry, MetricRegistry metricRegistry, Translation translation, L10nFilter l10nFilter) {
                this.sonePlugin = sonePlugin;
                this.loaders = loaders;
                this.listNotificationFilter = listNotificationFilter;
@@ -282,9 +223,11 @@ public class WebInterface implements SessionProvider {
                this.renderFilter = renderFilter;
                this.linkedElementRenderFilter = linkedElementRenderFilter;
                this.pageToadletRegistry = pageToadletRegistry;
+               this.metricRegistry = metricRegistry;
+               this.l10nFilter = l10nFilter;
+               this.translation = translation;
                formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
                soneTextParser = new SoneTextParser(getCore(), getCore());
-               l10nFilter = new L10nFilter(getL10n());
 
                this.templateContextFactory = templateContextFactory;
                templateContextFactory.addTemplateObject("webInterface", this);
@@ -438,13 +381,8 @@ public class WebInterface implements SessionProvider {
                return listNotificationFilter.filterNotifications(notificationManager.getNotifications(), currentSone);
        }
 
-       /**
-        * Returns the l10n helper of the node.
-        *
-        * @return The node’s l10n helper
-        */
-       public BaseL10n getL10n() {
-               return sonePlugin.l10n().getBase();
+       public Translation getTranslation() {
+               return translation;
        }
 
        /**
@@ -605,85 +543,58 @@ 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 noPermissionTemplate = loaders.loadTemplate("/templates/noPermission.html");
-               Template emptyImageTitleTemplate = loaders.loadTemplate("/templates/emptyImageTitle.html");
-               Template emptyAlbumTitleTemplate = loaders.loadTemplate("/templates/emptyAlbumTitle.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 SoneTemplatePage("noPermission.html", this, loaders, noPermissionTemplate, templateRenderer, "Page.NoPermission.Title"));
-               pageToadletRegistry.addPage(new SoneTemplatePage("emptyImageTitle.html", this, loaders, emptyImageTitleTemplate, templateRenderer, "Page.EmptyImageTitle.Title"));
-               pageToadletRegistry.addPage(new SoneTemplatePage("emptyAlbumTitle.html", this, loaders, emptyAlbumTitleTemplate, templateRenderer, "Page.EmptyAlbumTitle.Title"));
-               pageToadletRegistry.addPage(new DismissNotificationPage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new SoneTemplatePage("invalid.html", this, loaders, invalidTemplate, templateRenderer, "Page.Invalid.Title"));
+               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(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new DebugPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addDebugPage(new MetricsPage(this, loaders, templateRenderer, metricRegistry));
                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"));
@@ -793,7 +704,7 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void newSoneFound(NewSoneFoundEvent newSoneFoundEvent) {
-               newSoneNotification.add(newSoneFoundEvent.sone());
+               newSoneNotification.add(newSoneFoundEvent.getSone());
                if (!hasFirstStartNotification()) {
                        notificationManager.addNotification(newSoneNotification);
                }
@@ -807,7 +718,7 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void newPostFound(NewPostFoundEvent newPostFoundEvent) {
-               Post post = newPostFoundEvent.post();
+               Post post = newPostFoundEvent.getPost();
                boolean isLocal = post.getSone().isLocal();
                if (isLocal) {
                        localPostNotification.add(post);
@@ -833,7 +744,7 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void newReplyFound(NewPostReplyFoundEvent newPostReplyFoundEvent) {
-               PostReply reply = newPostReplyFoundEvent.postReply();
+               PostReply reply = newPostReplyFoundEvent.getPostReply();
                boolean isLocal = reply.getSone().isLocal();
                if (isLocal) {
                        localReplyNotification.add(reply);
@@ -859,27 +770,27 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void markSoneKnown(MarkSoneKnownEvent markSoneKnownEvent) {
-               newSoneNotification.remove(markSoneKnownEvent.sone());
+               newSoneNotification.remove(markSoneKnownEvent.getSone());
        }
 
        @Subscribe
        public void markPostKnown(MarkPostKnownEvent markPostKnownEvent) {
-               removePost(markPostKnownEvent.post());
+               removePost(markPostKnownEvent.getPost());
        }
 
        @Subscribe
        public void markReplyKnown(MarkPostReplyKnownEvent markPostReplyKnownEvent) {
-               removeReply(markPostReplyKnownEvent.postReply());
+               removeReply(markPostReplyKnownEvent.getPostReply());
        }
 
        @Subscribe
        public void soneRemoved(SoneRemovedEvent soneRemovedEvent) {
-               newSoneNotification.remove(soneRemovedEvent.sone());
+               newSoneNotification.remove(soneRemovedEvent.getSone());
        }
 
        @Subscribe
        public void postRemoved(PostRemovedEvent postRemovedEvent) {
-               removePost(postRemovedEvent.post());
+               removePost(postRemovedEvent.getPost());
        }
 
        private void removePost(Post post) {
@@ -892,7 +803,7 @@ public class WebInterface implements SessionProvider {
 
        @Subscribe
        public void replyRemoved(PostReplyRemovedEvent postReplyRemovedEvent) {
-               removeReply(postReplyRemovedEvent.postReply());
+               removeReply(postReplyRemovedEvent.getPostReply());
        }
 
        private void removeReply(PostReply reply) {
@@ -911,7 +822,7 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void soneLocked(SoneLockedEvent soneLockedEvent) {
-               final Sone sone = soneLockedEvent.sone();
+               final Sone sone = soneLockedEvent.getSone();
                ScheduledFuture<?> tickerObject = ticker.schedule(new Runnable() {
 
                        @Override
@@ -932,8 +843,8 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void soneUnlocked(SoneUnlockedEvent soneUnlockedEvent) {
-               lockedSonesNotification.remove(soneUnlockedEvent.sone());
-               lockedSonesTickerObjects.remove(soneUnlockedEvent.sone()).cancel(false);
+               lockedSonesNotification.remove(soneUnlockedEvent.getSone());
+               lockedSonesTickerObjects.remove(soneUnlockedEvent.getSone()).cancel(false);
        }
 
        /**
@@ -944,9 +855,9 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void soneInserting(SoneInsertingEvent soneInsertingEvent) {
-               TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertingEvent.sone());
+               TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertingEvent.getSone());
                soneInsertNotification.set("soneStatus", "inserting");
-               if (soneInsertingEvent.sone().getOptions().isSoneInsertNotificationEnabled()) {
+               if (soneInsertingEvent.getSone().getOptions().isSoneInsertNotificationEnabled()) {
                        notificationManager.addNotification(soneInsertNotification);
                }
        }
@@ -959,10 +870,10 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void soneInserted(SoneInsertedEvent soneInsertedEvent) {
-               TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertedEvent.sone());
+               TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertedEvent.getSone());
                soneInsertNotification.set("soneStatus", "inserted");
-               soneInsertNotification.set("insertDuration", soneInsertedEvent.insertDuration() / 1000);
-               if (soneInsertedEvent.sone().getOptions().isSoneInsertNotificationEnabled()) {
+               soneInsertNotification.set("insertDuration", soneInsertedEvent.getInsertDuration() / 1000);
+               if (soneInsertedEvent.getSone().getOptions().isSoneInsertNotificationEnabled()) {
                        notificationManager.addNotification(soneInsertNotification);
                }
        }
@@ -975,10 +886,10 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void soneInsertAborted(SoneInsertAbortedEvent soneInsertAbortedEvent) {
-               TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertAbortedEvent.sone());
+               TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertAbortedEvent.getSone());
                soneInsertNotification.set("soneStatus", "insert-aborted");
-               soneInsertNotification.set("insert-error", soneInsertAbortedEvent.cause());
-               if (soneInsertAbortedEvent.sone().getOptions().isSoneInsertNotificationEnabled()) {
+               soneInsertNotification.set("insert-error", soneInsertAbortedEvent.getCause());
+               if (soneInsertAbortedEvent.getSone().getOptions().isSoneInsertNotificationEnabled()) {
                        notificationManager.addNotification(soneInsertNotification);
                }
        }
@@ -991,10 +902,10 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void updateFound(UpdateFoundEvent updateFoundEvent) {
-               newVersionNotification.set("latestVersion", updateFoundEvent.version());
-               newVersionNotification.set("latestEdition", updateFoundEvent.latestEdition());
-               newVersionNotification.set("releaseTime", updateFoundEvent.releaseTime());
-               newVersionNotification.set("disruptive", updateFoundEvent.disruptive());
+               newVersionNotification.set("latestVersion", updateFoundEvent.getVersion());
+               newVersionNotification.set("latestEdition", updateFoundEvent.getLatestEdition());
+               newVersionNotification.set("releaseTime", updateFoundEvent.getReleaseTime());
+               newVersionNotification.set("disruptive", updateFoundEvent.isDisruptive());
                notificationManager.addNotification(newVersionNotification);
        }
 
@@ -1006,7 +917,7 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void imageInsertStarted(ImageInsertStartedEvent imageInsertStartedEvent) {
-               insertingImagesNotification.add(imageInsertStartedEvent.image());
+               insertingImagesNotification.add(imageInsertStartedEvent.getImage());
                notificationManager.addNotification(insertingImagesNotification);
        }
 
@@ -1018,7 +929,7 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void imageInsertAborted(ImageInsertAbortedEvent imageInsertAbortedEvent) {
-               insertingImagesNotification.remove(imageInsertAbortedEvent.image());
+               insertingImagesNotification.remove(imageInsertAbortedEvent.getImage());
        }
 
        /**
@@ -1029,8 +940,8 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) {
-               insertingImagesNotification.remove(imageInsertFinishedEvent.image());
-               insertedImagesNotification.add(imageInsertFinishedEvent.image());
+               insertingImagesNotification.remove(imageInsertFinishedEvent.getImage());
+               insertedImagesNotification.add(imageInsertFinishedEvent.getImage());
                notificationManager.addNotification(insertedImagesNotification);
        }
 
@@ -1042,9 +953,14 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void imageInsertFailed(ImageInsertFailedEvent imageInsertFailedEvent) {
-               insertingImagesNotification.remove(imageInsertFailedEvent.image());
-               imageInsertFailedNotification.add(imageInsertFailedEvent.image());
+               insertingImagesNotification.remove(imageInsertFailedEvent.getImage());
+               imageInsertFailedNotification.add(imageInsertFailedEvent.getImage());
                notificationManager.addNotification(imageInsertFailedNotification);
        }
 
+       @Subscribe
+       public void debugActivated(@Nonnull DebugActivatedEvent debugActivatedEvent) {
+               pageToadletRegistry.activateDebugMode();
+       }
+
 }