X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosScanUI.java;h=1f1f59ad1166dc0942bed57aa983e3be434e12d0;hp=419fe9577acc4632ef4b710552277f1583acf994;hb=82a69777c67128192b50bbf77ace0a6525f49cac;hpb=9e18c524fa2d1f648f265b3c3105f5ceacf06c10

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index 419fe957..1f1f59ad 100644
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -25,8 +25,8 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 class AltosScanResult {
 	String		callsign;
@@ -75,7 +75,7 @@ class AltosScanResult {
 	}
 }
 
-class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel {
+class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel<AltosScanResult> {
 
 	LinkedList<ListDataListener>	listeners = new LinkedList<ListDataListener>();
 
@@ -129,7 +129,7 @@ public class AltosScanUI
 	AltosDevice			device;
 	AltosConfigData			config_data;
 	AltosTelemetryReader		reader;
-	private JList			list;
+	private JList<AltosScanResult>	list;
 	private JLabel			scanning_label;
 	private JLabel			frequency_label;
 	private JLabel			telemetry_label;
@@ -435,7 +435,7 @@ public class AltosScanUI
 
 		int	y_offset = 3 + (Altos.ao_telemetry_max - Altos.ao_telemetry_min + 1);
 
-		list = new JList(results) {
+		list = new JList<AltosScanResult>(results) {
 				//Subclass JList to workaround bug 4832765, which can cause the
 				//scroll pane to not let the user easily scroll up to the beginning
 				//of the list.  An alternative would be to set the unitIncrement
@@ -548,4 +548,4 @@ public class AltosScanUI
 
 		setVisible(true);
 	}
-}
\ No newline at end of file
+}