Fixed some bugs

[moosique.git] / MooNoteElement.java

diff --git a/MooNoteElement.java b/MooNoteElement.java
index 1225fe9833ad905f5c98a65136c86cd058357831..e854a44fd030a0f211635a8b5b715623097c9bff 100644 (file)
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -9,7 +9,7 @@ import java.awt.event.*;
  * @version 1
  */
  
-public class MooNoteElement extends JPanel{
+public class MooNoteElement extends JPanel {
 
        private MooNote note;
        private boolean selected;
@@ -21,6 +21,7 @@ public class MooNoteElement extends JPanel{
        public MooNoteElement (MooNote mn) {
                note = mn;
                setPreferredSize(new Dimension(20,20));
+               setFont(new Font("Helvetica", Font.PLAIN, 10));
 
                class MouseList implements MouseListener{
                        public void mouseClicked(MouseEvent event){
@@ -66,30 +67,33 @@ public class MooNoteElement extends JPanel{
        {
                super.paintComponent(g);
 
+               if (note == null)
+                       return;
+
                if (!(g instanceof Graphics2D))
                        return;
                Graphics2D g2 = (Graphics2D)g;
-               
-               String note = ""; //TODO: shoudl really change this name..
-               int pitch = this.note.getPitch();
+
+               String n = ""; 
+               int pitch = note.getPitch();
                switch( pitch % 12)
                {
-                       case 0: note = "C"; break;
-                       case 1: note = "C#"; break;
-                       case 2: note = "D"; break;
-                       case 3: note = "D#"; break;
-                       case 4: note = "E"; break;
-                       case 5: note = "F"; break;
-                       case 6: note = "F#"; break;
-                       case 7: note = "G"; break;
-                       case 8: note ="G#"; break;
-                       case 9: note = "A"; break;
-                       case 10: note = "A#"; break;
-                       case 11: note = "B"; break;
+                       case 0: n = "C"; break;
+                       case 1: n = "C#"; break;
+                       case 2: n = "D"; break;
+                       case 3: n = "D#"; break;
+                       case 4: n = "E"; break;
+                       case 5: n = "F"; break;
+                       case 6: n = "F#"; break;
+                       case 7: n = "G"; break;
+                       case 8: n ="G#"; break;
+                       case 9: n = "A"; break;
+                       case 10: n = "A#"; break;
+                       case 11: n = "B"; break;
                }
-               
-               g2.drawString(note +" "+(pitch/12), 2, 2);
+
+               g2.drawString(n +" "+(pitch/12), 2, 2);
 
        }
-                       
-}
\ No newline at end of file
+
+}