X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosui%2FAltosLanded.java;h=a75d5a9f504786cc09d7df89fb6668ed473396e6;hb=2e82051a6aaaccf1e8a242f9c8141e4167e652d2;hp=77c504b83792279b28c98e4424c6c28f0e7f0e00;hpb=97adfff4cfb67c17a96f3ff46606b4e439422b01;p=fw%2Faltos

diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java
index 77c504b8..a75d5a9f 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
@@ -122,18 +123,17 @@ public class AltosLanded extends AltosUIFlightTab implements ActionListener {
 			if (file != null) {
 				String	filename = file.getName();
 				try {
-					AltosStateIterable states = null;
+					AltosRecordSet record_set = null;
 					if (filename.endsWith("eeprom")) {
-						FileInputStream in = new FileInputStream(file);
-						states = new AltosEepromFile(in);
+						record_set = new AltosEepromRecordSet(new FileReader(file));
 					} else if (filename.endsWith("telem")) {
 						FileInputStream in = new FileInputStream(file);
-						states = new AltosTelemetryFile(in);
+						record_set = new AltosTelemetryFile(in);
 					} else {
 						throw new FileNotFoundException(filename);
 					}
 					try {
-						new AltosGraphUI(states, file);
+						new AltosGraphUI(record_set, file);
 					} catch (InterruptedException ie) {
 					} catch (IOException ie) {
 					}
@@ -142,6 +142,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);
 				}
 			}
 		}