altosui: Use new eeprom reading code
authorKeith Packard <keithp@keithp.com>
Tue, 9 May 2017 07:22:35 +0000 (00:22 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 9 May 2017 07:22:35 +0000 (00:22 -0700)
This just means using different file opening functions, which then
get matched by AltosEepromFile and sent off to the new eeprom code.

Signed-off-by: Keith Packard <keithp@keithp.com>
altosui/AltosUI.java

index 019bbb9..b0c6d33 100644 (file)
@@ -448,16 +448,23 @@ public class AltosUI extends AltosUIFrame {
 
        static AltosStateIterable record_iterable(File file) {
                FileInputStream in;
-               try {
-                       in = new FileInputStream(file);
-               } catch (Exception e) {
-                       System.out.printf("Failed to open file '%s'\n", file);
-                       return null;
+               if (file.getName().endsWith("telem")) {
+                       try {
+                               in = new FileInputStream(file);
+                               return new AltosTelemetryFile(in);
+                       } catch (Exception e) {
+                               System.out.printf("Failed to open file '%s'\n", file);
+                       }
+               } else {
+
+                       try {
+                               AltosEepromFile f = new AltosEepromFile(new FileReader(file));
+                               return f;
+                       } catch (Exception e) {
+                               System.out.printf("Failed to open file '%s'\n", file);
+                       }
                }
-               if (file.getName().endsWith("telem"))
-                       return new AltosTelemetryFile(in);
-               else
-                       return new AltosEepromFile(in);
+               return null;
        }
 
        static AltosReplayReader replay_file(File file) {