X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=5db0ee92864641e273e5ee80c31828ccb195d627;hb=aba1703a1cff3da001d64bf2d15a591816e3350e;hp=43deb631705f86abc30dd5f072570daeb6e3a7ba;hpb=c11b2f5caa3fbe2bc977e716ec1c3ccee9e75884;p=fw%2Faltos

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 43deb631..5db0ee92 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -22,8 +22,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
 public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 	AltosVoice		voice;
@@ -169,10 +169,10 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 		exit_on_close = true;
 	}
 
-	Container	bag;
-	AltosFreqList	frequencies;
-	JComboBox<String>	telemetries;
-	JLabel		telemetry;
+	Container		bag;
+	AltosUIFreqList		frequencies;
+	AltosUITelemetryList	telemetries;
+	JLabel			telemetry;
 
 	ActionListener	show_timer;
 
@@ -193,8 +193,8 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 
 		/* Stick channel selector at top of table for telemetry monitoring */
 		if (serial >= 0) {
-			// Channel menu
-			frequencies = new AltosFreqList(AltosUIPreferences.frequency(serial));
+			// Frequency menu
+			frequencies = new AltosUIFreqList(AltosUIPreferences.frequency(serial));
 			frequencies.set_product("Monitor");
 			frequencies.set_serial(serial);
 			frequencies.addActionListener(new ActionListener() {
@@ -217,7 +217,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 			c.anchor = GridBagConstraints.WEST;
 			bag.add (frequencies, c);
 
-			// Telemetry format menu
+			// Telemetry format list
 			if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
 				telemetries = new JComboBox<String>();
 				for (int i = 1; i <= Altos.ao_telemetry_max; i++)