projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Remove older eeprom handling code
[fw/altos]
/
altosui
/
AltosLanded.java
diff --git
a/altosui/AltosLanded.java
b/altosui/AltosLanded.java
index ded085376fa3fb8ff35c302eaa17ba5b2e93b735..25d4fcc80ea796ae88c63fabfdd426f90fef3e7d 100644
(file)
--- a/
altosui/AltosLanded.java
+++ b/
altosui/AltosLanded.java
@@
-125,7
+125,7
@@
public class AltosLanded extends AltosUIFlightTab implements ActionListener {
try {
AltosStateIterable states = null;
if (filename.endsWith("eeprom")) {
try {
AltosStateIterable states = null;
if (filename.endsWith("eeprom")) {
- File
InputStream in = new FileInputStream
(file);
+ File
Reader in = new FileReader
(file);
states = new AltosEepromFile(in);
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
states = new AltosEepromFile(in);
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
@@
-143,6
+143,11
@@
public class AltosLanded extends AltosUIFlightTab implements ActionListener {
fe.getMessage(),
"Cannot open file",
JOptionPane.ERROR_MESSAGE);
fe.getMessage(),
"Cannot open file",
JOptionPane.ERROR_MESSAGE);
+ } catch (IOException ie) {
+ JOptionPane.showMessageDialog(null,
+ ie.getMessage(),
+ "Error reading file file",
+ JOptionPane.ERROR_MESSAGE);
}
}
}
}
}
}