summaryrefslogtreecommitdiff
path: root/altosuilib
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 /altosuilib
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 'altosuilib')
-rw-r--r--altosuilib/AltosDataChooser.java16
1 files changed, 1 insertions, 15 deletions
diff --git a/altosuilib/AltosDataChooser.java b/altosuilib/AltosDataChooser.java
index c6d53a31..c26d3673 100644
--- a/altosuilib/AltosDataChooser.java
+++ b/altosuilib/AltosDataChooser.java
@@ -44,22 +44,8 @@ public class AltosDataChooser extends JFileChooser {
file = getSelectedFile();
if (file == null)
return null;
- filename = file.getName();
try {
- if (filename.endsWith("eeprom")) {
- FileReader in = new FileReader(file);
- return new AltosEepromFile(in);
- } else if (filename.endsWith("telem")) {
- FileInputStream in = new FileInputStream(file);
- return new AltosTelemetryFile(in);
- } else {
- throw new FileNotFoundException();
- }
- } catch (FileNotFoundException fe) {
- JOptionPane.showMessageDialog(frame,
- fe.getMessage(),
- "Cannot open file",
- JOptionPane.ERROR_MESSAGE);
+ return AltosLib.record_set(file);
} catch (IOException ie) {
JOptionPane.showMessageDialog(frame,
ie.getMessage(),