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

[Ch10b] Tidying up Jukebox1 and MockSongs code

parent 6fc1055f
Loading
Loading
Loading
Loading
+12 −19
Changes for src/main/java/ch10b/Jukebox1.java: 12 added lines, 19 removed lines.
Original line number Diff line number Diff line
package ch10b;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.*;

public class Jukebox1 {

  // QU: Should this be a List or ArrayList? Have we covered this?
  List<String> songList = new ArrayList<>();

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

  public void go() {
    Songs s = new Songs();
    songList = s.getSongs();
    List<String> songList = MockSongs.getSongStrings();
    System.out.println(songList);
    // Next step adds the following
    Collections.sort(songList);
@@ -26,15 +19,15 @@ public class Jukebox1 {
// Below is the "mock" code. A stand in for the actual
// I/O code that the other programmer will provide later

class Songs {
  public List<String> getSongs() {
    ArrayList<String> songDB = new ArrayList<>();
    songDB.add("somersault");
    songDB.add("cassidy");
    songDB.add("$10");
    songDB.add("havana");
    songDB.add("Cassidy");
    songDB.add("50 Ways");
    return songDB;
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
+2 −2
Changes for src/main/java/ch10b/Jukebox2.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ public class Jukebox2 {
  }

  public void go() {
    Songs s = new Songs();
    List<String> songList = s.getSongs();
    MockSongs s = new MockSongs();
    List<String> songList = s.getSongStrings();
    System.out.println(songList);
    Collections.sort(songList);
    System.out.println("\n" + songList);