Commit 75f42741 authored by Trisha Gee's avatar Trisha Gee
Browse files

Adding working lines to Jukebox1, adding Jukebox5 example

parent cada53bc
Loading
Loading
Loading
Loading
+1 −1
Changes for .idea/gradle.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
        <option name="delegatedBuild" value="true" />
        <option name="delegatedBuild" value="false" />
        <option name="testRunner" value="PLATFORM" />
        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+3 −0
Changes for src/main/java/Jukebox1.java: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ public class Jukebox1 {
        Songs s = new Songs();
        songList = s.getSongs();
        System.out.println(songList);
        // Next step adds the following
        Collections.sort(songList);
        System.out.println(songList);
    }
}

+33 −0
Changes for src/main/java/Jukebox5.java: 33 added lines, 0 removed lines.
Original line number Diff line number Diff line
import java.util.*;
public class Jukebox5 {
    ArrayList<SongV3> songList = new ArrayList<SongV3>();
    MockSongV2File mockFile = new MockSongV2File();

    public static void main(String[] args) {
        new Jukebox5().go();
    }
    // TODO: why doesn't this use songlist.sort?
    public void go() {
        songList = mockFile.getSongsV3();
        System.out.println(songList);
        TitleCompare  titleCompare = new TitleCompare();
        ArtistCompare artistCompare = new ArtistCompare();

        Collections.sort(songList, titleCompare);
        System.out.println(songList);

        Collections.sort(songList, artistCompare);
        System.out.println(songList);
    }

    class TitleCompare implements Comparator<SongV3> {
        public int compare(SongV3 one, SongV3 two) {
            return one.getTitle().compareTo(two.getTitle());
        }
    }
    class ArtistCompare implements Comparator<SongV3> {
        public int compare(SongV3 one, SongV3 two) {
            return one.getArtist().compareTo(two.getArtist());
        }
    }
}