projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Start creating new graph interface that takes time series data
[fw/altos]
/
altosuilib
/
AltosDataChooser.java
diff --git
a/altosuilib/AltosDataChooser.java
b/altosuilib/AltosDataChooser.java
index f1a5610e5a57108d9379c04d756f95afab2a38eb..a8c74926381482d0b108575377253c1e5994484c 100644
(file)
--- a/
altosuilib/AltosDataChooser.java
+++ b/
altosuilib/AltosDataChooser.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-46,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);
@@
-59,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;