X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=fa2798e762adf37462bf5a813ea13debd6328899;hb=53a71d1d6b91e4d56af49a06f2e06bc4d11bf3eb;hp=a0f0a79110fed49266b1aaafad61ef3e4f86ea3c;hpb=453ff369775ad37fb63a8dc632c8ebe4fb2c69aa;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index a0f0a79..fa2798e 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -1,5 +1,5 @@
/*
- * Freetalk - FreetalkTemplatePage.java - Copyright © 2010 David Roden
+ * Sone - SoneTemplatePage.java - Copyright © 2010â2013 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,23 +21,32 @@ import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.main.SonePlugin;
-import net.pterodactylus.sone.web.page.Page;
-import net.pterodactylus.sone.web.page.TemplatePage;
+import net.pterodactylus.sone.notify.ListNotificationFilters;
+import net.pterodactylus.sone.web.page.FreenetRequest;
+import net.pterodactylus.sone.web.page.FreenetTemplatePage;
+import net.pterodactylus.util.notify.Notification;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
-import freenet.clients.http.SessionManager.Session;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
import freenet.clients.http.ToadletContext;
import freenet.support.api.HTTPRequest;
/**
- * Base page for the Freetalk web interface.
+ * Base page for the Sone web interface.
*
* @author David âBombeâ Roden
*/
-public class SoneTemplatePage extends TemplatePage {
+public class SoneTemplatePage extends FreenetTemplatePage {
/** The Sone core. */
protected final WebInterface webInterface;
@@ -49,8 +58,8 @@ public class SoneTemplatePage extends TemplatePage {
private final boolean requireLogin;
/**
- * Creates a new template page for Freetalk that does not require the user
- * to be logged in.
+ * Creates a new template page for Sone that does not require the user to be
+ * logged in.
*
* @param path
* The path of the page
@@ -64,8 +73,8 @@ public class SoneTemplatePage extends TemplatePage {
}
/**
- * Creates a new template page for Freetalk that does not require the user
- * to be logged in.
+ * Creates a new template page for Sone that does not require the user to be
+ * logged in.
*
* @param path
* The path of the page
@@ -81,7 +90,7 @@ public class SoneTemplatePage extends TemplatePage {
}
/**
- * Creates a new template page for Freetalk.
+ * Creates a new template page for Sone.
*
* @param path
* The path of the page
@@ -97,7 +106,7 @@ public class SoneTemplatePage extends TemplatePage {
}
/**
- * Creates a new template page for Freetalk.
+ * Creates a new template page for Sone.
*
* @param path
* The path of the page
@@ -115,7 +124,6 @@ public class SoneTemplatePage extends TemplatePage {
this.pageTitleKey = pageTitleKey;
this.webInterface = webInterface;
this.requireLogin = requireLogin;
- template.getInitialContext().set("webInterface", webInterface);
}
//
@@ -123,35 +131,6 @@ public class SoneTemplatePage extends TemplatePage {
//
/**
- * Returns the current session, creating a new session if there is no
- * current session.
- *
- * @param toadletContenxt
- * The toadlet context
- * @return The current session, or {@code null} if there is no current
- * session
- */
- protected Session getCurrentSession(ToadletContext toadletContenxt) {
- return webInterface.getCurrentSession(toadletContenxt);
- }
-
- /**
- * Returns the current session, creating a new session if there is no
- * current session and {@code create} is {@code true}.
- *
- * @param toadletContenxt
- * The toadlet context
- * @param create
- * {@code true} to create a new session if there is no current
- * session, {@code false} otherwise
- * @return The current session, or {@code null} if there is no current
- * session
- */
- protected Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
- return webInterface.getCurrentSession(toadletContenxt, create);
- }
-
- /**
* Returns the currently logged in Sone.
*
* @param toadletContext
@@ -159,7 +138,7 @@ public class SoneTemplatePage extends TemplatePage {
* @return The currently logged in Sone, or {@code null} if no Sone is
* currently logged in
*/
- protected Sone getCurrentSone(ToadletContext toadletContext) {
+ protected Optional getCurrentSone(ToadletContext toadletContext) {
return webInterface.getCurrentSone(toadletContext);
}
@@ -174,7 +153,7 @@ public class SoneTemplatePage extends TemplatePage {
* @return The currently logged in Sone, or {@code null} if no Sone is
* currently logged in
*/
- protected Sone getCurrentSone(ToadletContext toadletContext, boolean create) {
+ protected Optional getCurrentSone(ToadletContext toadletContext, boolean create) {
return webInterface.getCurrentSone(toadletContext, create);
}
@@ -198,7 +177,7 @@ public class SoneTemplatePage extends TemplatePage {
* {@inheritDoc}
*/
@Override
- protected String getPageTitle(Request request) {
+ protected String getPageTitle(FreenetRequest request) {
if (pageTitleKey != null) {
return webInterface.getL10n().getString(pageTitleKey);
}
@@ -209,6 +188,14 @@ public class SoneTemplatePage extends TemplatePage {
* {@inheritDoc}
*/
@Override
+ protected List