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

diff --git a/altosui/AltosDeviceDialog.java b/altosui/AltosDeviceDialog.java
index fa20f867..fa9587bc 100644
--- a/altosui/AltosDeviceDialog.java
+++ b/altosui/AltosDeviceDialog.java
@@ -26,44 +26,59 @@ import libaltosJNI.*;
 
 public class AltosDeviceDialog extends JDialog implements ActionListener {
 
-	public static AltosDevice show (Component frameComp, int product) {
-
-		Frame frame = JOptionPane.getFrameForComponent(frameComp);
-		AltosDevice[]	devices;
-		devices = AltosUSBDevice.list(product);
-		AltosDeviceDialog	dialog;
-
-		dialog = new AltosDeviceDialog(frame, frameComp,
-					       devices);
-		dialog.setVisible(true);
-		return dialog.getValue();
-	}
-
 	private AltosDevice	value;
 	private JList		list;
 	private JButton		cancel_button;
 	private JButton		select_button;
-	private JButton		manage_bluetooth_button;
+// BLUETOOTH
+//	private JButton		manage_bluetooth_button;
 	private Frame		frame;
+	private int		product;
 
 	private AltosDevice getValue() {
 		return value;
 	}
 
-	private AltosDeviceDialog (Frame in_frame, Component location,
-				   AltosDevice[] devices) {
+	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();
+		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);
+		return devices;
+	}
+
+	private void update_devices() {
+		AltosDevice[] devices = devices();
+		list.setListData(devices);
+		select_button.setEnabled(devices.length > 0);
+	}
+
+	private AltosDeviceDialog (Frame in_frame, Component location, int in_product) {
 		super(in_frame, "Device Selection", true);
 
+		product = in_product;
 		frame = in_frame;
 		value = null;
 
+		AltosDevice[]	devices = devices();
+
 		cancel_button = new JButton("Cancel");
 		cancel_button.setActionCommand("cancel");
 		cancel_button.addActionListener(this);
 
-		manage_bluetooth_button = new JButton("Manage Bluetooth");
-		manage_bluetooth_button.setActionCommand("manage");
-		manage_bluetooth_button.addActionListener(this);
+// BLUETOOTH
+//		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");
@@ -137,7 +152,8 @@ public class AltosDeviceDialog extends JDialog implements ActionListener {
 		buttonPane.add(Box.createHorizontalGlue());
 		buttonPane.add(cancel_button);
 		buttonPane.add(Box.createRigidArea(new Dimension(10, 0)));
-		buttonPane.add(manage_bluetooth_button);
+// BLUETOOTH
+//		buttonPane.add(manage_bluetooth_button);
 		buttonPane.add(Box.createRigidArea(new Dimension(10, 0)));
 		buttonPane.add(select_button);
 
@@ -147,7 +163,7 @@ public class AltosDeviceDialog extends JDialog implements ActionListener {
 		contentPane.add(buttonPane, BorderLayout.PAGE_END);
 
 		//Initialize values.
-		if (devices != null && devices.length > 0)
+		if (devices != null && devices.length != 0)
 			list.setSelectedValue(devices[0], true);
 		pack();
 		setLocationRelativeTo(location);
@@ -157,11 +173,22 @@ public class AltosDeviceDialog extends JDialog implements ActionListener {
 	public void actionPerformed(ActionEvent e) {
 		if ("select".equals(e.getActionCommand()))
 			value = (AltosDevice)(list.getSelectedValue());
-		if ("manage".equals(e.getActionCommand())) {
-			AltosBTManage.show(frame);
-			return;
-		}
+// BLUETOOTH
+//		if ("manage".equals(e.getActionCommand())) {
+//			AltosBTManage.show(frame, Altos.bt_known);
+//			update_devices();
+//			return;
+//		}
 		setVisible(false);
 	}
 
+	public static AltosDevice show (Component frameComp, int product) {
+
+		Frame				frame = JOptionPane.getFrameForComponent(frameComp);
+		AltosDeviceDialog	dialog;
+
+		dialog = new AltosDeviceDialog(frame, frameComp, product);
+		dialog.setVisible(true);
+		return dialog.getValue();
+	}
 }