X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosDataChooser.java;h=7de18afba43a871a7b73cdc6d77c396d546b73a6;hp=15de05c2bb510723dabbe22704cbc41d55e57dad;hb=8d1d8d2a3c129cdbd55427bcda0f26715b02f1ee;hpb=f01096c4b42f9a4720ed0414826c2a283a992545

diff --git a/altosui/AltosDataChooser.java b/altosui/AltosDataChooser.java
index 15de05c2..7de18afb 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_1.*;
+import org.altusmetrum.altosuilib_1.*;
 
 public class AltosDataChooser extends JFileChooser {
 	JFrame	frame;
@@ -56,12 +52,15 @@ public class AltosDataChooser extends JFileChooser {
 				} 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);
 				} else {
 					throw new FileNotFoundException();
 				}
 			} catch (FileNotFoundException fe) {
 				JOptionPane.showMessageDialog(frame,
-							      filename,
+							      fe.getMessage(),
 							      "Cannot open file",
 							      JOptionPane.ERROR_MESSAGE);
 			}
@@ -72,8 +71,14 @@ 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("MegaMetrum eeprom file",
+							  "mega"));
 		setFileFilter(new FileNameExtensionFilter("Flight data file",
-							  "telem", "eeprom"));
-		setCurrentDirectory(AltosPreferences.logdir());
+							  "telem", "eeprom", "mega"));
+		setCurrentDirectory(AltosUIPreferences.logdir());
 	}
 }