diff options
author | Scott Jackson <daneren2005@gmail.com> | 2014-07-25 23:10:15 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2014-07-25 23:10:15 -0700 |
commit | 37e34a9f2a353558904423c96ddc23e2413413f3 (patch) | |
tree | 3442b8b8af104363d20f354bbad8c0ce13c341b7 /src/github | |
parent | 8356e838140c6bb271b138f656a08e2185ec2de5 (diff) | |
download | dsub-37e34a9f2a353558904423c96ddc23e2413413f3.tar.gz dsub-37e34a9f2a353558904423c96ddc23e2413413f3.tar.bz2 dsub-37e34a9f2a353558904423c96ddc23e2413413f3.zip |
#380 Put artist results before albums
Diffstat (limited to 'src/github')
-rw-r--r-- | src/github/daneren2005/dsub/provider/DSubSearchProvider.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/github/daneren2005/dsub/provider/DSubSearchProvider.java b/src/github/daneren2005/dsub/provider/DSubSearchProvider.java index 1da614af..01f08565 100644 --- a/src/github/daneren2005/dsub/provider/DSubSearchProvider.java +++ b/src/github/daneren2005/dsub/provider/DSubSearchProvider.java @@ -102,19 +102,29 @@ public class DSubSearchProvider extends ContentProvider { public int compare(Object lhs, Object rhs) { // Get the closeness of the two objects int left, right; - if (lhs instanceof Artist) { + boolean leftArtist = lhs instanceof Artist; + boolean rightArtist = rhs instanceof Artist; + if (leftArtist) { left = ((Artist) lhs).getCloseness(); } else { left = ((MusicDirectory.Entry) lhs).getCloseness(); } - if (rhs instanceof Artist) { + if (rightArtist) { right = ((Artist) rhs).getCloseness(); } else { right = ((MusicDirectory.Entry) rhs).getCloseness(); } if (left == right) { - return 0; + if(leftArtist && rightArtist) { + return 0; + } else if(leftArtist) { + return -1; + } else if(rightArtist) { + return 1; + } else { + return 0; + } } else if (left > right) { return 1; } else { |