summaryrefslogtreecommitdiff
path: root/telegps/TeleGPS.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2017-05-28 14:00:15 -0700
committerKeith Packard <keithp@keithp.com>2017-05-28 14:04:21 -0700
commitda914cd72411af8c36af05b13c11b9093c8a378c (patch)
tree9443f90fbf21315b609631c300bfb4acb3ac23da /telegps/TeleGPS.java
parent9e1295ff74d03f940fc68e6795bf30687162a440 (diff)
altoslib: Create data file open helper in AltosLib
Use InputStream everywhere, instead of Reader. Create private string input stream as java one is deprecated. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'telegps/TeleGPS.java')
-rw-r--r--telegps/TeleGPS.java19
1 files changed, 4 insertions, 15 deletions
diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java
index 5e500e02..e032726a 100644
--- a/telegps/TeleGPS.java
+++ b/telegps/TeleGPS.java
@@ -620,21 +620,10 @@ public class TeleGPS
}
static AltosRecordSet record_set(File file) {
- FileInputStream in;
- 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 {
- return new AltosEepromFile(new FileReader(file));
- } catch (Exception e) {
- System.out.printf("Failed to open file '%s'\n", file);
- }
+ try {
+ return AltosLib.record_set(file);
+ } catch (IOException ie) {
+ System.out.printf("%s\n", ie.getMessage());
}
return null;
}