altoslib: Save separate config for local and remote. Use in idle

[fw/altos] / altosui / AltosLanded.java

diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java
index a75d5a9f504786cc09d7df89fb6668ed473396e6..c2e149232cbfed35871e0a96680d74d8a54b29d8 100644 (file)
--- a/altosui/AltosLanded.java
+++ b/altosui/AltosLanded.java
@@ -22,8 +22,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
-import org.altusmetrum.altoslib_11.*;
-import org.altusmetrum.altosuilib_11.*;
+import org.altusmetrum.altoslib_12.*;
+import org.altusmetrum.altosuilib_12.*;
 
 public class AltosLanded extends AltosUIFlightTab implements ActionListener {
 
@@ -124,10 +124,10 @@ public class AltosLanded extends AltosUIFlightTab implements ActionListener {
                                String  filename = file.getName();
                                try {
                                        AltosRecordSet record_set = null;
+                                       FileInputStream in = new FileInputStream(file);
                                        if (filename.endsWith("eeprom")) {
-                                               record_set = new AltosEepromRecordSet(new FileReader(file));
+                                               record_set = new AltosEepromRecordSet(in);
                                        } else if (filename.endsWith("telem")) {
-                                               FileInputStream in = new FileInputStream(file);
                                                record_set = new AltosTelemetryFile(in);
                                        } else {
                                                throw new FileNotFoundException(filename);