Use Joiner and TO_NICE_NAME to concatenate the Sone names.

[Sone.git] / src / main / java / net / pterodactylus / sone / template / CollectionAccessor.java

diff --git a/src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java b/src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java
index 0fa9129..b9fb346 100644 (file)
--- 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;
@@ -27,6 +31,8 @@ import net.pterodactylus.util.template.Accessor;
 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
  * properties that only work for collections that contain the right types.
@@ -40,9 +46,6 @@ import net.pterodactylus.util.template.TemplateContext;
  */
 public class CollectionAccessor extends ReflectionAccessor {
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public Object get(TemplateContext templateContext, Object object, String member) {
                if (object == null) {
@@ -58,14 +61,7 @@ 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(templateContext, object, member);
        }