Commit 9dd42096 authored by Trisha Gee's avatar Trisha Gee
Browse files

[Ch10b] Finishing off the Jukebox examples so they're all consistent

parent 06cf7191
Loading
Loading
Loading
Loading
+20 −0
Changes for src/main/java/ch10b/Jukebox10.java: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
package ch10b;

import java.util.*;

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

  public void go() {
    List<SongV4> songList = MockMoreSongs.getSongsV4();
    System.out.println(songList);

    songList.sort((one, two) -> one.getTitle().compareTo(two.getTitle()));
    System.out.println(songList);

    Set<SongV4> songSet = new TreeSet<>(songList);
    System.out.println(songSet);
  }
}
+3 −3
Changes for src/main/java/ch10b/Jukebox7.java: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -3,17 +3,17 @@ package ch10b;
import java.util.*;

public class Jukebox7 {
  private final MockMoreSongs mockFile = new MockMoreSongs();

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

  public void go() {
    List<SongV4> songList = mockFile.getSongs();
    List<SongV3> songList = MockMoreSongs.getSongsV3();
    System.out.println(songList);

    songList.sort((one, two) -> one.getTitle().compareTo(two.getTitle()));
    System.out.println(songList);

    songList.sort((one, two) -> one.getArtist().compareTo(two.getArtist()));
    System.out.println(songList);
  }
+4 −4
Changes for src/main/java/ch10b/Jukebox8.java: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -3,18 +3,18 @@ package ch10b;
import java.util.*;

public class Jukebox8 {
  private final MockMoreSongs mockFile = new MockMoreSongs();

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

  public void go() {
    List<SongV4> songList = mockFile.getSongs();
    List<SongV3> songList = MockMoreSongs.getSongsV3();
    System.out.println(songList);

    songList.sort((one, two) -> one.getTitle().compareTo(two.getTitle()));
    System.out.println(songList);
    Set<SongV4> songSet = new HashSet<>(songList);

    Set<SongV3> songSet = new HashSet<>(songList);
    System.out.println(songSet);
  }
}
+7 −5
Changes for src/main/java/ch10b/Jukebox9.java: 7 added lines, 5 removed lines.
Original line number Diff line number Diff line
package ch10b;

import java.util.*;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

public class Jukebox9 {
  private final MockMoreSongs mockFile = new MockMoreSongs();

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

  public void go() {
    List<SongV4> songList = mockFile.getSongs();
    List<SongV4> songList = MockMoreSongs.getSongsV4();
    System.out.println(songList);

    songList.sort((one, two) -> one.getTitle().compareTo(two.getTitle()));
    System.out.println(songList);
    Set<SongV4> songSet = new TreeSet<>(songList);

    Set<SongV4> songSet = new HashSet<>(songList);
    System.out.println(songSet);
  }
}
+13 −1
Changes for src/main/java/ch10b/MockMoreSongs.java: 13 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,19 @@ import java.util.List;

class MockMoreSongs {

  public List<SongV4> getSongs() {
  public static List<SongV3> getSongsV3() {
    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"));
    return mySongs;
  }

  public static List<SongV4> getSongsV4() {
    List<SongV4> mySongs = new ArrayList<>();
    mySongs.add(new SongV4("somersault", "zero 7", "50"));
    mySongs.add(new SongV4("cassidy", "grateful dead", "65"));
Loading