*
* 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
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib_9;
+package org.altusmetrum.altosuilib_14;
import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
import java.io.*;
-import org.altusmetrum.altoslib_9.*;
+import org.altusmetrum.altoslib_14.*;
public class AltosDataChooser extends JFileChooser {
JFrame frame;
return file;
}
- public AltosStateIterable runDialog() {
+ public AltosRecordSet runDialog() {
int ret;
ret = showOpenDialog(frame);
file = getSelectedFile();
if (file == null)
return null;
- filename = file.getName();
try {
- if (filename.endsWith("eeprom")) {
- FileInputStream in = new FileInputStream(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) {
+ return AltosLib.record_set(file);
+ } catch (IOException ie) {
JOptionPane.showMessageDialog(frame,
- fe.getMessage(),
- "Cannot open file",
+ ie.getMessage(),
+ "Error reading file",
JOptionPane.ERROR_MESSAGE);
}
}