Commit 41d905eb authored by Trisha Gee's avatar Trisha Gee
Browse files

[Ch14] Formatting. Making all fields private. Removing extraneous whitespace.

parent d39b44da
Loading
Loading
Loading
Loading
+9 −12
Changes for src/main/java/ch14/MiniMusicPlayer1.java: 9 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -3,31 +3,26 @@ package ch14;
import javax.sound.midi.*;

public class MiniMusicPlayer1 {
   
  public static void main(String[] args) {

    try {

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

         
      Sequence seq = new Sequence(Sequence.PPQ, 4);
      Track track = seq.createTrack();

      for (int i = 5; i < 61; i += 4) {
    

        track.add(makeEvent(144, 1, i, 100, i));
        track.add(makeEvent(128, 1, i, 100, i + 2));

       } // end loop
      }

      sequencer.setSequence(seq);
      sequencer.setTempoInBPM(220);
      sequencer.start();
      } catch (Exception ex) {ex.printStackTrace();}
  } // close main
    } catch (Exception ex) {
      ex.printStackTrace();
    }
  }


  public static MidiEvent makeEvent(int comd, int chan, int one, int two, int tick) {
@@ -37,7 +32,9 @@ public class MiniMusicPlayer1 {
      a.setMessage(comd, chan, one, two);
      event = new MidiEvent(a, tick);

          }catch(Exception e) { }
    } catch (Exception e) {
      e.printStackTrace();
    }
    return event;
  }
} // close class
 No newline at end of file
}
 No newline at end of file
+11 −11
Changes for src/main/java/ch14/MiniMusicPlayer2.java: 11 added lines, 11 removed lines.
Original line number Diff line number Diff line
package ch14;

import javax.sound.midi.*;
public class MiniMusicPlayer2 implements ControllerEventListener {   

public class MiniMusicPlayer2 implements ControllerEventListener {
  public static void main(String[] args) {
    MiniMusicPlayer2 mini = new MiniMusicPlayer2();
    mini.go();
  }
   public void go() {         

  public void go() {
    try {
      Sequencer sequencer = MidiSystem.getSequencer();
      sequencer.open();
@@ -21,18 +21,17 @@ public class MiniMusicPlayer2 implements ControllerEventListener {

      for (int i = 5; i < 60; i += 4) {
        track.add(makeEvent(144, 1, i, 100, i));

        track.add(makeEvent(176, 1, 127, 0, i));

        track.add(makeEvent(128, 1, i, 100, i + 2));
         } // end loop
      } 

      sequencer.setSequence(seq);
      sequencer.setTempoInBPM(220);
      sequencer.start();
      } catch (Exception ex) {ex.printStackTrace();}
  } // close 

    } catch (Exception ex) {
      ex.printStackTrace();
    }
  }

  public void controlChange(ShortMessage event) {
    System.out.println("la");
@@ -44,8 +43,9 @@ public class MiniMusicPlayer2 implements ControllerEventListener {
      ShortMessage a = new ShortMessage();
      a.setMessage(comd, chan, one, two);
      event = new MidiEvent(a, tick);
            
          }catch(Exception e) { }
    } catch (Exception e) {
      e.printStackTrace();
    }
    return event;
  }
} // close class
 No newline at end of file
} 
 No newline at end of file
+6 −5
Changes for src/main/java/ch14/MiniMusicPlayer3.java: 6 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ import java.awt.Color;
import java.awt.Graphics;

public class MiniMusicPlayer3 {
  static JFrame f = new JFrame("My First Music Video");
  static MyDrawPanel ml;
  private static JFrame f = new JFrame("My First Music Video");
  private static MyDrawPanel ml;

  public static void main(String[] args) {
    MiniMusicPlayer3 mini = new MiniMusicPlayer3();
@@ -57,13 +57,14 @@ public class MiniMusicPlayer3 {
      event = new MidiEvent(a, tick);

    } catch (Exception e) {
      e.printStackTrace();
    }
    return event;
  }


  class MyDrawPanel extends JPanel implements ControllerEventListener {
    boolean msg = false;
    private boolean msg = false;

    public void controlChange(ShortMessage event) {
      msg = true;
@@ -78,13 +79,13 @@ public class MiniMusicPlayer3 {

        g.setColor(new Color(r, gr, b));

        int ht = (int) ((Math.random() * 120) + 10);
        int height = (int) ((Math.random() * 120) + 10);
        int width = (int) ((Math.random() * 120) + 10);

        int x = (int) ((Math.random() * 40) + 10);
        int y = (int) ((Math.random() * 40) + 10);

        g.fillRect(x, y, ht, width);
        g.fillRect(x, y, height, width);
        msg = false;
      }
    }
+2 −2
Changes for src/main/java/ch14/MyDrawPanel.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
package ch14;

import java.awt.*;
import javax.swing.*;
import java.awt.Color;
import java.awt.Graphics;

class MyDrawPanel extends JPanel {

  public void paintComponent(Graphics g) {

    g.setColor(Color.orange);

    g.fillRect(20, 50, 100, 100);
+3 −6
Changes for src/main/java/ch14/MyOuter.java: 3 added lines, 6 removed lines.
Original line number Diff line number Diff line
package ch14;

class MyOuter {

  private int x;

   MyInner inner = new MyInner();
  private MyInner inner = new MyInner();

  public void doStuff() {
    inner.go();
  }

   
  class MyInner {
    void go() {
      x = 42;
    }
    } // close inner class
  } 

} // close outer class
}
Loading