X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosIdleMonitorUI.java;h=0230ff2f767959a2c73301e4c5d2ae21748a26e4;hp=63d862918ae8cc467eafadfe4d7d586d71d65af0;hb=8a2be4d36a3b116d82529805430c5fb665688267;hpb=bd440afc2a6e37b74fffcf1b977e149485095316

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 63d86291..0230ff2f 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -102,8 +102,17 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		SwingUtilities.invokeLater(r);
 	}
 
+	public void failed() {
+		Runnable r = new Runnable() {
+				public void run() {
+					close();
+				}
+			};
+		SwingUtilities.invokeLater(r);
+	}
+
 	Container	bag;
-	AltosFreqList	frequencies;
+	AltosUIFreqList	frequencies;
 	JTextField	callsign_value;
 
 	/* DocumentListener interface methods */
@@ -174,6 +183,19 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		}
 	}
 
+	private void close() {
+		try {
+			disconnect();
+		} catch (Exception ex) {
+			System.out.printf("Exception %s\n", ex.toString());
+			for (StackTraceElement el : ex.getStackTrace())
+				System.out.printf("%s\n", el.toString());
+		}
+		setVisible(false);
+		dispose();
+		AltosUIPreferences.unregister_font_listener(AltosIdleMonitorUI.this);
+	}
+
 	public AltosIdleMonitorUI(JFrame in_owner)
 		throws FileNotFoundException, TimeoutException, InterruptedException {
 
@@ -184,9 +206,10 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 
 		serial = device.getSerial();
 
-		AltosLink link;
+		AltosSerial link;
 		try {
 			link = new AltosSerial(device);
+			link.set_frame(this);
 		} catch (Exception ex) {
 			idle_exception(in_owner, ex);
 			return;
@@ -200,7 +223,7 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		/* Stick frequency selector at top of table for telemetry monitoring */
 		if (remote && serial >= 0) {
 			// Frequency menu
-			frequencies = new AltosFreqList(AltosUIPreferences.frequency(serial));
+			frequencies = new AltosUIFreqList(AltosUIPreferences.frequency(serial));
 			frequencies.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						double frequency = frequencies.frequency();
@@ -248,16 +271,7 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		addWindowListener(new WindowAdapter() {
 				@Override
 				public void windowClosing(WindowEvent e) {
-					try {
-						disconnect();
-					} catch (Exception ex) {
-						System.out.printf("Exception %s\n", ex.toString());
-						for (StackTraceElement el : ex.getStackTrace())
-							System.out.printf("%s\n", el.toString());
-					}
-					setVisible(false);
-					dispose();
-					AltosUIPreferences.unregister_font_listener(AltosIdleMonitorUI.this);
+					close();
 				}
 			});