X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FCollectionAccessor.java;h=b9fb346ecaa162367d08a9a3f7a4e435b734b50c;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=12b4bc21f9b44acf7586c9af3fa85ffe91fcba94;hpb=6f019de1d4d9742981d851ac3c9097cca8bff58e;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 12b4bc2..b9fb346 100644 --- a/src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java @@ -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); }