diff options
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/domain/Artist.java')
| -rw-r--r-- | app/src/main/java/github/daneren2005/dsub/domain/Artist.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/Artist.java b/app/src/main/java/github/daneren2005/dsub/domain/Artist.java index ff4d86ce..1601047a 100644 --- a/app/src/main/java/github/daneren2005/dsub/domain/Artist.java +++ b/app/src/main/java/github/daneren2005/dsub/domain/Artist.java @@ -20,9 +20,10 @@ package github.daneren2005.dsub.domain; import android.util.Log; +import androidx.annotation.NonNull; + import java.io.Serializable; import java.text.Collator; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Locale; @@ -32,7 +33,6 @@ import java.util.Locale; */ public class Artist implements Serializable { private static final String TAG = Artist.class.getSimpleName(); - public static final String ROOT_ID = "-1"; public static final String MISSING_ID = "-2"; private String id; @@ -114,14 +114,15 @@ public class Artist implements Serializable { return id.hashCode(); } - @Override + @NonNull + @Override public String toString() { return name; } public static class ArtistComparator implements Comparator<Artist> { - private String[] ignoredArticles; - private Collator collator; + private final String[] ignoredArticles; + private final Collator collator; public ArtistComparator(String[] ignoredArticles) { this.ignoredArticles = ignoredArticles; @@ -150,7 +151,7 @@ public class Artist implements Serializable { public static void sort(List<Artist> artists, String[] ignoredArticles) { try { - Collections.sort(artists, new ArtistComparator(ignoredArticles)); + artists.sort(new ArtistComparator(ignoredArticles)); } catch (Exception e) { Log.w(TAG, "Failed to sort artists", e); } |