@ -158,12 +158,16 @@ public class RadioPlayer implements Device {
@Override
public String chooseItem ( int itemNr ) {
if ( itemNr > savedPlaylist . size ( ) ) {
playedStation = savedPlaylist . get ( savedPlaylist . size ( ) - 1 ) ;
if ( itemNr > savedPlaylist . size ( ) ) {
playedStation = savedPlaylist . get ( savedPlaylist . size ( ) - 1 ) ;
return ( "Radio is playing station: 0" + savedPlaylist . size ( ) + " " + this . playedStation + " from saved playlist" ) ;
} else {
} else if ( itemNr < 1 ) {
playedStation = savedPlaylist . get ( 0 ) ;
return ( "Radio is playing station: 01 " + this . playedStation + " from saved playlist" ) ;
} else {
playedStation = savedPlaylist . get ( itemNr - 1 ) ;
return ( "Radio is playing station: 0" + ( savedPlaylist . indexOf ( playedStation ) + 1 ) + " " + this . playedStation + " from saved playlist" ) ;
}
}
@ -214,7 +218,7 @@ public class RadioPlayer implements Device {
}
public String changeToSavedPlaylist ( ) {
if ( regionPlaylist . contains ( playedStation ) ) {
if ( regionPlaylist . contains ( playedStation ) ) {
playedStation = savedPlaylist . get ( 0 ) ;
regionPlaylist . clear ( ) ;
return "Playlist switched now playing station: 0" + ( savedPlaylist . indexOf ( playedStation ) + 1 ) + " " + this . playedStation + " from saved playlist" ;
@ -224,16 +228,15 @@ public class RadioPlayer implements Device {
public String changeOrderInSavedPlaylist ( int nr ) {
String station = playedStation ;
if ( ( nr - 1 ) > savedPlaylist . size ( ) ) {
if ( ( nr - 1 ) > savedPlaylist . size ( ) ) {
savedPlaylist . remove ( playedStation ) ;
savedPlaylist . add ( savedPlaylist . size ( ) , station ) ;
return "Station " + playedStation + " is now on place 0" + ( savedPlaylist . size ( ) + 1 ) + "in saved playlist" ;
} else if ( nr < 0 ) {
savedPlaylist . add ( savedPlaylist . size ( ) , station ) ;
return "Station " + playedStation + " is now on place 0" + ( savedPlaylist . size ( ) + 1 ) + "in saved playlist" ;
} else if ( nr < 0 ) {
savedPlaylist . remove ( playedStation ) ;
savedPlaylist . add ( 0 , station ) ;
return "Station " + playedStation + " is now on place 01 in saved playlist" ;
}
else {
savedPlaylist . add ( 0 , station ) ;
return "Station " + playedStation + " is now on place 01 in saved playlist" ;
} else {
savedPlaylist . remove ( playedStation ) ;
savedPlaylist . add ( nr - 1 , station ) ;
return "Station " + playedStation + " is now on place 0" + nr + "in saved playlist" ;