Fixed some bugs

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index ccaa10553ccbe38bc546c5ff67a1aa197c8ef913..4e4f0027161da12374c71d308f5124438d1bcd3b 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -9,7 +9,7 @@ import javax.sound.midi.*;
  * @author  Andersson , Andreen, Lanneskog, Pehrson
  * @version 1
  */
- 
+
 public class MooTrackView extends JPanel implements ActionListener {
 
        private Track track;
@@ -18,7 +18,7 @@ public class MooTrackView extends JPanel implements ActionListener {
        private Rectangle box;
        private JPopupMenu popup;
        private JMenuItem menuItem;
-       
+
        public MooTrackView (Track track) {
                this.track = track;
                setPreferredSize(new Dimension(200, 200));
@@ -29,39 +29,46 @@ public class MooTrackView extends JPanel implements ActionListener {
                title.setBorder(BorderFactory.createLineBorder(Color.black));
                add(title, BorderLayout.NORTH);
 
-               notes = new NoteArea(); 
+               notes = new NoteArea(track);    
                notes.setBackground(Color.white);
                notes.setBorder(BorderFactory.createLineBorder(Color.black));
 
                popup = new JPopupMenu();
-               menuItem = new JMenuItem("Add...");
-               menuItem.addActionListener(this);
-               popup.add(menuItem);
-               menuItem = new JMenuItem("Preferences...");
-               menuItem.addActionListener(this);
-               popup.add(menuItem);
-
-               notes.addMouseListener(new PopupListener());
+               menuItem = new JMenuItem("Add...");
+               menuItem.addActionListener(this);
+               popup.add(menuItem);
+               menuItem = new JMenuItem("Preferences...");
+               menuItem.addActionListener(this);
+               popup.add(menuItem);
+
+               notes.addMouseListener(new PopupListener());
                add(notes, BorderLayout.CENTER);
        }
-       
+
        public void actionPerformed(ActionEvent e) {}
-    
+
        public Track getTrack() {
                return track;
        }
 
        class NoteArea extends JPanel {
-               public void RectanglePanel() {
-                       setPreferredSize(new Dimension(20, 20));
+
+               public NoteArea(Track track) {
+                       MidiEvent note;
+                       for (int i = 0; i < track.size(); i++) {
+                               note = track.get(i);
+                               if (note instanceof MooNote) {
+                                       add(new MooNoteElement((MooNote)note));
+                               }
+                       }
+                       validate();
                }
-               
+
                public void paintComponent(Graphics g) {
                        super.paintComponent(g);
                        Graphics2D g2 = (Graphics2D)g;
                        for (int c = 0; c < 1000; c += 20) {
-                               int r=0;
-                               for (r = 0; r < 200; r += 20) {
+                               for (int r = 0; r < 200; r += 20) {
                                        box = new Rectangle(r, c, 20, 20);
                                        g2.setColor(Color.gray);
                                        g2.draw(box);
@@ -69,17 +76,17 @@ public class MooTrackView extends JPanel implements ActionListener {
                        }
                }
        }
-       
+
        class PopupListener extends MouseAdapter {
-               public void mousePressed(MouseEvent e) {
+               public void mousePressed(MouseEvent e) {
                        maybeShowPopup(e);
-               }
-       
-               public void mouseReleased(MouseEvent e) {
+               }
+
+               public void mouseReleased(MouseEvent e) {
                        maybeShowPopup(e);
-               }
-       
-               private void maybeShowPopup(MouseEvent e) {
+               }
+
+               private void maybeShowPopup(MouseEvent e) {
                        if (e.isPopupTrigger()) {
                                popup.show(e.getComponent(), e.getX(), e.getY());
                        }