🔀 Merge branch 'release/v82'

[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 0771abd..f960b08 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–2016 David Roden
+ * Sone - CollectionAccessor.java - Copyright © 2010–2020 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,12 +17,13 @@
 
 package net.pterodactylus.sone.template;
 
+import static net.pterodactylus.sone.data.SoneKt.*;
+
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
-import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.*;
 import net.pterodactylus.util.template.Accessor;
 import net.pterodactylus.util.template.ReflectionAccessor;
 import net.pterodactylus.util.template.TemplateContext;
@@ -35,8 +36,6 @@ import net.pterodactylus.util.template.TemplateContext;
  * <dt>Returns the nice names of all {@link Sone}s in the collection, sorted
  * ascending by their nice names.</dt>
  * </dl>
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class CollectionAccessor extends ReflectionAccessor {
 
@@ -47,14 +46,14 @@ public class CollectionAccessor extends ReflectionAccessor {
        public Object get(TemplateContext templateContext, Object object, String member) {
                Collection<?> collection = (Collection<?>) object;
                if (member.equals("soneNames")) {
-                       List<Sone> sones = new ArrayList<Sone>();
+                       List<Sone> sones = new ArrayList<>();
                        for (Object sone : collection) {
                                if (!(sone instanceof Sone)) {
                                        continue;
                                }
                                sones.add((Sone) sone);
                        }
-                       Collections.sort(sones, Sone.NICE_NAME_COMPARATOR);
+                       sones.sort(niceNameComparator());
                        StringBuilder soneNames = new StringBuilder();
                        for (Sone sone : sones) {
                                if (soneNames.length() > 0) {