From 31e3255b6cbfaf95c0e97e2d1ec8de72f845994c Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 28 Aug 2011 15:50:30 -0700
Subject: altosui: Report error message back from libaltos

This includes changing all of the error dialogs to show the error
message rather than just the file name.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosui/AltosUI.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'altosui/AltosUI.java')

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 60adfc7c..3e5bcf43 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -52,8 +52,7 @@ public class AltosUI extends JFrame {
 				new AltosFlightUI(voice, reader, device.getSerial());
 		} catch (FileNotFoundException ee) {
 			JOptionPane.showMessageDialog(AltosUI.this,
-						      String.format("Cannot open device \"%s\"",
-								    device.toShortString()),
+						      ee.getMessage(),
 						      "Cannot open target device",
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (AltosSerialInUseException si) {
@@ -356,7 +355,7 @@ public class AltosUI extends JFrame {
 			else
 				return new AltosTelemetryIterable(in);
 		} catch (FileNotFoundException fe) {
-			System.out.printf("Cannot open '%s'\n", filename);
+			System.out.printf("%s\n", fe.getMessage());
 			return null;
 		}
 	}
@@ -366,7 +365,7 @@ public class AltosUI extends JFrame {
 		try {
 			return new AltosCSV(file);
 		} catch (FileNotFoundException fe) {
-			System.out.printf("Cannot open '%s'\n", filename);
+			System.out.printf("%s\n", fe.getMessage());
 			return null;
 		}
 	}
@@ -376,7 +375,7 @@ public class AltosUI extends JFrame {
 		try {
 			return new AltosKML(file);
 		} catch (FileNotFoundException fe) {
-			System.out.printf("Cannot open '%s'\n", filename);
+			System.out.printf("%s\n", fe.getMessage());
 			return null;
 		}
 	}
-- 
cgit v1.2.3