Fixed the select function.

[moosique.git] / MooMenu.java

diff --git a/MooMenu.java b/MooMenu.java
index c4a01c1a42dd8a934e93fad4281124a43923f065..053030b94e8746fd898f957df2620eee40f3711f 100644 (file)
--- a/MooMenu.java
+++ b/MooMenu.java
@@ -136,7 +136,7 @@ public class MooMenu extends JMenuBar implements ActionListener {
        }
        /**
        * Gets the users command of takes and properiate action
-       * @param e      the action perfomed
+       * @param e      The action perfomed.
        */
        public void actionPerformed(ActionEvent e) {
                String command = e.getActionCommand();
@@ -161,23 +161,9 @@ public class MooMenu extends JMenuBar implements ActionListener {
                                Moosique.load(chooser.getSelectedFile().getAbsolutePath());
                        }
                } else if (command == "Save") {
-                       Moosique.save();
+                       if (!Moosique.save()) showSaveAsDialog();
                } else if (command == "Save as...") {
-                       // Shows a file chooser. If shown previously, starts in the current directory.
-                       if (directory != null) {
-                               chooser = new JFileChooser(directory);
-                       } else {
-                               chooser = new JFileChooser();
-                       }
-                       chooser.addChoosableFileFilter(new MidiFileFilter());
-                       int returnVal = chooser.showSaveDialog(this);
-
-                       // Stores the current directory and loads the selected file.
-                       File file = chooser.getSelectedFile();
-                       if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(file)) {
-                               directory = file.getParentFile();
-                               Moosique.saveAs(file.getAbsolutePath());
-                       }
+                       showSaveAsDialog();
                } else if (command == "Exit") {
                        Moosique.quit();
                } else if (command == "Copy") {
@@ -240,6 +226,24 @@ public class MooMenu extends JMenuBar implements ActionListener {
                }
        }
 
+       private void showSaveAsDialog() {
+                       // Shows a file chooser. If shown previously, starts in the current directory.
+                       if (directory != null) {
+                               chooser = new JFileChooser(directory);
+                       } else {
+                               chooser = new JFileChooser();
+                       }
+                       chooser.addChoosableFileFilter(new MidiFileFilter());
+                       int returnVal = chooser.showSaveDialog(this);
+
+                       // Stores the current directory and loads the selected file.
+                       File file = chooser.getSelectedFile();
+                       if(returnVal == JFileChooser.APPROVE_OPTION && isMidiFile(file)) {
+                               directory = file.getParentFile();
+                               Moosique.saveAs(file.getAbsolutePath());
+                       }
+       }
+
        class MidiFileFilter extends javax.swing.filechooser.FileFilter {
                public boolean accept(File f) {
                        if(f != null) {
@@ -248,7 +252,7 @@ public class MooMenu extends JMenuBar implements ActionListener {
                        return false;
                }
                
-               /*
+               /**
                 * gets the description of the filetype
                 * @return "Midifiles   the only filetyp compatibel with the program
                 */