Commit c1c49d23 authored by Trisha Gee's avatar Trisha Gee
Browse files

[Ch10c] Remove gender

parent 07159a29
Loading
Loading
Loading
Loading
+24 −29
Changes for src/main/java/ch10c/JukeboxV3.java: 24 added lines, 29 removed lines.
Original line number Diff line number Diff line
@@ -68,43 +68,41 @@ class SongV3 {
  String band;
  String genre;
  int year;
  String gender;

  SongV3() { }

  SongV3(int id, String title, String band, String genre, int year, String gender) {
  SongV3(int id, String title, String band, String genre, int year) {
    this.id = id;
    this.title = title;
    this.band = band;
    this.genre = genre;
    this.year = year;
    this.gender = gender;
  }

  public ArrayList<SongV3> getSongsV3() {
    ArrayList<SongV3> mySongs = new ArrayList<>();
    mySongs.add(new SongV3(1, "Cassidy", "Grateful Dead", "Rock", 1972, "m"));
    mySongs.add(new SongV3(2, "Crazy Diamond", "Pink Floyd", "Rock", 1975, "m"));
    mySongs.add(new SongV3(3, "Rosen Im Asphalt", "Schnauss", "Electronic", 2017, "i"));
    mySongs.add(new SongV3(4, "Havana", "Cabillo", "R&B", 2017, "f"));
    mySongs.add(new SongV3(5, "Take Five", "Brubeck", "Jazz", 1959, "i"));
    mySongs.add(new SongV3(6, "Jumpin' Jack Flash", "Stones", "rock", 1964, "m"));
    mySongs.add(new SongV3(7, "Silence", "Delerium", "Trance", 1999, "f"));
    mySongs.add(new SongV3(8, "Lochs of Dread", "Strength in Numbers", "Newgrass", 1989, "i"));
    mySongs.add(new SongV3(9, "No Woman No Cry", "Marley", "Reggae", 1974, "m"));
    mySongs.add(new SongV3(10, "If I Ain't Got You", "Keys", "R&B", 2003, "f"));
    mySongs.add(new SongV3(11, "Don't Know Why", "Jones", "Jazz", 2002, "f"));
    mySongs.add(new SongV3(12, "Smooth", "Santana", "Rock", 1999, "m"));
    mySongs.add(new SongV3(13, "Come Together", "Beatles", "Rock", 1969, "m"));
    mySongs.add(new SongV3(14, "Love on a Real Train", "Tangerine Dream", "Electronic", 1984, "i"));
    mySongs.add(new SongV3(15, "Smoothie Song, Live", "Nickel Creek", "Newgrass", 2021, "i"));
    mySongs.add(new SongV3(16, "Switch Up", "Protoje", "Reggae", 2020, "m"));
    mySongs.add(new SongV3(17, "Stomp and Buck Dance", "Crusaders", "Jazz", 1974, "i"));
    mySongs.add(new SongV3(18, "Nature's Kingdom", "Delerium", "Trance", 2000, "f"));
    mySongs.add(new SongV3(19, "Eyes of the World", "Grateful Dead", "Rock", 1973, "m"));
    mySongs.add(new SongV3(20, "Midnight Train to Georgia", "Knight", "R&B", 1976, "f"));
    mySongs.add(new SongV3(21, "Black Clouds", "String Cheese", "Newgrass", 1997, "m"));
    mySongs.add(new SongV3(22, "What's Going On", "Gaye", "R&B", 1971, "m"));
    mySongs.add(new SongV3(1, "Cassidy", "Grateful Dead", "Rock", 1972));
    mySongs.add(new SongV3(2, "Crazy Diamond", "Pink Floyd", "Rock", 1975));
    mySongs.add(new SongV3(3, "Rosen Im Asphalt", "Schnauss", "Electronic", 2017));
    mySongs.add(new SongV3(4, "Havana", "Cabillo", "R&B", 2017));
    mySongs.add(new SongV3(5, "Take Five", "Brubeck", "Jazz", 1959));
    mySongs.add(new SongV3(6, "Jumpin' Jack Flash", "Stones", "rock", 1964));
    mySongs.add(new SongV3(7, "Silence", "Delerium", "Trance", 1999));
    mySongs.add(new SongV3(8, "Lochs of Dread", "Strength in Numbers", "Newgrass", 1989));
    mySongs.add(new SongV3(9, "No Woman No Cry", "Marley", "Reggae", 1974));
    mySongs.add(new SongV3(10, "If I Ain't Got You", "Keys", "R&B", 2003));
    mySongs.add(new SongV3(11, "Don't Know Why", "Jones", "Jazz", 2002));
    mySongs.add(new SongV3(12, "Smooth", "Santana", "Rock", 1999));
    mySongs.add(new SongV3(13, "Come Together", "Beatles", "Rock", 1969));
    mySongs.add(new SongV3(14, "Love on a Real Train", "Tangerine Dream", "Electronic", 1984));
    mySongs.add(new SongV3(15, "Smoothie Song, Live", "Nickel Creek", "Newgrass", 2021));
    mySongs.add(new SongV3(16, "Switch Up", "Protoje", "Reggae", 2020));
    mySongs.add(new SongV3(17, "Stomp and Buck Dance", "Crusaders", "Jazz", 1974));
    mySongs.add(new SongV3(18, "Nature's Kingdom", "Delerium", "Trance", 2000));
    mySongs.add(new SongV3(19, "Eyes of the World", "Grateful Dead", "Rock", 1973));
    mySongs.add(new SongV3(20, "Midnight Train to Georgia", "Knight", "R&B", 1976));
    mySongs.add(new SongV3(21, "Black Clouds", "String Cheese", "Newgrass", 1997));
    mySongs.add(new SongV3(22, "What's Going On", "Gaye", "R&B", 1971));

    return mySongs;
  }
@@ -124,11 +122,8 @@ class SongV3 {
  public int getYear() {
    return year;
  }
  public String getGender() {
    return gender;
  }
  public String toString() {
    return(id + ": " + title + ", " + band + ", " + genre + ", " + year + ", " + gender + "\n");
    return(id + ": " + title + ", " + band + ", " + genre + ", " + year + "\n");
  }
}