X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FCollectionAccessor.java;h=b9fb346ecaa162367d08a9a3f7a4e435b734b50c;hb=563b924d21a02faa60409d21cc6ec1fd2740347c;hp=10e3ea35373c5345eea9688a4a488af62ce79071;hpb=51cdfee0b350955d9f858adb892f18b2a4fa8ab4;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java b/src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java
index 10e3ea3..b9fb346 100644
--- a/src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Sone - CollectionAccessor.java - Copyright © 2010 David Roden
+ * Sone - CollectionAccessor.java - Copyright © 2010–2013 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
@@ -17,6 +17,10 @@
 
 package net.pterodactylus.sone.template;
 
+import static com.google.common.base.Joiner.on;
+import static com.google.common.collect.FluentIterable.from;
+import static net.pterodactylus.sone.data.Sone.TO_NICE_NAME;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -24,8 +28,10 @@ import java.util.List;
 
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.util.template.Accessor;
-import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.ReflectionAccessor;
+import net.pterodactylus.util.template.TemplateContext;
+
+import com.google.common.base.Joiner;
 
 /**
  * {@link Accessor} for {@link Collection}s that adds a couple of specialized
@@ -40,11 +46,8 @@ import net.pterodactylus.util.template.ReflectionAccessor;
  */
 public class CollectionAccessor extends ReflectionAccessor {
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	public Object get(DataProvider dataProvider, Object object, String member) {
+	public Object get(TemplateContext templateContext, Object object, String member) {
 		if (object == null) {
 			return null;
 		}
@@ -58,16 +61,9 @@ public class CollectionAccessor extends ReflectionAccessor {
 				sones.add((Sone) sone);
 			}
 			Collections.sort(sones, Sone.NICE_NAME_COMPARATOR);
-			StringBuilder soneNames = new StringBuilder();
-			for (Sone sone : sones) {
-				if (soneNames.length() > 0) {
-					soneNames.append(", ");
-				}
-				soneNames.append(SoneAccessor.getNiceName(sone));
-			}
-			return soneNames.toString();
+			return on(", ").join(from(sones).transform(TO_NICE_NAME));
 		}
-		return super.get(dataProvider, object, member);
+		return super.get(templateContext, object, member);
 	}
 
 }