X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosDataChooser.java;h=4d2f321ec454c6ec08c8541fa682cc44b76360ad;hp=15de05c2bb510723dabbe22704cbc41d55e57dad;hb=6e0d672b8a516a604d8ea1abd2bed113c608143f;hpb=51c7741040d95c5deece939dae5e4136cc04afc4 diff --git a/altosui/AltosDataChooser.java b/altosui/AltosDataChooser.java index 15de05c2..4d2f321e 100644 --- a/altosui/AltosDataChooser.java +++ b/altosui/AltosDataChooser.java @@ -17,15 +17,10 @@ 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.*; public class AltosDataChooser extends JFileChooser { JFrame frame; @@ -56,12 +51,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); } @@ -73,7 +71,7 @@ public class AltosDataChooser extends JFileChooser { frame = in_frame; setDialogTitle("Select Flight Record File"); setFileFilter(new FileNameExtensionFilter("Flight data file", - "telem", "eeprom")); - setCurrentDirectory(AltosPreferences.logdir()); + "telem", "eeprom", "mega")); + setCurrentDirectory(AltosUIPreferences.logdir()); } }