altoslib: Create data file open helper in AltosLib

[fw/altos] / altosuilib / AltosDataChooser.java

diff --git a/altosuilib/AltosDataChooser.java b/altosuilib/AltosDataChooser.java
index c6d53a311eaf37c8110d73b9e38c6e6251878208..c26d367301ad9a089be57cf99a9afe72dbc52d1d 100644 (file)
--- a/altosuilib/AltosDataChooser.java
+++ b/altosuilib/AltosDataChooser.java
@@ -44,22 +44,8 @@ public class AltosDataChooser extends JFileChooser {
                        file = getSelectedFile();
                        if (file == null)
                                return null;
-                       filename = file.getName();
                        try {
-                               if (filename.endsWith("eeprom")) {
-                                       FileReader in = new FileReader(file);
-                                       return new AltosEepromFile(in);
-                               } else if (filename.endsWith("telem")) {
-                                       FileInputStream in = new FileInputStream(file);
-                                       return new AltosTelemetryFile(in);
-                               } else {
-                                       throw new FileNotFoundException();
-                               }
-                       } catch (FileNotFoundException fe) {
-                               JOptionPane.showMessageDialog(frame,
-                                                             fe.getMessage(),
-                                                             "Cannot open file",
-                                                             JOptionPane.ERROR_MESSAGE);
+                               return AltosLib.record_set(file);
                        } catch (IOException ie) {
                                JOptionPane.showMessageDialog(frame,
                                                              ie.getMessage(),