Fixed accessors, encoders and decoders for tempo and time signature.

[moosique.git] / MooMenu.java

diff --git a/MooMenu.java b/MooMenu.java
index d30d181d20541aae81695a48401d2b2d9232bfa0..25cab5c99062b20270fbd13bf1f29d4d6724f6ed 100644 (file)
--- a/MooMenu.java
+++ b/MooMenu.java
@@ -167,9 +167,9 @@ public class MooMenu extends JMenuBar implements ActionListener {
                        // Stores the current directory and loads the selected file.
                        File file = chooser.getSelectedFile();
                        if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(file)) {
-                               directory = chooser.getSelectedFile().getParentFile();
+                               directory = file.getParentFile();
                                if (!Moosique.promptOnUnsavedChanges())
-                                       Moosique.load(chooser.getSelectedFile().getAbsolutePath());
+                                       Moosique.load(file);
                        }
                } else if (command == "Save") {
                        if (!Moosique.save()) showSaveAsDialog();
@@ -221,13 +221,10 @@ public class MooMenu extends JMenuBar implements ActionListener {
                
                } else if (command == "Set tempo...") {
                        MooDialog newDialog = new MooDialog(MooDialog.SET_TEMPO);
-               
                } else if (command == "Scale velocity...") {
                        MooDialog newDialog = new MooDialog(MooDialog.SCALE_VELOCITY);
-               
                } else if (command == "Transpose...") {
                        MooDialog newDialog = new MooDialog(MooDialog.TRANSPOSE);
-               
                } else if (command == "User manual") {
                        MooDialog manual = new MooDialog(MooDialog.MANUAL);
                } else if (command == "About") {
@@ -253,7 +250,7 @@ public class MooMenu extends JMenuBar implements ActionListener {
                        File file = chooser.getSelectedFile();
                        if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(file)) {
                                directory = file.getParentFile();
-                               Moosique.saveAs(file.getAbsolutePath());
+                               Moosique.saveAs(file);
                        }
        }