diff options
author | Scott Jackson <daneren2005@gmail.com> | 2016-03-15 17:20:00 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2016-03-15 17:20:00 -0700 |
commit | 1bd7596ce4a901aaba1e2cc28e90d518bfb43029 (patch) | |
tree | 56f40d9292bdc4fedfbdc7cd30feafb2135ca06f /app/src/main/java/github/daneren2005/dsub/domain/Artist.java | |
parent | a9fd0ce825e3b6e305c03400865021ba9a3e906a (diff) | |
download | dsub-1bd7596ce4a901aaba1e2cc28e90d518bfb43029.tar.gz dsub-1bd7596ce4a901aaba1e2cc28e90d518bfb43029.tar.bz2 dsub-1bd7596ce4a901aaba1e2cc28e90d518bfb43029.zip |
Use Collators to make sure special characters are sorted correctly
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 | 16 |
1 files changed, 6 insertions, 10 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 fddafd65..5809146d 100644 --- a/app/src/main/java/github/daneren2005/dsub/domain/Artist.java +++ b/app/src/main/java/github/daneren2005/dsub/domain/Artist.java @@ -21,9 +21,11 @@ package github.daneren2005.dsub.domain; import android.util.Log; import java.io.Serializable; +import java.text.Collator; import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Locale; /** * @author Sindre Mehus @@ -119,9 +121,12 @@ public class Artist implements Serializable { public static class ArtistComparator implements Comparator<Artist> { private String[] ignoredArticles; + private Collator collator; public ArtistComparator(String[] ignoredArticles) { this.ignoredArticles = ignoredArticles; + this.collator = Collator.getInstance(Locale.US); + this.collator.setStrength(Collator.PRIMARY); } public int compare(Artist lhsArtist, Artist rhsArtist) { @@ -134,15 +139,6 @@ public class Artist implements Serializable { String lhs = lhsArtist.getName().toLowerCase(); String rhs = rhsArtist.getName().toLowerCase(); - char lhs1 = lhs.charAt(0); - char rhs1 = rhs.charAt(0); - - if (Character.isDigit(lhs1) && !Character.isDigit(rhs1)) { - return -1; - } else if (Character.isDigit(rhs1) && !Character.isDigit(lhs1)) { - return 1; - } - for (String article : ignoredArticles) { int index = lhs.indexOf(article.toLowerCase() + " "); if (index == 0) { @@ -154,7 +150,7 @@ public class Artist implements Serializable { } } - return lhs.compareTo(rhs); + return collator.compare(lhs, rhs); } } |