Merge branch 'branch-1.8' into debian

1 files changed, 12 insertions, 8 deletions

diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java
index ded08537..c2e14923 100644
--- a/altosui/AltosLanded.java
+++ b/altosui/AltosLanded.java
@@ -22,8 +22,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
-import org.altusmetrum.altoslib_11.*;
-import org.altusmetrum.altosuilib_11.*;
+import org.altusmetrum.altoslib_12.*;
+import org.altusmetrum.altosuilib_12.*;
 
 public class AltosLanded extends AltosUIFlightTab implements ActionListener {
 
@@ -123,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;
+					FileInputStream in = new FileInputStream(file);
 					if (filename.endsWith("eeprom")) {
-						FileInputStream in = new FileInputStream(file);
-						states = new AltosEepromFile(in);
+						record_set = new AltosEepromRecordSet(in);
 					} 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) {
 					}
@@ -143,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);
 				}
 			}
 		}