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

diff --git a/altosui/AltosDataChooser.java b/altosui/AltosDataChooser.java
index 15de05c2..43726a44 100644
--- a/altosui/AltosDataChooser.java
+++ b/altosui/AltosDataChooser.java
@@ -17,15 +17,11 @@
 
 package altosui;
 
-import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosDataChooser extends JFileChooser {
 	JFrame	frame;
@@ -40,7 +36,7 @@ public class AltosDataChooser extends JFileChooser {
 		return file;
 	}
 
-	public AltosRecordIterable runDialog() {
+	public AltosStateIterable runDialog() {
 		int	ret;
 
 		ret = showOpenDialog(frame);
@@ -52,16 +48,16 @@ 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);
+					return new AltosTelemetryFile(in);
 				} else {
 					throw new FileNotFoundException();
 				}
 			} catch (FileNotFoundException fe) {
 				JOptionPane.showMessageDialog(frame,
-							      filename,
+							      fe.getMessage(),
 							      "Cannot open file",
 							      JOptionPane.ERROR_MESSAGE);
 			}
@@ -72,8 +68,16 @@ public class AltosDataChooser extends JFileChooser {
 	public AltosDataChooser(JFrame in_frame) {
 		frame = in_frame;
 		setDialogTitle("Select Flight Record File");
+		setFileFilter(new FileNameExtensionFilter("TeleMetrum eeprom file",
+							  "eeprom"));
+		setFileFilter(new FileNameExtensionFilter("Telemetry file",
+							  "telem"));
+		setFileFilter(new FileNameExtensionFilter("TeleMega eeprom file",
+							  "mega"));
+		setFileFilter(new FileNameExtensionFilter("EasyMini eeprom file",
+							  "mini"));
 		setFileFilter(new FileNameExtensionFilter("Flight data file",
-							  "telem", "eeprom"));
-		setCurrentDirectory(AltosPreferences.logdir());
+							  "telem", "eeprom", "mega", "mini"));
+		setCurrentDirectory(AltosUIPreferences.logdir());
 	}
 }