X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=2bd60d6c02e31c7680278748b1f1457be726a5b0;hb=a7fd31842a602a8ac803d0e09efb4ffabf7a289b;hp=aac4c9b0c655c638bc5e19d0dff5709d32beac62;hpb=9cb10d73fee0e3f36c778fd2a9c9992b87669fe2;p=fw%2Faltos

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index aac4c9b0..2bd60d6c 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
 	AltosVoice		voice;
@@ -179,7 +179,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 
 	Container	bag;
 	AltosFreqList	frequencies;
-	JComboBox	telemetries;
+	JComboBox<String>	telemetries;
 	JLabel		telemetry;
 
 	ActionListener	show_timer;
@@ -225,8 +225,8 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 
 			// Telemetry format menu
 			if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
-				telemetries = new JComboBox();
-				for (int i = 1; i <= Altos.ao_telemetry_max; i++) 
+				telemetries = new JComboBox<String>();
+				for (int i = 1; i <= Altos.ao_telemetry_max; i++)
 					telemetries.addItem(Altos.telemetry_name(i));
 				int telemetry = AltosPreferences.telemetry(serial);
 				if (telemetry <= Altos.ao_telemetry_off ||