From ce5ea17ec855aa5ca491aca3a188b35caf237c3d Mon Sep 17 00:00:00 2001
From: Roland Andersson <rolaande@itstud.chalmers.se>
Date: Fri, 9 May 2003 18:07:15 +0000
Subject: [PATCH] no message

---
 MooTrackView.java | 57 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/MooTrackView.java b/MooTrackView.java
index 4bce7b2..84d0812 100644
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -9,11 +9,17 @@ import java.awt.*;
  * @version 1
  */
  
-public class MooTrackView extends JPanel {
+public class MooTrackView extends JPanel implements ActionListener {
 
 	private MooTrackTitle title;
 	private NoteArea notes;
 	private Rectangle box;
+<<<<<<< MooTrackView.java
+	private JPopupMenu popup;
+	private JMenuItem menuItem;
+	private String newline = "\n";
+	
+=======
 	//private Rectangle box2;
 	//private JPanel notes;
 
@@ -24,12 +30,13 @@ public class MooTrackView extends JPanel {
 	/** 
 	 * Creates 
 	 */
+>>>>>>> 1.13
 	public MooTrackView () {
 		setLayout(new BorderLayout());
 		this.setBorder(BorderFactory.createLineBorder(Color.black));
 		add(trackTitle(), BorderLayout.NORTH);
 		add(noteView(), BorderLayout.CENTER);
-		}
+	}
 	
 	private JPanel trackTitle () {
 		title = new MooTrackTitle();
@@ -41,13 +48,33 @@ public class MooTrackView extends JPanel {
 	private JPanel noteView () {
 		notes = new NoteArea();	
 		notes.setBackground(Color.white);
-		notes.setBorder(BorderFactory.createLineBorder(Color.black));	
+		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);
+
+        MouseListener popupListener = new PopupListener();
+        notes.addMouseListener(popupListener);
+        	
 		return notes;		
 	}
 	
+	public void actionPerformed(ActionEvent e) {
+        JMenuItem source = (JMenuItem)(e.getSource());
+        String s = "Action event detected."
+                   + newline
+                   + "    Event source: " + source.getText();
+     }
+    
 	class NoteArea extends JPanel {
 		public void RectanglePanel() {
 			setPreferredSize(new Dimension(20, 20));
+			
 		}
 		
 		public void paintComponent(Graphics g) {
@@ -63,4 +90,28 @@ public class MooTrackView extends JPanel {
 			}
 		}
 	}
+<<<<<<< MooTrackView.java
+	
+	class PopupListener extends MouseAdapter {
+        public void mousePressed(MouseEvent e) {
+            maybeShowPopup(e);
+        }
+
+        public void mouseReleased(MouseEvent e) {
+            maybeShowPopup(e);
+        }
+
+        private void maybeShowPopup(MouseEvent e) {
+            if (e.isPopupTrigger()) {
+                popup.show(e.getComponent(),
+                           e.getX(), e.getY());
+            }
+        }
+    }
+	
+	private static final int PANEL_WIDTH = 65;
+	private static final int TITLE_HEIGHT = 40;
+	private static final int NOTEVIEW_HEIGHT = 200;
+=======
+>>>>>>> 1.13
 }
-- 
2.39.2