From c169952b383782c90da77ad0c051a0708f098ae1 Mon Sep 17 00:00:00 2001 From: Roland Andersson Date: Fri, 9 May 2003 18:34:53 +0000 Subject: [PATCH] no message --- MooTrackView.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/MooTrackView.java b/MooTrackView.java index 84d0812..7ad81ff 100644 --- a/MooTrackView.java +++ b/MooTrackView.java @@ -5,7 +5,7 @@ import java.awt.*; /** * Graphical representation of a MIDI track. * - * @author Andersson, Andreen, Lanneskog, Pehrson + * @author Andersson , Andreen, Lanneskog, Pehrson * @version 1 */ @@ -14,23 +14,10 @@ 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; - - private static final int PANEL_WIDTH = 65; - private static final int TITLE_HEIGHT = 45; - private static final int NOTEVIEW_HEIGHT = 200; - - /** - * Creates - */ ->>>>>>> 1.13 public MooTrackView () { setLayout(new BorderLayout()); this.setBorder(BorderFactory.createLineBorder(Color.black)); @@ -90,7 +77,6 @@ public class MooTrackView extends JPanel implements ActionListener { } } } -<<<<<<< MooTrackView.java class PopupListener extends MouseAdapter { public void mousePressed(MouseEvent e) { @@ -112,6 +98,4 @@ public class MooTrackView extends JPanel implements ActionListener { 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