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

diff --git a/altosui/AltosDeviceDialog.java b/altosui/AltosDeviceDialog.java
index fa9587bc..0aeadae6 100644
--- a/altosui/AltosDeviceDialog.java
+++ b/altosui/AltosDeviceDialog.java
@@ -17,21 +17,17 @@
 
 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;
 	private JButton		cancel_button;
 	private JButton		select_button;
-// BLUETOOTH
-//	private JButton		manage_bluetooth_button;
+	private JButton		manage_bluetooth_button;
 	private Frame		frame;
 	private int		product;
 
@@ -42,17 +38,15 @@ public class AltosDeviceDialog extends JDialog implements ActionListener {
 	private AltosDevice[] devices() {
 		java.util.List<AltosDevice>	usb_devices = AltosUSBDevice.list(product);
 		int				num_devices = usb_devices.size();
-// BLUETOOTH
-//		java.util.List<AltosDevice>	bt_devices = Altos.bt_known.list(product);
-//		num_devices += bt_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);
-// BLUETOOTH
-//		int off = usb_devices.size();
-//		for (int j = 0; j < bt_devices.size(); j++)
-//			devices[off + j] = bt_devices.get(j);
+		int off = usb_devices.size();
+		for (int j = 0; j < bt_devices.size(); j++)
+			devices[off + j] = bt_devices.get(j);
 		return devices;
 	}
 
@@ -75,10 +69,9 @@ public class AltosDeviceDialog extends JDialog implements ActionListener {
 		cancel_button.setActionCommand("cancel");
 		cancel_button.addActionListener(this);
 
-// BLUETOOTH
-//		manage_bluetooth_button = new JButton("Manage Bluetooth");
-//		manage_bluetooth_button.setActionCommand("manage");
-//		manage_bluetooth_button.addActionListener(this);
+		manage_bluetooth_button = new JButton("Manage Bluetooth");
+		manage_bluetooth_button.setActionCommand("manage");
+		manage_bluetooth_button.addActionListener(this);
 
 		select_button = new JButton("Select");
 		select_button.setActionCommand("select");
@@ -152,8 +145,7 @@ public class AltosDeviceDialog extends JDialog implements ActionListener {
 		buttonPane.add(Box.createHorizontalGlue());
 		buttonPane.add(cancel_button);
 		buttonPane.add(Box.createRigidArea(new Dimension(10, 0)));
-// BLUETOOTH
-//		buttonPane.add(manage_bluetooth_button);
+		buttonPane.add(manage_bluetooth_button);
 		buttonPane.add(Box.createRigidArea(new Dimension(10, 0)));
 		buttonPane.add(select_button);
 
@@ -173,12 +165,11 @@ public class AltosDeviceDialog extends JDialog implements ActionListener {
 	public void actionPerformed(ActionEvent e) {
 		if ("select".equals(e.getActionCommand()))
 			value = (AltosDevice)(list.getSelectedValue());
-// BLUETOOTH
-//		if ("manage".equals(e.getActionCommand())) {
-//			AltosBTManage.show(frame, Altos.bt_known);
-//			update_devices();
-//			return;
-//		}
+		if ("manage".equals(e.getActionCommand())) {
+			AltosBTManage.show(frame, AltosBTKnown.bt_known());
+			update_devices();
+			return;
+		}
 		setVisible(false);
 	}