From 28da2cb408dc4b8cf5670e0ee1d30f05e20bce8e Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Fri, 13 Jun 2014 18:03:33 -0700 Subject: Pull back a little on multi-disc replacement since some have bad album data --- src/github/daneren2005/dsub/domain/MusicDirectory.java | 8 ++++++++ src/github/daneren2005/dsub/view/AlbumCell.java | 6 +----- src/github/daneren2005/dsub/view/AlbumView.java | 6 +----- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/github/daneren2005') diff --git a/src/github/daneren2005/dsub/domain/MusicDirectory.java b/src/github/daneren2005/dsub/domain/MusicDirectory.java index faedb25e..c284ba00 100644 --- a/src/github/daneren2005/dsub/domain/MusicDirectory.java +++ b/src/github/daneren2005/dsub/domain/MusicDirectory.java @@ -249,6 +249,14 @@ public class MusicDirectory implements Serializable { return album; } + public String getAlbumDisplay() { + if(album != null && title.startsWith("Disc ")) { + return album; + } else { + return title; + } + } + public void setAlbum(String album) { this.album = album; } diff --git a/src/github/daneren2005/dsub/view/AlbumCell.java b/src/github/daneren2005/dsub/view/AlbumCell.java index 37914783..879cedf1 100644 --- a/src/github/daneren2005/dsub/view/AlbumCell.java +++ b/src/github/daneren2005/dsub/view/AlbumCell.java @@ -66,11 +66,7 @@ public class AlbumCell extends UpdateView { protected void setObjectImpl(Object obj1, Object obj2) { this.album = (MusicDirectory.Entry) obj1; - if(album.getAlbum() == null) { - titleView.setText(album.getTitle()); - } else { - titleView.setText(album.getAlbum()); - } + titleView.setText(album.getAlbumDisplay()); String artist = ""; if(showArtist) { artist = album.getArtist(); diff --git a/src/github/daneren2005/dsub/view/AlbumView.java b/src/github/daneren2005/dsub/view/AlbumView.java index 910cac07..063c7fc2 100644 --- a/src/github/daneren2005/dsub/view/AlbumView.java +++ b/src/github/daneren2005/dsub/view/AlbumView.java @@ -70,11 +70,7 @@ public class AlbumView extends UpdateView { protected void setObjectImpl(Object obj1, Object obj2) { this.album = (MusicDirectory.Entry) obj1; - if(album.getAlbum() == null) { - titleView.setText(album.getTitle()); - } else { - titleView.setText(album.getAlbum()); - } + titleView.setText(album.getAlbumDisplay()); String artist = album.getArtist(); if(artist == null) { artist = ""; -- cgit v1.2.3