X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosDataChooser.java;h=43726a44de71e254b1a0020f6263a753cc26752c;hp=242af9ad4876c76c6ef036269b49415450f1a943;hb=4cec35564324f909dcddeb7c0d83a2daa8223042;hpb=cf03ab3383b679e6617e8ab7004be91e5a727562

diff --git a/altosui/AltosDataChooser.java b/altosui/AltosDataChooser.java
index 242af9ad..43726a44 100644
--- a/altosui/AltosDataChooser.java
+++ b/altosui/AltosDataChooser.java
@@ -20,8 +20,8 @@ package altosui;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
-import org.altusmetrum.AltosLib.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosDataChooser extends JFileChooser {
 	JFrame	frame;
@@ -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();
 				}
@@ -75,10 +72,12 @@ public class AltosDataChooser extends JFileChooser {
 							  "eeprom"));
 		setFileFilter(new FileNameExtensionFilter("Telemetry file",
 							  "telem"));
-		setFileFilter(new FileNameExtensionFilter("MegaMetrum eeprom file",
+		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());
 	}
 }