Readded the MooKeyboard listener to MooTrackView.

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index 4b033c1f4184fe7c8395b7092d4301eb74fdd0b9..854cfec806308b0680360ea5a0f41c1999b4301a 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -27,7 +27,6 @@ public class MooTrackView extends JPanel {
                super(true);
                this.track = track;
 
-               extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150;
                // Configures panel
                setBackground(Color.white);
                setBorder(BorderFactory.createLineBorder(Color.black));
@@ -38,19 +37,17 @@ public class MooTrackView extends JPanel {
                MidiEvent note;
                MooNoteElement elem;
                rects = new ArrayList(track.size() / 2);
+               extraHeight = Toolkit.getDefaultToolkit().getScreenSize().height - 150;
 
                // Places note elements
                for (int i = 0; i < track.size(); i++) {
                        note = track.get(i);
                        if (note instanceof MooNote) {
-                               // Adds the note element to the note area.
+                               // Adds the note element to the note area and moves it to the appropriate place.
                                MooNote mn = (MooNote)note;
                                elem = new MooNoteElement(this, mn);
                                add(elem);
-
-                               layoutElement(elem,false);
-
-                               // Moves the note element to the appropriate place.
+                               layoutElement(elem, false);
                        }
                        setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
 
@@ -59,17 +56,20 @@ public class MooTrackView extends JPanel {
 
                // Creates pop-up menu.
                popup = new JPopupMenu();
-               menuItem = new JMenuItem("Add...");
+               menuItem = new JMenuItem("Add note...");
                // menuItem.addActionListener();
                popup.add(menuItem);
 
-               addMouseListener(new PopupListener());
+               // Adds listeners for popup menu and keyboard synthesizer.
+               addMouseListener(new MAdapter());
+               addKeyListener(new MooKeyboard());
        }
 
        public void layoutElement(MooNoteElement elem, boolean old){
+               // If the element is currently in the view, removes its coordinates from the list.
                Rectangle r = new Rectangle();
-               if(old){
-                       r =     elem.getBounds(r);
+               if (old){
+                       r = elem.getBounds(r);
                        for (Iterator i = rects.iterator(); i.hasNext();){
                                Object ob = i.next();
                                if (r.equals(ob)){
@@ -79,15 +79,20 @@ public class MooTrackView extends JPanel {
                        }
                }
 
+               // Creates temporary variables.
                int ticksPerSixteenth = Moosique.getSequence().getResolution() / 4;
                MooNote mn = elem.getNote();
                Insets insets = getInsets();
                int x, y, height;
+
+               // Calculates coordinates.
                x = insets.left;
                y = insets.top + (int)(mn.getTick() / ticksPerSixteenth) * NOTE_HEIGHT;
                height = (mn.getDuration() / ticksPerSixteenth) * NOTE_HEIGHT;
                if (height == 0) height = NOTE_HEIGHT;
                r = new Rectangle(x, y, NOTE_WIDTH, height);
+
+               // Places the element in the appropriate place.
                while(isOccupied(r)) r.translate(NOTE_WIDTH, 0);
                elem.setBounds(r);
                rects.add(r);
@@ -137,11 +142,15 @@ public class MooTrackView extends JPanel {
                }
        }
 
-       class PopupListener extends MouseAdapter {
+       class MAdapter extends MouseAdapter {
                public void mousePressed(MouseEvent e) {
                        if (e.isPopupTrigger()) {
                                popup.show(e.getComponent(), e.getX(), e.getY());
                        }
                }
+
+               public void mouseEntered(MouseEvent e) {
+                       // Moosique.setActiveChannel(track.getChannel());
+               }
        }
 }