[Ch10c] Removing BPM. (8fff7571) · Commits · examples / Head First Java 3rd Edition

src/main/java/ch10c/JukeboxData.java

+22 −22

Changes for src/main/java/ch10c/JukeboxData.java: 22 added lines, 22 removed lines.
Original line number	Diff line number	Diff line
		@@ -14,28 +14,28 @@ public class JukeboxData {

		public List<Song> getSongs() {
		return List.of(
		new Song("$10", "Hitchhiker", 140, "Electronic", 2016, 183),
		new Song("Havana", "Camila Cabello", 105, "R&B", 2017, 324),
		new Song("Cassidy", "Grateful Dead", 158, "Rock", 1972, 123),
		new Song("50 ways", "Paul Simon", 102, "Soft Rock", 1975, 199),
		new Song("Hurt", "Nine Inch Nails", 79, "Industrial Rock", 1995, 257),
		new Song("Silence", "Delerium", 98, "Electronic", 1999, 134),
		new Song("Hurt", "Johnny Cash", 91, "Soft Rock", 2002, 392),
		new Song("Watercolour", "Pendulum", 174, "Electronic", 2010, 155),
		new Song("The Outsider", "A Perfect Circle", 113, "Alternative Rock", 2004, 312),
		new Song("With a Little Help from My Friends", "The Beatles", 112, "Rock", 1967, 168),
		new Song("Come Together", "The Beatles", 92, "Blues rock", 1968, 173),
		new Song("Come Together", "The Smokin' Mojo Filters", 176, "Rock", 1995, 165),
		new Song("With a Little Help from My Friends", "Joe Cocker", 72, "Rock", 1968, 46),
		new Song("Immigrant Song", "Karen O", 120, "Industrial Rock", 2011, 12),
		new Song("Breathe", "The Prodigy", 130, "Electronic", 1996, 337),
		new Song("What's Going On", "Gaye", 203, "R&B", 1971, 420),
		new Song("Hallucinate", "Dua Lipa", 122, "Pop", 2020, 75),
		new Song("Walk Me Home", "P!nk", 88, "Pop", 2019, 459),
		new Song("I am not a woman, I'm a god", "Halsey", 180, "Alternative Rock", 2021, 384),
		new Song("Pasos de cero", "Pablo Alborán", 99, "Latin", 2014, 117),
		new Song("Smooth", "Santana", 116, "Latin", 1999, 244),
		new Song("Immigrant song", "Led Zeppelin", 112, "Rock", 1970, 484));
		new Song("$10", "Hitchhiker", "Electronic", 2016, 183),
		new Song("Havana", "Camila Cabello", "R&B", 2017, 324),
		new Song("Cassidy", "Grateful Dead", "Rock", 1972, 123),
		new Song("50 ways", "Paul Simon", "Soft Rock", 1975, 199),
		new Song("Hurt", "Nine Inch Nails", "Industrial Rock", 1995, 257),
		new Song("Silence", "Delerium", "Electronic", 1999, 134),
		new Song("Hurt", "Johnny Cash", "Soft Rock", 2002, 392),
		new Song("Watercolour", "Pendulum", "Electronic", 2010, 155),
		new Song("The Outsider", "A Perfect Circle", "Alternative Rock", 2004, 312),
		new Song("With a Little Help from My Friends", "The Beatles", "Rock", 1967, 168),
		new Song("Come Together", "The Beatles", "Blues rock", 1968, 173),
		new Song("Come Together", "The Smokin' Mojo Filters", "Rock", 1995, 165),
		new Song("With a Little Help from My Friends", "Joe Cocker", "Rock", 1968, 46),
		new Song("Immigrant Song", "Karen O", "Industrial Rock", 2011, 12),
		new Song("Breathe", "The Prodigy", "Electronic", 1996, 337),
		new Song("What's Going On", "Gaye", "R&B", 1971, 420),
		new Song("Hallucinate", "Dua Lipa", "Pop", 2020, 75),
		new Song("Walk Me Home", "P!nk", "Pop", 2019, 459),
		new Song("I am not a woman, I'm a god", "Halsey", "Alternative Rock", 2021, 384),
		new Song("Pasos de cero", "Pablo Alborán", "Latin", 2014, 117),
		new Song("Smooth", "Santana", "Latin", 1999, 244),
		new Song("Immigrant song", "Led Zeppelin", "Rock", 1970, 484));
		}

		}

src/main/java/ch10c/Song.java

+1 −8

Changes for src/main/java/ch10c/Song.java: 1 added line, 8 removed lines.
Original line number	Diff line number	Diff line
		@@ -3,15 +3,13 @@ package ch10c;
		public class Song {
		private final String title;
		private final String artist;
		private final int bpm;
		private final String genre;
		private final int year;
		private final int timesPlayed;

		public Song(String title, String artist, int bpm, String genre, int year, int timesPlayed) {
		public Song(String title, String artist, String genre, int year, int timesPlayed) {
		this.title = title;
		this.artist = artist;
		this.bpm = bpm;
		this.genre = genre;
		this.year = year;
		this.timesPlayed = timesPlayed;
		@@ -29,10 +27,6 @@ public class Song {
		return artist;
		}

		public int getBpm() {
		return bpm;
		}

		public String getGenre() {
		return genre;
		}
		@@ -46,7 +40,6 @@ public class Song {
		return "Song{" +
		"title='" + title + '\'' +
		", artist='" + artist + '\'' +
		", bpm=" + bpm +
		", genre='" + genre + '\'' +
		", year=" + year +
		", timesPlayed=" + timesPlayed +