neviyn/musicplayer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed behaviour when stopping playback but the song is no longer in the playlist.

Browse Source
This commit is contained in:
neviyn 2016-03-22 14:47:43 +00:00
parent 8619678023
commit f29be6beee
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/musicplayer/playlist/JTablePlaylist.java
View File

@ -116,8 +116,8 @@ public class JTablePlaylist extends JScrollPane implements IPlaylist {
public void setPlayingSong(Song song){ public void setPlayingSong(Song song){
final int index = getIndex(song); final int index = getIndex(song);
playlistTableModel.setPlayingRow(index); playlistTableModel.setPlayingRow(index);
if(index >= 0) if(index >= 0 && index < playList.getRowCount())
SwingUtilities.invokeLater(() -> playList.setRowSelectionInterval(index, index)); playList.setRowSelectionInterval(index, index);
} }
@Override @Override
@ -125,7 +125,7 @@ public class JTablePlaylist extends JScrollPane implements IPlaylist {
if(getActive().isPresent()) { if(getActive().isPresent()) {
int index = getIndex(getActive().get()); int index = getIndex(getActive().get());
playlistTableModel.setPlayingRow(-1); playlistTableModel.setPlayingRow(-1);
SwingUtilities.invokeLater(() -> playList.setRowSelectionInterval(index, index)); playList.setRowSelectionInterval(index, index);
} }
else else
playlistTableModel.setPlayingRow(-1); playlistTableModel.setPlayingRow(-1);

12
src/test/java/musicplayer/playlist/JTablePlaylistTest.java
View File

@ -117,7 +117,6 @@ public class JTablePlaylistTest {
playlist.addSong(testSong); playlist.addSong(testSong);
playlist.setPlayingSong(testSong); playlist.setPlayingSong(testSong);
assertEquals(testSong, playlist.getActive().get()); assertEquals(testSong, playlist.getActive().get());
Thread.sleep(10); // Wait for Swing thread update propagation
assertEquals(playlist.getIndex(testSong), innerTable.getSelectedRow()); assertEquals(playlist.getIndex(testSong), innerTable.getSelectedRow());
} }
@ -139,6 +138,17 @@ public class JTablePlaylistTest {
assertEquals(playlist.getIndex(testSong), innerTable.getSelectedRow()); assertEquals(playlist.getIndex(testSong), innerTable.getSelectedRow());
} }
@Test
public void testSetStoppedButSongRemovedFromPlaylist() throws Exception {
Song testSong = new Song("1", "1", "test 1", new Artist("test artist"), new Album("test album"), "test genre", "");
playlist.addSong(testSong);
playlist.setPlayingSong(testSong);
playlist.delete(testSong);
playlist.setStopped();
assertEquals(0, playlist.getSongList().size());
assertEquals(-1, innerTable.getSelectedRow());
}
@Test @Test
public void testGetSongList() throws Exception { public void testGetSongList() throws Exception {
Song testSong = new Song("1", "1", "test 1", new Artist("test artist"), new Album("test album"), "test genre", ""); Song testSong = new Song("1", "1", "test 1", new Artist("test artist"), new Album("test album"), "test genre", "");