Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altosui / AltosDataChooser.java

diff --git a/altosui/AltosDataChooser.java b/altosui/AltosDataChooser.java
index 15de05c2bb510723dabbe22704cbc41d55e57dad..b003a606d02788d0e2e3d86ed4390c54cc6771ac 100644 (file)
--- a/altosui/AltosDataChooser.java
+++ b/altosui/AltosDataChooser.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package AltosUI;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -26,6 +26,7 @@ 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 +57,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 +77,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());
        }
 }