X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=c0d903aaf0fc7ad6556fa635c663680397cac067;hb=7bb372a4dcd7ba15992d54c36e17255b61fafcc5;hp=fce52c4eecc869c91823c65dd6b3d041e276aac6;hpb=05f91b3345e9a6fcba39b805a1b34217f7372eee;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 fce52c4..c0d903a 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -57,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;
@@ -78,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);
@@ -99,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();
 	}
@@ -113,7 +111,7 @@ public class WebInterface extends AbstractService {
 	 *
 	 * @return The Sone core
 	 */
-	public Core core() {
+	public Core getCore() {
 		return sonePlugin.core();
 	}
 
@@ -122,7 +120,7 @@ public class WebInterface extends AbstractService {
 	 *
 	 * @return The node’s l10n helper
 	 */
-	public BaseL10n l10n() {
+	public BaseL10n getL10n() {
 		return sonePlugin.l10n().getBase();
 	}
 
@@ -131,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) {
@@ -145,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();
 	}
 
@@ -180,12 +176,12 @@ public class WebInterface extends AbstractService {
 		DefaultTemplateFactory templateFactory = new DefaultTemplateFactory();
 		templateFactory.addAccessor(Object.class, new ReflectionAccessor());
 		templateFactory.addAccessor(Collection.class, new CollectionAccessor());
-		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(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());
@@ -202,7 +198,6 @@ public class WebInterface extends AbstractService {
 		Template createPostTemplate = templateFactory.createTemplate(createReader("/templates/createPost.html"));
 		Template createReplyTemplate = templateFactory.createTemplate(createReader("/templates/createReply.html"));
 		Template editProfileTemplate = templateFactory.createTemplate(createReader("/templates/editProfile.html"));
-		Template backupProfileTemplate = templateFactory.createTemplate(createReader("/templates/backup.xml"));
 		Template viewSoneTemplate = templateFactory.createTemplate(createReader("/templates/viewSone.html"));
 		Template viewPostTemplate = templateFactory.createTemplate(createReader("/templates/viewPost.html"));
 		Template likePostTemplate = templateFactory.createTemplate(createReader("/templates/like.html"));
@@ -217,14 +212,12 @@ public class WebInterface extends AbstractService {
 		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 helpTemplate = templateFactory.createTemplate(createReader("/templates/help.html"));
 
 		PageToadletFactory pageToadletFactory = new PageToadletFactory(sonePlugin.pluginRespirator().getHLSimpleClient(), "/Sone/");
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new IndexPage(indexTemplate, this), "Index"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateSonePage(createSoneTemplate, this), "CreateSone"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new KnownSonesPage(knownSonesTemplate, this), "KnownSones"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new EditProfilePage(editProfileTemplate, this), "EditProfile"));
-		pageToadlets.add(pageToadletFactory.createPageToadlet(new BackupProfilePage(backupProfileTemplate, this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreatePostPage(createPostTemplate, this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateReplyPage(createReplyTemplate, this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewSonePage(viewSoneTemplate, this)));
@@ -240,7 +233,6 @@ public class WebInterface extends AbstractService {
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new LogoutPage(logoutTemplate, this), "Logout"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new OptionsPage(optionsTemplate, this), "Options"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new AboutPage(aboutTemplate, this, SonePlugin.VERSION), "About"));
-		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("help.html", helpTemplate, "Page.Help.Title", this), "Help"));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("noPermission.html", noPermissionTemplate, "Page.NoPermission.Title", this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new SoneTemplatePage("wotPluginMissing.html", wotPluginMissingTemplate, "Page.WotPluginMissing.Title", this)));
 		pageToadlets.add(pageToadletFactory.createPageToadlet(new StaticPage("css/", "/static/css/", "text/css")));
@@ -338,4 +330,5 @@ public class WebInterface extends AbstractService {
 		}
 
 	}
+
 }