[Ch10b] Using SongV4 for Jukebox 7 and 8. Really need to simplify what we're doing here (983a0e18) · Commits · examples / Head First Java 3rd Edition

src/main/java/ch10b/Jukebox7.java

+1 −1

Changes for src/main/java/ch10b/Jukebox7.java: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ public class Jukebox7 {
		}

		public void go() {
		List<SongV3> songList = mockFile.getSongs();
		List<SongV4> songList = mockFile.getSongs();
		System.out.println(songList);
		songList.sort((one, two) -> one.getTitle().compareTo(two.getTitle()));
		System.out.println(songList);

+2 −2

Changes for src/main/java/ch10b/Jukebox8.java: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -10,11 +10,11 @@ public class Jukebox8 {
		}

		public void go() {
		List<SongV3> songList = mockFile.getSongs();
		List<SongV4> songList = mockFile.getSongs();
		System.out.println(songList);
		songList.sort((one, two) -> one.getTitle().compareTo(two.getTitle()));
		System.out.println(songList);
		Set<SongV3> songSet = new HashSet<>(songList);
		Set<SongV4> songSet = new HashSet<>(songList);
		System.out.println(songSet);
		}
		}

+9 −9

Changes for src/main/java/ch10b/MockMoreSongs.java: 9 added lines, 9 removed lines.
Original line number	Diff line number	Diff line
		@@ -5,15 +5,15 @@ import java.util.List;

		class MockMoreSongs {

		public List<SongV3> getSongs() {
		List<SongV3> mySongs = new ArrayList<>();
		mySongs.add(new SongV3("somersault", "zero 7", "50"));
		mySongs.add(new SongV3("cassidy", "grateful dead", "65"));
		mySongs.add(new SongV3("$10", "hitchhiker", "80"));
		mySongs.add(new SongV3("havana", "cabello", "60"));
		mySongs.add(new SongV3("$10", "hitchhiker", "80"));
		mySongs.add(new SongV3("cassidy", "grateful dead", "65"));
		mySongs.add(new SongV3("50 ways", "simon", "70"));
		public List<SongV4> getSongs() {
		List<SongV4> mySongs = new ArrayList<>();
		mySongs.add(new SongV4("somersault", "zero 7", "50"));
		mySongs.add(new SongV4("cassidy", "grateful dead", "65"));
		mySongs.add(new SongV4("$10", "hitchhiker", "80"));
		mySongs.add(new SongV4("havana", "cabello", "60"));
		mySongs.add(new SongV4("$10", "hitchhiker", "80"));
		mySongs.add(new SongV4("cassidy", "grateful dead", "65"));
		mySongs.add(new SongV4("50 ways", "simon", "70"));
		return mySongs;
		}
		}

+1 −1

Changes for src/main/java/ch10b/SongV4.java: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ public class SongV4 implements Comparable<SongV4> {

		public boolean equals(Object aSong) {
		SongV4 other = (SongV4) aSong;
		return getTitle().equals(other.getTitle());
		return title.equals(other.getTitle());
		}

		public int hashCode() {