projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Adapt to AltosFlightSeries data processing plan
[fw/altos]
/
altosuilib
/
AltosDataChooser.java
diff --git
a/altosuilib/AltosDataChooser.java
b/altosuilib/AltosDataChooser.java
index 8758fc34df213d000f3e770fd7499b5679f15e9a..c6d53a311eaf37c8110d73b9e38c6e6251878208 100644
(file)
--- a/
altosuilib/AltosDataChooser.java
+++ b/
altosuilib/AltosDataChooser.java
@@
-36,7
+36,7
@@
public class AltosDataChooser extends JFileChooser {
return file;
}
return file;
}
- public Altos
StateIterable
runDialog() {
+ public Altos
RecordSet
runDialog() {
int ret;
ret = showOpenDialog(frame);
int ret;
ret = showOpenDialog(frame);
@@
-47,7
+47,7
@@
public class AltosDataChooser extends JFileChooser {
filename = file.getName();
try {
if (filename.endsWith("eeprom")) {
filename = file.getName();
try {
if (filename.endsWith("eeprom")) {
- File
InputStream in = new FileInputStream
(file);
+ File
Reader in = new FileReader
(file);
return new AltosEepromFile(in);
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
return new AltosEepromFile(in);
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
@@
-60,6
+60,11
@@
public class AltosDataChooser extends JFileChooser {
fe.getMessage(),
"Cannot open file",
JOptionPane.ERROR_MESSAGE);
fe.getMessage(),
"Cannot open file",
JOptionPane.ERROR_MESSAGE);
+ } catch (IOException ie) {
+ JOptionPane.showMessageDialog(frame,
+ ie.getMessage(),
+ "Error reading file",
+ JOptionPane.ERROR_MESSAGE);
}
}
return null;
}
}
return null;