Commit 865abd5c authored by Trisha Gee's avatar Trisha Gee
Browse files

Updated Jukebox5 to the version I want to use in the book. Added a... 

Updated Jukebox5 to the version I want to use in the book. Added a Jukebox5Consistent which uses the two comparators, this is probably Jukebox6 to be honest. Rolled back my SongV3 changes so it matches the book.
parent 73df4dea

.idea/uiDesigner.xml

0 → 100644
+124 −0
Changes for .idea/uiDesigner.xml: 124 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="Palette2">

    <group name="Swing">

      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">

        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />

      </item>

      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">

        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />

      </item>

      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">

        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />

      </item>

      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">

        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />

      </item>

      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">

        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />

        <initial-values>

          <property name="text" value="Button" />

        </initial-values>

      </item>

      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">

        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />

        <initial-values>

          <property name="text" value="RadioButton" />

        </initial-values>

      </item>

      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">

        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />

        <initial-values>

          <property name="text" value="CheckBox" />

        </initial-values>

      </item>

      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">

        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />

        <initial-values>

          <property name="text" value="Label" />

        </initial-values>

      </item>

      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">

        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">

          <preferred-size width="150" height="-1" />

        </default-constraints>

      </item>

      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">

        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">

          <preferred-size width="150" height="-1" />

        </default-constraints>

      </item>

      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">

        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">

          <preferred-size width="150" height="-1" />

        </default-constraints>

      </item>

      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">

        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">

          <preferred-size width="150" height="50" />

        </default-constraints>

      </item>

      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">

        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">

          <preferred-size width="150" height="50" />

        </default-constraints>

      </item>

      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">

        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">

          <preferred-size width="150" height="50" />

        </default-constraints>

      </item>

      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">

        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />

      </item>

      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">

        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">

          <preferred-size width="150" height="50" />

        </default-constraints>

      </item>

      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">

        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">

          <preferred-size width="150" height="50" />

        </default-constraints>

      </item>

      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">

        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">

          <preferred-size width="150" height="50" />

        </default-constraints>

      </item>

      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">

        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">

          <preferred-size width="200" height="200" />

        </default-constraints>

      </item>

      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">

        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">

          <preferred-size width="200" height="200" />

        </default-constraints>

      </item>

      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">

        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />

      </item>

      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">

        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />

      </item>

      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">

        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />

      </item>

      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">

        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />

      </item>

      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">

        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">

          <preferred-size width="-1" height="20" />

        </default-constraints>

      </item>

      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">

        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />

      </item>

      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">

        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />

      </item>

    </group>

  </component>

</project>
 
 No newline at end of file

src/main/java/Jukebox5.java

+1 −6
Changes for src/main/java/Jukebox5.java: 1 added line, 6 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ public class Jukebox5 { 
    MockSongV2File mockFile = new MockSongV2File();



    public static void main(String[] args) {

        new Jukebox5().go();

        new Jukebox5Consistent().go();

    }



    public void go() {
@@ -17,11 +17,6 @@ public class Jukebox5 { 
        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());

src/main/java/Jukebox5Consistent.java

0 → 100644
+31 −0
Changes for src/main/java/Jukebox5Consistent.java: 31 added lines, 0 removed lines.
Original line number Diff line number Diff line 
import java.util.*;

public class Jukebox5Consistent {

    ArrayList<SongV3> songList = new ArrayList<SongV3>();

    MockSongV2File mockFile = new MockSongV2File();



    public static void main(String[] args) {

        new Jukebox5Consistent().go();

    }



    public void go() {

        songList = mockFile.getSongsV3();

        System.out.println(songList);

        TitleCompare titleCompare = new TitleCompare();

        songList.sort(titleCompare);

        System.out.println(songList);

        ArtistCompare  artistCompare = new ArtistCompare();

        songList.sort(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());

        }

    }

}

src/main/java/SongV3.java

+1 −2
Changes for src/main/java/SongV3.java: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ class SongV3 implements Comparable<SongV3> { 
        return bpm;

    }



    @Override

    public String toString() {

        return "{" + title + ", " + artist + ", " + bpm + '}';

        return title;

    }

}

© 2026 O’Reilly Media, Inc. All trademarks and registered trademarks appearing on oreilly.com are the property of their respective owners. Terms of Service • Privacy Policy • Editorial Independence