From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sun, 14 Nov 2010 14:55:27 +0000 (+0100)
Subject: Remove obsolete notification accessor.
X-Git-Tag: 0.3-RC1~77
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=40e29fa1abc0d1da75831d69d4cc9f52601a4045;p=Sone.git

Remove obsolete notification accessor.
---

diff --git a/src/main/java/net/pterodactylus/sone/template/NotificationAccessor.java b/src/main/java/net/pterodactylus/sone/template/NotificationAccessor.java
deleted file mode 100644
index 22c53c3..0000000
--- a/src/main/java/net/pterodactylus/sone/template/NotificationAccessor.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Sone - NotificationAccessor.java - Copyright © 2010 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.pterodactylus.sone.template;
-
-import java.io.IOException;
-import java.io.StringWriter;
-
-import net.pterodactylus.util.notify.Notification;
-import net.pterodactylus.util.template.DataProvider;
-import net.pterodactylus.util.template.ReflectionAccessor;
-
-/**
- * Adds additional properties to a {@link Notification}.
- * <dl>
- * <dd>render</dd>
- * <dt>Returns the rendered notification.</dt>
- * </dl>
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class NotificationAccessor extends ReflectionAccessor {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Object get(DataProvider dataProvider, Object object, String member) {
-		Notification notification = (Notification) object;
-		if ("render".equals(member)) {
-			StringWriter stringWriter = new StringWriter();
-			try {
-				notification.render(stringWriter);
-			} catch (IOException ioe1) {
-				/* TODO - log. */
-				/* ignore. */
-			}
-			return stringWriter.toString();
-		}
-		return super.get(dataProvider, object, member);
-	}
-
-}
diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 9dce6a7..bd12d5b 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -40,7 +40,6 @@ import net.pterodactylus.sone.template.CollectionAccessor;
 import net.pterodactylus.sone.template.CssClassNameFilter;
 import net.pterodactylus.sone.template.GetPagePlugin;
 import net.pterodactylus.sone.template.IdentityAccessor;
-import net.pterodactylus.sone.template.NotificationAccessor;
 import net.pterodactylus.sone.template.NotificationManagerAccessor;
 import net.pterodactylus.sone.template.PostAccessor;
 import net.pterodactylus.sone.template.ReplyAccessor;
@@ -63,7 +62,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.notify.Notification;
 import net.pterodactylus.util.notify.NotificationManager;
 import net.pterodactylus.util.notify.TemplateNotification;
 import net.pterodactylus.util.template.DateFilter;
@@ -121,7 +119,6 @@ public class WebInterface {
 		templateFactory.addAccessor(Post.class, new PostAccessor(getCore()));
 		templateFactory.addAccessor(Reply.class, new ReplyAccessor(getCore()));
 		templateFactory.addAccessor(Identity.class, new IdentityAccessor(getCore()));
-		templateFactory.addAccessor(Notification.class, new NotificationAccessor());
 		templateFactory.addAccessor(NotificationManager.class, new NotificationManagerAccessor());
 		templateFactory.addFilter("date", new DateFilter());
 		templateFactory.addFilter("l10n", new L10nFilter(getL10n()));
diff --git a/src/main/resources/templates/include/head.html b/src/main/resources/templates/include/head.html
index cf70729..75485bf 100644
--- a/src/main/resources/templates/include/head.html
+++ b/src/main/resources/templates/include/head.html
@@ -224,7 +224,7 @@
 							<button type="submit"><%= Notification.Button.Dismiss|l10n|html></button>
 						</form>
 					<%/if>
-					<% notification.render>
+					<% notification>
 				</div>
 			<%/foreach>
 		</div>