no message

diff --git a/MooNoteElement.java b/MooNoteElement.java
index bcf5a7ba1ffea13117b7c1f4aef60c7fc7bf9769..beb5702b0467b663f102f2482e73cf75cbcb96fb 100644 (file)
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -45,17 +45,12 @@ public class MooNoteElement extends JPanel {
        {
                super.paintComponent(g);
 
-               if (note == null)
-                       return;
-
-               if (!(g instanceof Graphics2D))
-                       return;
+               if (note == null || !(g instanceof Graphics2D)) return;
                Graphics2D g2 = (Graphics2D)g;
 
                String n = ""; 
                int pitch = note.getPitch();
-               switch( pitch % 12)
-               {
+               switch (pitch % 12) {
                        case 0: n = "C"; break;
                        case 1: n = "C#"; break;
                        case 2: n = "D"; break;
@@ -72,8 +67,5 @@ public class MooNoteElement extends JPanel {
                g2.setFont(new Font("Helvetica", Font.PLAIN, 8));
                n = n +(pitch/12);
                g2.drawString(n + " "+ note.getVelocity(), 1, 9);
-               
-
        }
-
-}
+}
\ No newline at end of file

diff --git a/MooTrackView.java b/MooTrackView.java
index 16d396f2e0a845053e83843e51707dceed42f862..1b090ffcf89689d373ecf0fc3f7c3d29edcb9222 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -67,13 +67,17 @@ public class MooTrackView extends JPanel implements ActionListener {
                private int trackLength;
 
                public NoteArea(Track track) {
+                       // Configuring panel
                        setLayout(null);
                        trackLength = 140;
-                       setPreferredSize(new Dimension(200,140*NOTE_HEIGHT));
+                       setPreferredSize(new Dimension(200, 140 * NOTE_HEIGHT));
+
+                       // Temporary variables
                        MidiEvent note;
                        MooNoteElement elem;
-                       boolean isOccupied;
                        int x, y, height;
+
+                       // Placing note elements
                        Insets insets = getInsets();
                        for (int i = 0; i < track.size(); i++) {
                                note = track.get(i);
@@ -83,15 +87,15 @@ public class MooTrackView extends JPanel implements ActionListener {
                                        elem = new MooNoteElement(mn);
                                        add(elem);
 
-                                       // Places the note element in the appropriate place.
+                                       // Moves the note element to the appropriate place.
                                        x = insets.left;
                                        y = insets.top + (int)(mn.getTick() / 24) * NOTE_HEIGHT;
-                                       height = NOTE_HEIGHT;
-                                       // height = (mn.getDuration() / 24) * NOTE_HEIGHT;
+                                       height = (mn.getDuration() / 24) * NOTE_HEIGHT;
+                                       if (height == 0) height = NOTE_HEIGHT;
                                        while(findComponentAt(x, y) instanceof MooNoteElement ||
                                              findComponentAt(x, y + height - 1) instanceof MooNoteElement) x += NOTE_WIDTH;
                                        elem.setBounds(x, y, NOTE_WIDTH, height);
-                                       if (viewLength < (y+height)) viewLength = y+height;
+                                       if (viewLength < (y + height)) viewLength = y + height;
                                }
                                setPreferredSize(new Dimension(200,viewLength));
                        }
@@ -101,7 +105,6 @@ public class MooTrackView extends JPanel implements ActionListener {
                public void paintComponent(Graphics g) {
                        super.paintComponent(g);
                        Graphics2D g2 = (Graphics2D)g;
-//(trackLength*NOTE_HEIGHT)
                        for (int c = 0; c < viewLength ; c += NOTE_HEIGHT) {
                                for (int r = 0; r < (10*NOTE_WIDTH); r += NOTE_WIDTH) {
                                        box = new Rectangle(r, c, NOTE_WIDTH, NOTE_HEIGHT);
@@ -127,4 +130,4 @@ public class MooTrackView extends JPanel implements ActionListener {
                        }
                }
        }
-}
+}
\ No newline at end of file