altoslib: Create data file open helper in AltosLib

[fw/altos] / altosui / AltosLanded.java

diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java
index ded085376fa3fb8ff35c302eaa17ba5b2e93b735..de0d7425ea2e327a605aeb0fd02ce1d0fa1cf9fe 100644 (file)
--- a/altosui/AltosLanded.java
+++ b/altosui/AltosLanded.java
@@ -123,18 +123,17 @@ public class AltosLanded extends AltosUIFlightTab implements ActionListener {
                        if (file != null) {
                                String  filename = file.getName();
                                try {
-                                       AltosStateIterable states = null;
+                                       AltosRecordSet record_set = null;
+                                       FileInputStream in = new FileInputStream(file);
                                        if (filename.endsWith("eeprom")) {
-                                               FileInputStream in = new FileInputStream(file);
-                                               states = new AltosEepromFile(in);
+                                               record_set = new AltosEepromRecordSet(in);
                                        } else if (filename.endsWith("telem")) {
-                                               FileInputStream in = new FileInputStream(file);
-                                               states = new AltosTelemetryFile(in);
+                                               record_set = new AltosTelemetryFile(in);
                                        } else {
                                                throw new FileNotFoundException(filename);
                                        }
                                        try {
-                                               new AltosGraphUI(states, file);
+                                               new AltosGraphUI(record_set, file);
                                        } catch (InterruptedException ie) {
                                        } catch (IOException ie) {
                                        }
@@ -143,6 +142,11 @@ public class AltosLanded extends AltosUIFlightTab implements ActionListener {
                                                                      fe.getMessage(),
                                                                      "Cannot open file",
                                                                      JOptionPane.ERROR_MESSAGE);
+                               } catch (IOException ie) {
+                                       JOptionPane.showMessageDialog(null,
+                                                                     ie.getMessage(),
+                                                                     "Error reading file file",
+                                                                     JOptionPane.ERROR_MESSAGE);
                                }
                        }
                }