[Ch10b] Moving on to SongV2. Moving MockSongs into its own file; adding getSongsV2. (7904608f) · Commits · examples / Head First Java 3rd Edition

src/main/java/ch10b/Jukebox1.java

+0 −16

Changes for src/main/java/ch10b/Jukebox1.java: 0 added lines, 16 removed lines.
Original line number	Diff line number	Diff line
		@@ -15,19 +15,3 @@ public class Jukebox1 {
		System.out.println(songList);
		}
		}

		// Below is the "mock" code. A stand in for the actual
		// I/O code that the other programmer will provide later

		class MockSongs {
		public static List<String> getSongStrings() {
		List<String> songs = new ArrayList<>();
		songs.add("somersault");
		songs.add("cassidy");
		songs.add("$10");
		songs.add("havana");
		songs.add("Cassidy");
		songs.add("50 Ways");
		return songs;
		}
		}
		No newline at end of file

+1 −2

Changes for src/main/java/ch10b/Jukebox3.java: 1 added line, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -5,14 +5,13 @@ import java.util.List;
		public class Jukebox3 {

		List<SongV2> mySongs;
		MockSongV2File mockFile = new MockSongV2File();

		public static void main(String[] args) {
		new Jukebox3().go();
		}

		public void go() {
		mySongs = mockFile.getSongsV2();
		mySongs = MockSongs.getSongsV2();
		System.out.println(mySongs);
		// This line intentionally fails compilation
		// Collections.sort(mySongs);

deleted100644 → 0

+0 −17

Changes for src/main/java/ch10b/MockSongFile.java: 0 added lines, 17 removed lines.
Original line number	Diff line number	Diff line
		package ch10b;

		import ch10b.SongV3;

		import java.util.List;

		class MockSongFile {

		public List<SongV3> getSongsV3() {
		return List.of(new SongV3("somersault", "zero 7", "50"),
		new SongV3("cassidy", "grateful dead", "65"),
		new SongV3("$10", "hitchhiker", "80"),
		new SongV3("havana", "cabello", "60"),
		new SongV3("Cassidy", "grateful dead", "65"),
		new SongV3("50 ways", "simon", "70"));
		}
		}
		No newline at end of file

+0 −15

Changes for src/main/java/ch10b/MockSongV2File.java: 0 added lines, 15 removed lines.
Original line number	Diff line number	Diff line
		package ch10b;

		import ch10b.SongV2;
		import ch10b.SongV3;

		import java.util.ArrayList;
		import java.util.List;

		public class MockSongV2File {

		public List<SongV2> getSongsV2() {
		ArrayList<SongV2> mySongs = new ArrayList<SongV2>();
		mySongs.add(new SongV2("somersault", "zero 7", "50"));
		mySongs.add(new SongV2("cassidy", "grateful dead", "65"));
		mySongs.add(new SongV2("$10", "hitchhiker", "80"));

		mySongs.add(new SongV2("havana", "cabello", "60"));
		mySongs.add(new SongV2("Cassidy", "grateful dead", "65"));
		mySongs.add(new SongV2("50 ways", "simon", "70"));
		return mySongs;
		}

		public List<SongV3> getSongsV3() {
		ArrayList<SongV3> mySongs = new ArrayList<>();
		mySongs.add(new SongV3("somersault", "zero 7", "50"));

0 → 100644

+30 −0

Changes for src/main/java/ch10b/MockSongs.java: 30 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		package ch10b;

		import java.util.ArrayList;
		import java.util.List;

		class MockSongs {
		public static List<String> getSongStrings() {
		List<String> songs = new ArrayList<>();
		songs.add("somersault");
		songs.add("cassidy");
		songs.add("$10");
		songs.add("havana");
		songs.add("Cassidy");
		songs.add("50 Ways");
		return songs;
		}

		public static List<SongV2> getSongsV2() {
		List<SongV2> mySongs = new ArrayList<>();
		mySongs.add(new SongV2("somersault", "zero 7", "50"));
		mySongs.add(new SongV2("cassidy", "grateful dead", "65"));
		mySongs.add(new SongV2("$10", "hitchhiker", "80"));

		mySongs.add(new SongV2("havana", "cabello", "60"));
		mySongs.add(new SongV2("Cassidy", "grateful dead", "65"));
		mySongs.add(new SongV2("50 ways", "simon", "70"));
		return mySongs;
		}

		}