[Ch13] Small readability improvements for the music apps. (d1ff8c31) · Commits · examples / Head First Java 3rd Edition

src/main/java/ch13/MiniMiniMusicApp.java

+12 −16

Changes for src/main/java/ch13/MiniMiniMusicApp.java: 12 added lines, 16 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@ package ch13;

		import javax.sound.midi.*;

		import static javax.sound.midi.ShortMessage.*;

		public class MiniMiniMusicApp {

		public static void main(String[] args) {
		@@ -11,34 +13,28 @@ public class MiniMiniMusicApp {

		public void play() {
		try {

		Sequencer player = MidiSystem.getSequencer();
		player.open();


		Sequence seq = new Sequence(Sequence.PPQ, 4);


		Track track = seq.createTrack();


		ShortMessage a = new ShortMessage();
		a.setMessage(144, 1, 44, 100);
		MidiEvent noteOn = new MidiEvent(a, 1);
		ShortMessage msg1 = new ShortMessage();
		msg1.setMessage(NOTE_ON, 1, 44, 100);
		MidiEvent noteOn = new MidiEvent(msg1, 1);
		track.add(noteOn);


		ShortMessage b = new ShortMessage();
		b.setMessage(128, 1, 44, 100);
		MidiEvent noteOff = new MidiEvent(b, 16);
		ShortMessage msg2 = new ShortMessage();
		msg2.setMessage(NOTE_OFF, 1, 44, 100);
		MidiEvent noteOff = new MidiEvent(msg2, 16);
		track.add(noteOff);

		player.setSequence(seq);

		player.start();

		} catch (Exception ex) {
		ex.printStackTrace();
		} catch (Exception e) {
		e.printStackTrace();
		}
		}
		}
		No newline at end of file
		} // close play
		} // close class
		No newline at end of file

+11 −9

Changes for src/main/java/ch13/MiniMusicCmdLine.java: 11 added lines, 9 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@ package ch13;

		import javax.sound.midi.*;

		import static javax.sound.midi.ShortMessage.*;

		public class MiniMusicCmdLine {
		public static void main(String[] args) {
		MiniMusicCmdLine mini = new MiniMusicCmdLine();
		@@ -21,19 +23,19 @@ public class MiniMusicCmdLine {
		Sequence seq = new Sequence(Sequence.PPQ, 4);
		Track track = seq.createTrack();

		ShortMessage first = new ShortMessage();
		first.setMessage(192, 1, instrument, 0);
		MidiEvent changeInstrument = new MidiEvent(first, 1);
		ShortMessage msg1 = new ShortMessage();
		msg1.setMessage(PROGRAM_CHANGE, 1, instrument, 0);
		MidiEvent changeInstrument = new MidiEvent(msg1, 1);
		track.add(changeInstrument);

		ShortMessage a = new ShortMessage();
		a.setMessage(144, 1, note, 100);
		MidiEvent noteOn = new MidiEvent(a, 1);
		ShortMessage msg2 = new ShortMessage();
		msg2.setMessage(NOTE_ON, 1, note, 100);
		MidiEvent noteOn = new MidiEvent(msg2, 1);
		track.add(noteOn);

		ShortMessage b = new ShortMessage();
		b.setMessage(128, 1, note, 100);
		MidiEvent noteOff = new MidiEvent(b, 16);
		ShortMessage msg3 = new ShortMessage();
		msg3.setMessage(NOTE_OFF, 1, note, 100);
		MidiEvent noteOff = new MidiEvent(msg3, 16);
		track.add(noteOff);

		player.setSequence(seq);

+8 −8

Changes for src/main/java/ch13/WashingMachine.java: 8 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		@@ -3,13 +3,13 @@ package ch13;
		public class WashingMachine {
		public void go() {
		Laundry laundry = new Laundry();
		try {
		laundry.doLaundry();
		} catch (PantsException pex) {
		// recovery code

		} catch (LingerieException lex) {
		// recovery code
		}
		// try {
		// laundry.doLaundry();
		// } catch (PantsException pex) {
		// // recovery code
		//
		// } catch (LingerieException lex) {
		// // recovery code
		// }
		}
		}
		No newline at end of file