X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosDataChooser.java;h=c0d6668279574e051dfafdf0dce2e097b12016f4;hp=f914f138f2fe7d2e2d116744a343910283ad8cc9;hb=4e1b134e29313a1bdac18de57fe547299e5ded2a;hpb=aa7eac32adf4c2cdf441991d02411758f2682d1e

diff --git a/altosui/AltosDataChooser.java b/altosui/AltosDataChooser.java
index f914f138..c0d66682 100644
--- a/altosui/AltosDataChooser.java
+++ b/altosui/AltosDataChooser.java
@@ -20,7 +20,7 @@ package altosui;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 import org.altusmetrum.altosuilib_1.*;
 
 public class AltosDataChooser extends JFileChooser {
@@ -36,7 +36,7 @@ public class AltosDataChooser extends JFileChooser {
 		return file;
 	}
 
-	public AltosRecordIterable runDialog() {
+	public AltosStateIterable runDialog() {
 		int	ret;
 
 		ret = showOpenDialog(frame);
@@ -48,13 +48,10 @@ public class AltosDataChooser extends JFileChooser {
 			try {
 				if (filename.endsWith("eeprom")) {
 					FileInputStream in = new FileInputStream(file);
-					return new AltosEepromIterable(in);
+					return new AltosEepromFile(in);
 				} else if (filename.endsWith("telem")) {
 					FileInputStream in = new FileInputStream(file);
-					return new AltosTelemetryIterable(in);
-				} else if (filename.endsWith("mega")) {
-					FileInputStream in = new FileInputStream(file);
-					return new AltosEepromMegaIterable(in);
+					return new AltosTelemetryFile(in);
 				} else {
 					throw new FileNotFoundException();
 				}
@@ -77,8 +74,10 @@ public class AltosDataChooser extends JFileChooser {
 							  "telem"));
 		setFileFilter(new FileNameExtensionFilter("TeleMega eeprom file",
 							  "mega"));
+		setFileFilter(new FileNameExtensionFilter("EasyMini eeprom file",
+							  "mini"));
 		setFileFilter(new FileNameExtensionFilter("Flight data file",
-							  "telem", "eeprom", "mega"));
+							  "telem", "eeprom", "mega", "mini"));
 		setCurrentDirectory(AltosUIPreferences.logdir());
 	}
 }