fixat jumpgrejen eller progindikatorn eller VAD FAN DET NU KALLAS...vad sägs????

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index bbb740273efc7ecd2f4685cc86f63c3820163cdf..71018d1ea765a2a4b8305bc0986be9e9791c12ce 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -1,37 +1,36 @@
 import javax.swing.*;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionAdapter;
-import java.awt.event.MouseMotionListener;
-import java.awt.Dimension;
+import java.awt.event.*;
 import java.awt.*;
-//import java.awt.Graphics;
-//import java.awt.Graphics2D;
-//import java.awt.Rectangle;
 
 /**
- * 
+ * Graphical representation of a MIDI track.
  * 
  * @author  Andersson, Andreen, Lanneskog, Pehrson
  * @version 1
  */
  
-public class MooTrackView extends JPanel{
+public class MooTrackView extends JPanel {
 
        private MooTrackTitle title;
        private NoteArea notes;
        private Rectangle box;
+       private Rectangle box2;
        //private JPanel notes;
+
+       private static final int PANEL_WIDTH = 65;
+       private static final int TITLE_HEIGHT = 40;
+       private static final int NOTEVIEW_HEIGHT = 200;
        
        /** 
         * Creates 
         */
        public MooTrackView () {
-       this.addMouseMotionListener(doScrollRectToVisible);
-       setLayout(new BorderLayout());
-       this.setBorder(BorderFactory.createLineBorder(Color.black));
-       add(trackTitle(), BorderLayout.NORTH);
-       add(noteView(), BorderLayout.CENTER);
+               addMouseMotionListener(doScrollRectToVisible);
+               addKeyListener(new MooKeyboard());
+               setLayout(new BorderLayout());
+               setBorder(BorderFactory.createLineBorder(Color.black));
+               add(trackTitle(), BorderLayout.NORTH);
+               add(noteView(), BorderLayout.CENTER);
        }
        
        MouseMotionListener doScrollRectToVisible = new MouseMotionAdapter() {
@@ -49,16 +48,15 @@ public class MooTrackView extends JPanel{
        }
 
        private JPanel noteView () {
-               notes = new NoteArea();
-               notes.setBorder(BorderFactory.createLineBorder(Color.black));
-               return notes;
-                       
+               notes = new NoteArea(); 
+               notes.setBackground(Color.white);
+               notes.setBorder(BorderFactory.createLineBorder(Color.black));   
+               return notes;           
        }
        
        class NoteArea extends JPanel {
                public void RectanglePanel() {
                        setPreferredSize(new Dimension(20, 20));
-                       //box = new Rectangle(100,100,20,20);
                }
                
                
@@ -67,11 +65,8 @@ public class MooTrackView extends JPanel{
                        Graphics2D g2 = (Graphics2D)g;
                        box = new Rectangle(0,0,20,20);
                        g2.draw(box);
+                       box2 = new Rectangle(20,0,20,20);
+                       g2.draw(box2);
                }
        }
-       
-       private static final int PANEL_WIDTH = 65;
-       private static final int TITLE_HEIGHT = 20;
-       private static final int NOTEVIEW_HEIGHT = 200;
-
-}
+}
\ No newline at end of file