X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=42a383fed3c293a6f6b027f859dd809dd99715d4;hb=5d8f3ac133544177412ec3c533e5f5f92a7b1c35;hp=b1c61bb62ffff7007b36534255e26729271eb454;hpb=85aa9c556ef8ac726694f0077a4f8df0bc912e5f;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 b1c61bb..42a383f 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -1,5 +1,5 @@
 /*
- * Sone - WebInterface.java - Copyright © 2010 David Roden
+ * Sone - WebInterface.java - Copyright © 2010–2012 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
@@ -103,18 +103,13 @@ import net.pterodactylus.sone.web.ajax.UntrustAjaxPage;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.sone.web.page.PageToadlet;
 import net.pterodactylus.sone.web.page.PageToadletFactory;
-import net.pterodactylus.util.cache.Cache;
-import net.pterodactylus.util.cache.CacheException;
-import net.pterodactylus.util.cache.CacheItem;
-import net.pterodactylus.util.cache.DefaultCacheItem;
-import net.pterodactylus.util.cache.MemoryCache;
-import net.pterodactylus.util.cache.ValueRetriever;
 import net.pterodactylus.util.collection.SetBuilder;
-import net.pterodactylus.util.filter.Filters;
+import net.pterodactylus.util.collection.filter.Filters;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.notify.NotificationManager;
 import net.pterodactylus.util.notify.TemplateNotification;
+import net.pterodactylus.util.template.ClassPathTemplateProvider;
 import net.pterodactylus.util.template.CollectionSortFilter;
 import net.pterodactylus.util.template.ContainsFilter;
 import net.pterodactylus.util.template.DateFilter;
@@ -122,21 +117,23 @@ import net.pterodactylus.util.template.FormatFilter;
 import net.pterodactylus.util.template.HtmlFilter;
 import net.pterodactylus.util.template.MatchFilter;
 import net.pterodactylus.util.template.ModFilter;
-import net.pterodactylus.util.template.Provider;
+import net.pterodactylus.util.template.PaginationFilter;
 import net.pterodactylus.util.template.ReflectionAccessor;
 import net.pterodactylus.util.template.ReplaceFilter;
 import net.pterodactylus.util.template.StoreFilter;
 import net.pterodactylus.util.template.Template;
-import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.template.TemplateContextFactory;
-import net.pterodactylus.util.template.TemplateException;
 import net.pterodactylus.util.template.TemplateParser;
+import net.pterodactylus.util.template.TemplateProvider;
 import net.pterodactylus.util.template.XmlFilter;
 import net.pterodactylus.util.thread.Ticker;
 import net.pterodactylus.util.version.Version;
 import net.pterodactylus.util.web.RedirectPage;
 import net.pterodactylus.util.web.StaticPage;
 import net.pterodactylus.util.web.TemplatePage;
+
+import com.google.inject.Inject;
+
 import freenet.clients.http.SessionManager;
 import freenet.clients.http.SessionManager.Session;
 import freenet.clients.http.ToadletContainer;
@@ -221,7 +218,7 @@ public class WebInterface implements CoreListener {
 	 * @param sonePlugin
 	 *            The Sone plugin
 	 */
-	@SuppressWarnings("synthetic-access")
+	@Inject
 	public WebInterface(SonePlugin sonePlugin) {
 		this.sonePlugin = sonePlugin;
 		formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
@@ -259,8 +256,9 @@ public class WebInterface implements CoreListener {
 		templateContextFactory.addFilter("in", new ContainsFilter());
 		templateContextFactory.addFilter("unique", new UniqueElementFilter());
 		templateContextFactory.addFilter("mod", new ModFilter());
-		templateContextFactory.addProvider(Provider.TEMPLATE_CONTEXT_PROVIDER);
-		templateContextFactory.addProvider(new ClassPathTemplateProvider());
+		templateContextFactory.addFilter("paginate", new PaginationFilter());
+		templateContextFactory.addProvider(TemplateProvider.TEMPLATE_CONTEXT_PROVIDER);
+		templateContextFactory.addProvider(new ClassPathTemplateProvider(WebInterface.class, "/templates/"));
 		templateContextFactory.addTemplateObject("webInterface", this);
 		templateContextFactory.addTemplateObject("formPassword", formPassword);
 
@@ -378,7 +376,7 @@ public class WebInterface implements CoreListener {
 	 *         currently logged in
 	 */
 	public Sone getCurrentSone(ToadletContext toadletContext, boolean create) {
-		Set<Sone> localSones = getCore().getLocalSones();
+		Collection<Sone> localSones = getCore().getLocalSones();
 		if (localSones.size() == 1) {
 			return localSones.iterator().next();
 		}
@@ -749,7 +747,7 @@ public class WebInterface implements CoreListener {
 				}
 			}
 		} catch (IOException ioe1) {
-			logger.log(Level.WARNING, "Could not parse post text: " + text, ioe1);
+			logger.log(Level.WARNING, String.format("Could not parse post text: %s", text), ioe1);
 		}
 		return Filters.filteredSet(mentionedSones, Sone.LOCAL_SONE_FILTER);
 	}
@@ -795,7 +793,7 @@ public class WebInterface implements CoreListener {
 	 */
 	@Override
 	public void newPostFound(Post post) {
-		boolean isLocal = getCore().isLocalSone(post.getSone());
+		boolean isLocal = post.getSone().isLocal();
 		if (isLocal) {
 			localPostNotification.add(post);
 		} else {
@@ -817,7 +815,7 @@ public class WebInterface implements CoreListener {
 	 */
 	@Override
 	public void newReplyFound(PostReply reply) {
-		boolean isLocal = getCore().isLocalSone(reply.getSone());
+		boolean isLocal = reply.getSone().isLocal();
 		if (isLocal) {
 			localReplyNotification.add(reply);
 		} else {
@@ -1011,66 +1009,4 @@ public class WebInterface implements CoreListener {
 		notificationManager.addNotification(imageInsertFailedNotification);
 	}
 
-	/**
-	 * Template provider implementation that uses
-	 * {@link WebInterface#createReader(String)} to load templates for
-	 * inclusion.
-	 *
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
-	 */
-	private class ClassPathTemplateProvider implements Provider {
-
-		/** Cache for templates. */
-		private final Cache<String, Template> templateCache = new MemoryCache<String, Template>(new ValueRetriever<String, Template>() {
-
-			@Override
-			@SuppressWarnings("synthetic-access")
-			public CacheItem<Template> retrieve(String key) throws CacheException {
-				Template template = findTemplate(key);
-				if (template != null) {
-					return new DefaultCacheItem<Template>(template);
-				}
-				return null;
-			}
-		});
-
-		/**
-		 * {@inheritDoc}
-		 */
-		@Override
-		@SuppressWarnings("synthetic-access")
-		public Template getTemplate(TemplateContext templateContext, String templateName) {
-			try {
-				return templateCache.get(templateName);
-			} catch (CacheException ce1) {
-				logger.log(Level.WARNING, "Could not get template for " + templateName + "!", ce1);
-				return null;
-			}
-		}
-
-		/**
-		 * Locates a template in the class path.
-		 *
-		 * @param templateName
-		 *            The name of the template to load
-		 * @return The loaded template, or {@code null} if no template could be
-		 *         found
-		 */
-		@SuppressWarnings("synthetic-access")
-		private Template findTemplate(String templateName) {
-			Reader templateReader = createReader("/templates/" + templateName);
-			if (templateReader == null) {
-				return null;
-			}
-			Template template = null;
-			try {
-				template = TemplateParser.parse(templateReader);
-			} catch (TemplateException te1) {
-				logger.log(Level.WARNING, "Could not parse template “" + templateName + "” for inclusion!", te1);
-			}
-			return template;
-		}
-
-	}
-
 }