altosuilib: Adapt to AltosFlightSeries data processing plan

[fw/altos] / altosuilib / AltosDataChooser.java

diff --git a/altosuilib/AltosDataChooser.java b/altosuilib/AltosDataChooser.java
index ea8a5648c99ff5a3adb85cabaacb76e02c2244af..c6d53a311eaf37c8110d73b9e38c6e6251878208 100644 (file)
--- a/altosuilib/AltosDataChooser.java
+++ b/altosuilib/AltosDataChooser.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,12 +16,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_11;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_11.*;
 
 public class AltosDataChooser extends JFileChooser {
        JFrame  frame;
@@ -35,7 +36,7 @@ public class AltosDataChooser extends JFileChooser {
                return file;
        }
 
-       public AltosStateIterable runDialog() {
+       public AltosRecordSet runDialog() {
                int     ret;
 
                ret = showOpenDialog(frame);
@@ -46,7 +47,7 @@ public class AltosDataChooser extends JFileChooser {
                        filename = file.getName();
                        try {
                                if (filename.endsWith("eeprom")) {
-                                       FileInputStream in = new FileInputStream(file);
+                                       FileReader in = new FileReader(file);
                                        return new AltosEepromFile(in);
                                } else if (filename.endsWith("telem")) {
                                        FileInputStream in = new FileInputStream(file);
@@ -59,6 +60,11 @@ public class AltosDataChooser extends JFileChooser {
                                                              fe.getMessage(),
                                                              "Cannot open file",
                                                              JOptionPane.ERROR_MESSAGE);
+                       } catch (IOException ie) {
+                               JOptionPane.showMessageDialog(frame,
+                                                             ie.getMessage(),
+                                                             "Error reading file",
+                                                             JOptionPane.ERROR_MESSAGE);
                        }
                }
                return null;