X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosDeviceDialog.java;h=0aeadae66d7cf4eb828a65f5db1621ec11917179;hb=altosui-ms5611;hp=e17504e2475580c4c75364ab060391cc1357a425;hpb=17f38e045fcd8ca0224095c0b2b7b098df77a8d8;p=fw%2Faltos

diff --git a/altosui/AltosDeviceDialog.java b/altosui/AltosDeviceDialog.java
index e17504e2..0aeadae6 100644
--- a/altosui/AltosDeviceDialog.java
+++ b/altosui/AltosDeviceDialog.java
@@ -17,14 +17,11 @@
 
 package altosui;
 
-import java.lang.*;
-import java.util.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
-import libaltosJNI.*;
 
-public class AltosDeviceDialog extends JDialog implements ActionListener {
+public class AltosDeviceDialog extends AltosDialog implements ActionListener {
 
 	private AltosDevice	value;
 	private JList		list;
@@ -40,8 +37,10 @@ public class AltosDeviceDialog extends JDialog implements ActionListener {
 
 	private AltosDevice[] devices() {
 		java.util.List<AltosDevice>	usb_devices = AltosUSBDevice.list(product);
-		java.util.List<AltosDevice>	bt_devices = Altos.bt_known.list(product);
-		AltosDevice[]			devices = new AltosDevice[usb_devices.size() + bt_devices.size()];
+		int				num_devices = usb_devices.size();
+		java.util.List<AltosDevice>	bt_devices = AltosBTKnown.bt_known().list(product);
+		num_devices += bt_devices.size();
+		AltosDevice[]			devices = new AltosDevice[num_devices];
 
 		for (int i = 0; i < usb_devices.size(); i++)
 			devices[i] = usb_devices.get(i);
@@ -167,7 +166,7 @@ public class AltosDeviceDialog extends JDialog implements ActionListener {
 		if ("select".equals(e.getActionCommand()))
 			value = (AltosDevice)(list.getSelectedValue());
 		if ("manage".equals(e.getActionCommand())) {
-			AltosBTManage.show(frame, Altos.bt_known);
+			AltosBTManage.show(frame, AltosBTKnown.bt_known());
 			update_devices();
 			return;
 		}