markil3/UniversalMusicPlayer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refines the local provider a bit

Browse Source
This commit is contained in:
Markil3
2021-08-15 15:27:44 -06:00
parent e5ab98345f
commit 76594b279c
6 changed files with 76 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
interface/src/main/java/edu/regis/universeplayer/data/Song.java
View File

@@ -21,13 +21,13 @@ public abstract class Song implements Comparable<Song>, Serializable
* A reference to the album this song is part of.
*/
public Album album;
@Override
public int compareTo(Song o)
{
if (o != null)
{
int comp = this.album.compareTo(o.album);
int comp = this.album != null ? this.album.compareTo(o.album) : o.album != null ? 1 : 0;
if (comp == 0)
{
comp = Integer.compare(this.disc, o.disc);
@@ -36,7 +36,7 @@ public abstract class Song implements Comparable<Song>, Serializable
comp = Integer.compare(this.trackNum, o.trackNum);
if (comp == 0)
{
comp = this.title.compareTo(o.title);
comp = this.title != null ? this.title.compareTo(o.title) : o.title != null ? 1 : 0;
}
}
}