From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 12 Jan 2011 09:28:44 +0000 (+0100)
Subject: Move “fields” functionality into Profile, remove ProfileAccessor.
X-Git-Tag: 0.4^2~9^2~44
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=3abc078471d7e7516599eda01de011a23c328d63

Move “fields” functionality into Profile, remove ProfileAccessor.
---

diff --git a/src/main/java/net/pterodactylus/sone/data/Profile.java b/src/main/java/net/pterodactylus/sone/data/Profile.java
index 8dec42a..64aeae4 100644
--- a/src/main/java/net/pterodactylus/sone/data/Profile.java
+++ b/src/main/java/net/pterodactylus/sone/data/Profile.java
@@ -20,6 +20,7 @@ package net.pterodactylus.sone.data;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -332,10 +333,24 @@ public class Profile implements Fingerprintable {
 	 *
 	 * @return The fields of this profile
 	 */
-	public List<String> getFields() {
+	public List<String> getFieldNames() {
 		return Collections.unmodifiableList(fields);
 	}
 
+	/**
+	 * Returns all field names and their values, ordered the same way
+	 * {@link #getFieldNames()} returns the names of the fields.
+	 *
+	 * @return All field names and values
+	 */
+	public Map<String, String> getFields() {
+		Map<String, String> fields = new LinkedHashMap<String, String>();
+		for (String field : getFieldNames()) {
+			fields.put(field, getField(field));
+		}
+		return fields;
+	}
+
 	//
 	// PRIVATE METHODS
 	//
diff --git a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
deleted file mode 100644
index 52f39dd..0000000
--- a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Sone - ProfileAccessor.java - Copyright © 2011 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.util.LinkedHashMap;
-import java.util.Map;
-
-import net.pterodactylus.sone.data.Profile;
-import net.pterodactylus.util.template.Accessor;
-import net.pterodactylus.util.template.DataProvider;
-import net.pterodactylus.util.template.ReflectionAccessor;
-
-/**
- * {@link Accessor} for {@link Profile}s, especially for the profile fields.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class ProfileAccessor extends ReflectionAccessor {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Object get(DataProvider dataProvider, Object object, String member) {
-		Profile profile = (Profile) object;
-		if ("fields".equals(member)) {
-			Map<String, String> fields = new LinkedHashMap<String, String>();
-			for (String field : profile.getFields()) {
-				fields.put(field, profile.getField(field));
-			}
-			return fields;
-		}
-		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 e18521c..6085ff8 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -36,7 +36,6 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.CoreListener;
 import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.L10nFilter;
@@ -49,7 +48,6 @@ import net.pterodactylus.sone.template.GetPagePlugin;
 import net.pterodactylus.sone.template.IdentityAccessor;
 import net.pterodactylus.sone.template.NotificationManagerAccessor;
 import net.pterodactylus.sone.template.PostAccessor;
-import net.pterodactylus.sone.template.ProfileAccessor;
 import net.pterodactylus.sone.template.ReplyAccessor;
 import net.pterodactylus.sone.template.RequestChangeFilter;
 import net.pterodactylus.sone.template.SoneAccessor;
@@ -161,7 +159,6 @@ public class WebInterface implements CoreListener {
 		templateFactory.addAccessor(Object.class, new ReflectionAccessor());
 		templateFactory.addAccessor(Collection.class, new CollectionAccessor());
 		templateFactory.addAccessor(Sone.class, new SoneAccessor(getCore()));
-		templateFactory.addAccessor(Profile.class, new ProfileAccessor());
 		templateFactory.addAccessor(Post.class, new PostAccessor(getCore(), templateFactory));
 		templateFactory.addAccessor(Reply.class, new ReplyAccessor(getCore(), templateFactory));
 		templateFactory.addAccessor(Identity.class, new IdentityAccessor(getCore()));