X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=micropeak%2FMicroFileChooser.java;h=21ddb0f85e5f990cf73db79d72cf07f164817bc4;hb=670034eef48d63cdaec8d271fa93da984ffe2ea9;hp=0fd63a27469b74cd1194dab9249f947bca69c4a1;hpb=9da9adc2718928de2af65a68cddbcc636cc3e9e8;p=fw%2Faltos

diff --git a/micropeak/MicroFileChooser.java b/micropeak/MicroFileChooser.java
index 0fd63a27..21ddb0f8 100644
--- a/micropeak/MicroFileChooser.java
+++ b/micropeak/MicroFileChooser.java
@@ -21,6 +21,7 @@ import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
 import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib.*;
 
 public class MicroFileChooser extends JFileChooser {
 	JFrame	frame;
@@ -35,24 +36,12 @@ public class MicroFileChooser extends JFileChooser {
 		return file;
 	}
 
-	public InputStream runDialog() {
+	public File runDialog() {
 		int	ret;
 
 		ret = showOpenDialog(frame);
-		if (ret == APPROVE_OPTION) {
-			file = getSelectedFile();
-			if (file == null)
-				return null;
-			filename = file.getName();
-			try {
-				return new FileInputStream(file);
-			} catch (FileNotFoundException fe) {
-				JOptionPane.showMessageDialog(frame,
-							      fe.getMessage(),
-							      "Cannot open file",
-							      JOptionPane.ERROR_MESSAGE);
-			}
-		}
+		if (ret == APPROVE_OPTION)
+			return getSelectedFile();
 		return null;
 	}
 
@@ -61,5 +50,6 @@ public class MicroFileChooser extends JFileChooser {
 		setDialogTitle("Select MicroPeak Data File");
 		setFileFilter(new FileNameExtensionFilter("MicroPeak data file",
 							  "mpd"));
+		setCurrentDirectory(AltosUIPreferences.logdir());
 	}
 }