X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=7fb8da9b030dceaea882b5ec2b7f107f6513deee;hb=41789ed4655668549aa0bf3b77d34743df93e61d;hp=c518a8715863a78730d0fb1087a36fab46ce3190;hpb=2c5b76a2fbce16ef33f079a3de9ae9fc9a9d30b8;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 c518a87..7fb8da9 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -35,6 +36,7 @@ import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.L10nFilter;
 import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.main.SonePlugin;
+import net.pterodactylus.sone.template.CollectionAccessor;
 import net.pterodactylus.sone.template.GetPagePlugin;
 import net.pterodactylus.sone.template.IdentityAccessor;
 import net.pterodactylus.sone.template.PostAccessor;
@@ -55,7 +57,6 @@ 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.service.AbstractService;
 import net.pterodactylus.util.template.DateFilter;
 import net.pterodactylus.util.template.DefaultTemplateFactory;
 import net.pterodactylus.util.template.MatchFilter;
@@ -76,7 +77,7 @@ import freenet.l10n.BaseL10n;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class WebInterface extends AbstractService {
+public class WebInterface {
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(WebInterface.class);
@@ -97,7 +98,6 @@ public class WebInterface extends AbstractService {
 	 *            The Sone plugin
 	 */
 	public WebInterface(SonePlugin sonePlugin) {
-		super("Sone Web Interface", false);
 		this.sonePlugin = sonePlugin;
 		formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
 	}
@@ -111,7 +111,7 @@ public class WebInterface extends AbstractService {
 	 *
 	 * @return The Sone core
 	 */
-	public Core core() {
+	public Core getCore() {
 		return sonePlugin.core();
 	}
 
@@ -120,7 +120,7 @@ public class WebInterface extends AbstractService {
 	 *
 	 * @return The node’s l10n helper
 	 */
-	public BaseL10n l10n() {
+	public BaseL10n getL10n() {
 		return sonePlugin.l10n().getBase();
 	}
 
@@ -129,7 +129,7 @@ public class WebInterface extends AbstractService {
 	 *
 	 * @return The node’s session manager
 	 */
-	public SessionManager sessionManager() {
+	public SessionManager getSessionManager() {
 		try {
 			return sonePlugin.pluginRespirator().getSessionManager(new URI("/"));
 		} catch (URISyntaxException use1) {
@@ -143,27 +143,25 @@ public class WebInterface extends AbstractService {
 	 *
 	 * @return The form password
 	 */
-	public String formPassword() {
+	public String getFormPassword() {
 		return formPassword;
 	}
 
 	//
-	// SERVICE METHODS
+	// ACTIONS
 	//
 
 	/**
-	 * {@inheritDoc}
+	 * Starts the web interface and registers all toadlets.
 	 */
-	@Override
-	protected void serviceStart() {
+	public void start() {
 		registerToadlets();
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Stops the web interface and unregisters all toadlets.
 	 */
-	@Override
-	protected void serviceStop() {
+	public void stop() {
 		unregisterToadlets();
 	}
 
@@ -177,12 +175,13 @@ public class WebInterface extends AbstractService {
 	private void registerToadlets() {
 		DefaultTemplateFactory templateFactory = new DefaultTemplateFactory();
 		templateFactory.addAccessor(Object.class, new ReflectionAccessor());
-		templateFactory.addAccessor(Sone.class, new SoneAccessor(core()));
-		templateFactory.addAccessor(Post.class, new PostAccessor(core()));
-		templateFactory.addAccessor(Reply.class, new ReplyAccessor(core()));
-		templateFactory.addAccessor(Identity.class, new IdentityAccessor(core()));
+		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(l10n()));
+		templateFactory.addFilter("l10n", new L10nFilter(getL10n()));
 		templateFactory.addFilter("substring", new SubstringFilter());
 		templateFactory.addFilter("xml", new XmlFilter());
 		templateFactory.addFilter("change", new RequestChangeFilter());
@@ -335,4 +334,5 @@ public class WebInterface extends AbstractService {
 		}
 
 	}
+
 }