From: Keith Packard <keithp@keithp.com>
Date: Tue, 26 Apr 2011 05:28:40 +0000 (-0700)
Subject: altosui: Display reader name (usually the device) when an I/O error occurs
X-Git-Tag: 0.9.3~45
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=109344d54d3fa4f79342fd1ea2a3f4085475e30c

altosui: Display reader name (usually the device) when an I/O error occurs

Access the reader name directly from the reader object instead of a
local variable (which wasn't getting set anyways).

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosui/AltosDisplayThread.java b/altosui/AltosDisplayThread.java
index 84abfae9..ce8d9159 100644
--- a/altosui/AltosDisplayThread.java
+++ b/altosui/AltosDisplayThread.java
@@ -33,7 +33,6 @@ public class AltosDisplayThread extends Thread {
 	Frame			parent;
 	IdleThread		idle_thread;
 	AltosVoice		voice;
-	String			name;
 	AltosFlightReader	reader;
 	int			crc_errors;
 	AltosFlightDisplay	display;
@@ -57,19 +56,18 @@ public class AltosDisplayThread extends Thread {
 		SwingUtilities.invokeLater(r);
 	}
 
-	void reading_error_internal(String name) {
+	void reading_error_internal() {
 		JOptionPane.showMessageDialog(parent,
-					      String.format("Error reading from \"%s\"", name),
+					      String.format("Error reading from \"%s\"", reader.name),
 					      "Telemetry Read Error",
 					      JOptionPane.ERROR_MESSAGE);
 	}
 
-	void reading_error_safely(String in_name) {
-		final String name = in_name;
+	void reading_error_safely() {
 		Runnable r = new Runnable() {
 				public void run() {
 					try {
-						reading_error_internal(name);
+						reading_error_internal();
 					} catch (Exception ex) {
 					}
 				}
@@ -258,7 +256,7 @@ public class AltosDisplayThread extends Thread {
 		} catch (InterruptedException ee) {
 			interrupted = true;
 		} catch (IOException ie) {
-			reading_error_safely(name);
+			reading_error_safely();
 		} finally {
 			if (!interrupted)
 				idle_thread.report(true);