X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosScanUI.java;h=0c903873b45fd69a9a8268e4ac9dc7cfd6814737;hp=ef6389b6c94d966b502fa774f0f8d0615ecf3a63;hb=8d1d8d2a3c129cdbd55427bcda0f26715b02f1ee;hpb=f164e48cbeff521d45737794e2046a08322951d6

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index ef6389b6..0c903873 100644
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -20,15 +20,13 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import javax.swing.event.*;
 import java.io.*;
 import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;
 
 class AltosScanResult {
 	String		callsign;
@@ -124,7 +122,7 @@ class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel
 }
 
 public class AltosScanUI
-	extends AltosDialog
+	extends AltosUIDialog
 	implements ActionListener
 {
 	AltosUI				owner;
@@ -330,7 +328,7 @@ public class AltosScanUI
 	}
 
 	private boolean open() {
-		device = AltosDeviceDialog.show(owner, Altos.product_basestation);
+		device = AltosDeviceUIDialog.show(owner, Altos.product_basestation);
 		if (device == null)
 			return false;
 		try {
@@ -427,7 +425,7 @@ public class AltosScanUI
 		telemetry_boxes = new JCheckBox[Altos.ao_telemetry_max - Altos.ao_telemetry_min + 1];
 		for (int k = Altos.ao_telemetry_min; k <= Altos.ao_telemetry_max; k++) {
 			int j = k - Altos.ao_telemetry_min;
-			telemetry_boxes[j] = new JCheckBox(Altos.ao_telemetry_name[k]);
+			telemetry_boxes[j] = new JCheckBox(AltosLib.telemetry_name(k));
 			c.gridy = 3 + j;
 			pane.add(telemetry_boxes[j], c);
 			telemetry_boxes[j].setActionCommand("telemetry");