*** empty log message ***

diff --git a/MooDialog.java b/MooDialog.java
index 96def1322bbe6a4cdaae6aee4a540e3affb0c4ef..a2adf4754b5f44472d20a9b69b6797ab903e2338 100644 (file)
--- a/MooDialog.java
+++ b/MooDialog.java
@@ -14,8 +14,9 @@ import java.beans.*;
 public class MooDialog extends JDialog {
 
        private JLabel labelA, labelB, labelC, labelD, labelE, labelF, labelG, labelH;
-       private JTextField textFieldA, textFieldB, textFieldC, textFieldD, textFieldE, textFieldF,
-                          textFieldG, textFieldH, textFieldI, textFieldJ, textFieldK;
+       private JTextField textFieldA, textFieldB, textFieldC, textFieldD, textFieldE,
+                          textFieldF, textFieldG, textFieldH, textFieldI, textFieldJ,
+                          textFieldK;
        private JComboBox trackListA, trackListB; 
        private JButton okButton, cancelButton;
        public static final int ADD_TRACK = 1,
@@ -64,29 +65,31 @@ public class MooDialog extends JDialog {
         * @param tracks        A array containing miditracks.
         */
        private void makeAddDialog(Container pane, Track[] tracks) {
-       
                setTitle("Add track");
+               // create the contents of the dialog and add to container
                labelA = new JLabel("Name of track", JLabel.CENTER);
                pane.add(labelA);
+               // textfield for naming track
                textFieldA = new JTextField();  
                pane.add(textFieldA);
                labelB = new JLabel("Add after", JLabel.CENTER);
                pane.add(labelB);
+               // list of where to add track
                trackListA = new JComboBox();
                for (int i = 1; i <= tracks.length; i++) trackListA.addItem("Track " + i);
                pane.add(trackListA);
+               // ok and cancel button
                cancelButton = new JButton("Cancel");
                pane.add(cancelButton);
                okButton = new JButton("OK");
                pane.add(okButton);
-       
+               // set layout prop
                labelA.setBounds(50, 10, 100, 20);
                textFieldA.setBounds(40, 35, 120, 20);
                labelB.setBounds(50, 70, 100, 20);
                trackListA.setBounds(40, 95, 120, 20);
                cancelButton.setBounds(10, 150, 80, 30);
                okButton.setBounds(120, 150, 60, 30);
-       
                setResizable(false);
                pack();
                setSize(200,220);
@@ -100,23 +103,24 @@ public class MooDialog extends JDialog {
         * @param tracks        A array containing miditracks.
         */
        private void makeDelDialog(Container pane, Track[] tracks) {
-       
                setTitle("Delete track");
+               // create the contents of the dialog and add to container
                labelB = new JLabel("Delete track", JLabel.CENTER);
                pane.add(labelB);
+               // list of what track to delete
                trackListA = new JComboBox();
                for (int i = 1; i <= tracks.length; i++) trackListA.addItem("Track " + i);
                pane.add(trackListA);
+               // ok and cancelbutton
                cancelButton = new JButton("Cancel");
                pane.add(cancelButton);
                okButton = new JButton("OK");
                pane.add(okButton);
-                       
+               // set layout prop      
                labelB.setBounds(50, 10, 100, 20);
                trackListA.setBounds(40, 35, 120, 20);
                cancelButton.setBounds(10, 90, 80, 30);
                okButton.setBounds(120, 90, 60, 30);
-       
                setResizable(false);
                pack();
                setSize(200,165);
@@ -130,15 +134,17 @@ public class MooDialog extends JDialog {
         * @param tracks        A array containing miditracks.
         */
        private void makeCopyDialog(Container pane, Track[] tracks) {
-       
                setTitle("Copy Track");
+               // create the contents of the dialog and add to container
                labelA = new JLabel("Track to copy", JLabel.CENTER);
                pane.add(labelA);
+               // list of what track to copy
                trackListA = new JComboBox();
                for (int i = 1; i <= tracks.length; i++) trackListA.addItem("Track " + i);
                pane.add(trackListA);
                labelB = new JLabel("Insert after", JLabel.CENTER);
                pane.add(labelB);
+               // list of where to put copied track
                trackListB = new JComboBox();
                for (int i = 1; i <= tracks.length; i++) trackListB.addItem("Track " + i);
                pane.add(trackListB);
@@ -146,14 +152,13 @@ public class MooDialog extends JDialog {
                pane.add(cancelButton);
                okButton = new JButton("OK");
                pane.add(okButton);
-               
+               // set layout prop
                labelA.setBounds(50, 10, 100, 20);
                trackListA.setBounds(40, 35, 120, 20);
                labelB.setBounds(50, 70, 100, 20);
                trackListB.setBounds(40, 95, 120, 20);
                cancelButton.setBounds(10, 150, 80, 30);
                okButton.setBounds(120, 150, 60, 30);
-       
                setResizable(false);
                pack();
                setSize(200,220);
@@ -167,30 +172,32 @@ public class MooDialog extends JDialog {
         * @param tracks        A array containing miditracks.
         */
        private void makeMoveDialog(Container pane, Track[] tracks) {
-       
                setTitle("Move track");
+               // create the contents of the dialog and add to container
                labelA = new JLabel("Track to move", JLabel.CENTER);
                pane.add(labelA);
+               // list of track to move
                trackListA = new JComboBox();
                for (int i = 1; i <= tracks.length; i++) trackListA.addItem("Track " + i);
                pane.add(trackListA);
                labelB = new JLabel("Insert after", JLabel.CENTER);
                pane.add(labelB);
+               // list of where to put moved track
                trackListB = new JComboBox();
                for (int i = 1; i <= tracks.length; i++) trackListB.addItem("Track " + i);
                pane.add(trackListB);
+               // ok and cancelbuttons
                cancelButton = new JButton("Cancel");
                pane.add(cancelButton);
                okButton = new JButton("OK");
                pane.add(okButton);
-               
+               // set layoutprop
                labelA.setBounds(40, 10, 120, 20);
                trackListA.setBounds(40, 35, 120, 20);
                labelB.setBounds(50, 70, 100, 20);
                trackListB.setBounds(40, 95, 120, 20);
                cancelButton.setBounds(10, 150, 80, 30);
                okButton.setBounds(120, 150, 60, 30);
-       
                setResizable(false);
                pack();
                setSize(200,220);
@@ -206,6 +213,7 @@ public class MooDialog extends JDialog {
        private void makeSetPositionDialog(Container pane) {
                
                setTitle("Set edit position");
+               // create the contents of the dialog and add to container
                labelA = new JLabel("Measure", JLabel.CENTER);
                pane.add(labelA);
                labelB = new JLabel("Beat", JLabel.CENTER);
@@ -218,11 +226,12 @@ public class MooDialog extends JDialog {
                pane.add(textFieldB);
                textFieldC = new JTextField();
                pane.add(textFieldC);
+               // ok and cancel buttons
                cancelButton = new JButton("Cancel");
                pane.add(cancelButton);
                okButton = new JButton("OK");
                pane.add(okButton);
-               
+               // set layoutprop
                labelA.setBounds(40, 25, 50, 20);
                labelB.setBounds(105, 25, 50, 20);
                labelC.setBounds(170, 25, 50, 20);
@@ -231,7 +240,6 @@ public class MooDialog extends JDialog {
                textFieldC.setBounds(170, 45, 50, 20);
                cancelButton.setBounds(35, 90, 80, 30);
                okButton.setBounds(155, 90, 60, 30);
-               
                setResizable(false);
                pack();
                setSize(260,165);
@@ -244,8 +252,8 @@ public class MooDialog extends JDialog {
         * @param pane          The container to put the dialog in.
         */
        private void makeInsertMeasureDialog(Container pane){
-       
                setTitle("Insert Measure");
+               // create the contents of the dialog and add to container
                labelA = new JLabel("Insert at:", JLabel.RIGHT);
                pane.add(labelA);
                labelB = new JLabel("Measure count:", JLabel.RIGHT);
@@ -254,18 +262,18 @@ public class MooDialog extends JDialog {
                pane.add(textFieldA);
                textFieldB = new JTextField();
                pane.add(textFieldB);
+               // ok and cancelbutton
                cancelButton = new JButton("Cancel");
                pane.add(cancelButton);
                okButton = new JButton("OK");
                pane.add(okButton);
-               
+               // set layout prop
                labelA.setBounds(20, 20, 110 ,20);
                labelB.setBounds(20, 50, 110, 20);
                textFieldA.setBounds(140 ,20 , 40, 20);
                textFieldB.setBounds(140,50, 40, 20);
                cancelButton.setBounds(20 ,95 , 80, 30);
                okButton.setBounds(120, 95, 60, 30);
-               
                setResizable(false);
                pack();
                setSize(210,175);
@@ -278,8 +286,8 @@ public class MooDialog extends JDialog {
         * @param pane          The container to put the dialog in.
         */
        private void makeDeleteMeasureDialog(Container pane) {
-       
                setTitle("Delete Measure");
+               // create the contents of the dialog and add to container
                labelA = new JLabel("Delete at:", JLabel.RIGHT);
                pane.add(labelA);
                labelB = new JLabel("Measure count:", JLabel.RIGHT);
@@ -288,18 +296,18 @@ public class MooDialog extends JDialog {
                pane.add(textFieldA);
                textFieldB = new JTextField();
                pane.add(textFieldB);
+               // ok and cancelbutton
                cancelButton = new JButton("Cancel");
                pane.add(cancelButton);
                okButton = new JButton("OK");
                pane.add(okButton);
-               
+               // set layout prop
                labelA.setBounds(20, 20, 110 ,20);
                labelB.setBounds(20, 50, 110, 20);
                textFieldA.setBounds(140 ,20 , 40, 20);
                textFieldB.setBounds(140,50, 40, 20);
                cancelButton.setBounds(20 ,95 , 80, 30);
                okButton.setBounds(120, 95, 60, 30);
-               
                setResizable(false);
                pack();
                setSize(210,175);
@@ -312,9 +320,7 @@ public class MooDialog extends JDialog {
         * @param pane          The container to put the dialog in.
         */
        private void makeSetTempoDialog(Container pane) {
-               
                setTitle("Set tempo");
-               
                // create contents of dialog and add to container
                // track edit-intervall labels
                labelA = new JLabel("Measure", JLabel.CENTER);
@@ -409,7 +415,7 @@ public class MooDialog extends JDialog {
                // set bounds of ok and cancelbutton
                cancelButton.setBounds(75, 215, 80, 30);
                okButton.setBounds(195, 215, 60, 30);
-               
+               // set layout prop
                setResizable(false);
                pack();
                setSize(340,300);
@@ -423,7 +429,6 @@ public class MooDialog extends JDialog {
         * @param tracks        A array containing miditracks.
         */
        private void makeTransposeDialog(Container pane, Track[] tracks) {
-               
                setTitle("Transpose");
                // create contents of dialog and add to container
                // track edit-intervall labels
@@ -516,7 +521,7 @@ public class MooDialog extends JDialog {
                // set bounds of ok and cancelbutton
                cancelButton.setBounds(75, 215, 80, 30);
                okButton.setBounds(195, 215, 60, 30);
-               
+               // set layoutprop
                setResizable(false);
                pack();
                setSize(340,300);
@@ -530,9 +535,7 @@ public class MooDialog extends JDialog {
         * @param tracks        A array containing miditracks.
         */
        private void makeScaleVelocityDialog(Container pane, Track[] tracks) {
-               
                setTitle("Scale velocity");
-               
                // create contents of dialog and add to container
                // track edit-intervall labels
                labelA = new JLabel("Measure", JLabel.CENTER);
@@ -638,14 +641,15 @@ public class MooDialog extends JDialog {
                // set bounds of ok and cancelbutton
                cancelButton.setBounds(75, 265, 80, 30);
                okButton.setBounds(195, 265, 60, 30);
-               
+               // set layout prop
                setResizable(false);
                pack();
                setSize(340,350);
                setLocationRelativeTo(Moosique.getGUI());
                setVisible(true);
        }
-       
+       /** creates the "User manual dialog" that displays a  textfile
+       */
        private void makeTextDialog(Container pane, String filename) {
                setTitle("User Manual");
                pane.setLayout(new BoxLayout(pane, BoxLayout.Y_AXIS));

diff --git a/MooMenu.java b/MooMenu.java
index 9062f2d51902820a9c2aa2ea7792ecdc2162d467..f8c67d7602a22b703201e8ec2b1305caf1925aa7 100644 (file)
--- a/MooMenu.java
+++ b/MooMenu.java
@@ -203,9 +203,7 @@ public class MooMenu extends JMenuBar implements ActionListener {
                        MooDialog newDialog = new MooDialog(MooDialog.ADD_TRACK);
                        Moosique.getSequence().createTrack();
                } else if (command == "Delete track...") {
-               
                        MooDialog newDialog = new MooDialog(MooDialog.DELETE_TRACK);
-                       
                        /* Let the user select a track from a list.
                        seq = Moosique.getSequence();
                        seq.deleteTrack(seq.getTracks()[NUMBER]);