X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosLanded.java;h=25d4fcc80ea796ae88c63fabfdd426f90fef3e7d;hb=0cbfa444a9f9159cb509bb47ca5590fc1d709f64;hp=b704651da53632b0e10fb7de2f7d22410b423efd;hpb=21d176f161b90f18f236ef887cef9676d712eee3;p=fw%2Faltos diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java index b704651d..25d4fcc8 100644 --- a/altosui/AltosLanded.java +++ b/altosui/AltosLanded.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 - * 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 @@ -21,8 +22,8 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; import java.io.*; -import org.altusmetrum.altoslib_10.*; -import org.altusmetrum.altosuilib_10.*; +import org.altusmetrum.altoslib_11.*; +import org.altusmetrum.altosuilib_11.*; public class AltosLanded extends AltosUIFlightTab implements ActionListener { @@ -124,7 +125,7 @@ public class AltosLanded extends AltosUIFlightTab implements ActionListener { try { AltosStateIterable states = null; if (filename.endsWith("eeprom")) { - FileInputStream in = new FileInputStream(file); + FileReader in = new FileReader(file); states = new AltosEepromFile(in); } else if (filename.endsWith("telem")) { FileInputStream in = new FileInputStream(file); @@ -142,6 +143,11 @@ public class AltosLanded extends AltosUIFlightTab implements ActionListener { fe.getMessage(), "Cannot open file", JOptionPane.ERROR_MESSAGE); + } catch (IOException ie) { + JOptionPane.showMessageDialog(null, + ie.getMessage(), + "Error reading file file", + JOptionPane.ERROR_MESSAGE); } } }