X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosUI.java;h=3e5bcf434fc5b8b8276fe2074873e528d8032d74;hp=8399b7c8440e101a1d271c5c00ed4542fe0b6786;hb=31e3255b6cbfaf95c0e97e2d1ec8de72f845994c;hpb=02df2141e5a67afc16acd01a6c60f3cc61052b93

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 8399b7c8..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) {
@@ -210,7 +209,7 @@ public class AltosUI extends JFrame {
 			});
 		b.setToolTipText("Check flight readiness of altimeter in idle mode");
 
-		b = addButton(2, 2, "Launch Controller");
+		b = addButton(3, 2, "Launch Controller");
 		b.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
 					LaunchController();
@@ -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;
 		}
 	}