projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up telefireone name references
[fw/altos]
/
altoslib
/
AltosStateIterable.java
diff --git
a/altoslib/AltosStateIterable.java
b/altoslib/AltosStateIterable.java
index 5332aecd04822a33cd25eb7ac93b522afd6eaee2..ec3d944d92843f90dd35852a62c8fb2997976629 100644
(file)
--- a/
altoslib/AltosStateIterable.java
+++ b/
altoslib/AltosStateIterable.java
@@
-29,15
+29,13
@@
public abstract class AltosStateIterable implements Iterable<AltosState> {
public abstract void write(PrintStream out);
public static AltosStateIterable iterable(File file) {
public abstract void write(PrintStream out);
public static AltosStateIterable iterable(File file) {
- FileInputStream in;
try {
try {
- in = new FileInputStream(file);
+ if (file.getName().endsWith("telem"))
+ return new AltosTelemetryFile(new FileInputStream(file));
+ else
+ return new AltosEepromFile(new FileReader(file));
} catch (Exception e) {
return null;
}
} catch (Exception e) {
return null;
}
- if (file.getName().endsWith("telem"))
- return new AltosTelemetryFile(in);
- else
- return new AltosEepromFile(in);
}
}
}
}