From: Keith Packard <keithp@keithp.com>
Date: Fri, 26 Nov 2010 00:09:37 +0000 (-0800)
Subject: altosui: Eliminate unnecessary thread from config UI
X-Git-Tag: debian/0.7.1+168+gcb08bc2~6
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=6d3612e267cd4c1e7fdd74fc33952b3f26f870f5

altosui: Eliminate unnecessary thread from config UI

There's no reason to use a thread to run a dialog box, and
swing doesn't like threads anyways.

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

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index 1c42870f..38e1484e 100644
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -30,7 +30,7 @@ import java.util.concurrent.*;
 
 import libaltosJNI.*;
 
-public class AltosConfig implements Runnable, ActionListener {
+public class AltosConfig implements ActionListener {
 
 	class int_ref {
 		int	value;
@@ -64,7 +64,6 @@ public class AltosConfig implements Runnable, ActionListener {
 	AltosDevice	device;
 	AltosSerial	serial_line;
 	boolean		remote;
-	Thread		config_thread;
 	int_ref		serial;
 	int_ref		main_deploy;
 	int_ref		apogee_delay;
@@ -241,17 +240,6 @@ public class AltosConfig implements Runnable, ActionListener {
 		}
 	}
 
-	public void run () {
-		try {
-			init_ui();
-			config_ui.make_visible();
-		} catch (InterruptedException ie) {
-			abort();
-		} catch (TimeoutException te) {
-			abort();
-		}
-	}
-
 	public AltosConfig(JFrame given_owner) {
 		owner = given_owner;
 
@@ -270,8 +258,14 @@ public class AltosConfig implements Runnable, ActionListener {
 				serial_line = new AltosSerial(device);
 				if (!device.matchProduct(AltosDevice.product_telemetrum))
 					remote = true;
-				config_thread = new Thread(this);
-				config_thread.start();
+				try {
+					init_ui();
+					config_ui.make_visible();
+				} catch (InterruptedException ie) {
+					abort();
+				} catch (TimeoutException te) {
+					abort();
+				}
 			} catch (FileNotFoundException ee) {
 				JOptionPane.showMessageDialog(owner,
 							      String.format("Cannot open device \"%s\"",