X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosBTManage.java;h=ad1c28b6e0bbd54ffc3e32beba8c8f96c787b761;hp=d2899d65fa34aa38220cd2b55b682056b714914d;hb=4ac7797d3efb9cc2d9fae88519f55e40b1050224;hpb=3c2f601139d36761de6a8a2210545d082ef16133

diff --git a/altosui/AltosBTManage.java b/altosui/AltosBTManage.java
index d2899d65..ad1c28b6 100644
--- a/altosui/AltosBTManage.java
+++ b/altosui/AltosBTManage.java
@@ -20,28 +20,20 @@ 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 javax.swing.plaf.basic.*;
-import java.io.*;
 import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib_1.*;
 
-import libaltosJNI.*;
-
-public class AltosBTManage extends AltosDialog implements ActionListener, Iterable<AltosBTDevice> {
+public class AltosBTManage extends AltosUIDialog implements ActionListener, Iterable<AltosBTDevice> {
 	LinkedBlockingQueue<AltosBTDevice> found_devices;
 	Frame frame;
 	LinkedList<ActionListener> listeners;
 	AltosBTKnown	bt_known;
 
-	class DeviceList extends JList implements Iterable<AltosBTDevice> {
-		LinkedList<AltosBTDevice> devices;
-		DefaultListModel	list_model;
+	class DeviceList extends JList<AltosBTDevice> implements Iterable<AltosBTDevice> {
+		LinkedList<AltosBTDevice> 	devices;
+		DefaultListModel<AltosBTDevice>	list_model;
 
 		public void add (AltosBTDevice device) {
 			if (!devices.contains(device)) {
@@ -93,17 +85,13 @@ public class AltosBTManage extends AltosDialog implements ActionListener, Iterab
 			return devices.iterator();
 		}
 
-		public java.util.List<AltosBTDevice> selected_list() {
-			java.util.LinkedList<AltosBTDevice> l = new java.util.LinkedList<AltosBTDevice>();
-			Object[] a = getSelectedValues();
-			for (int i = 0; i < a.length; i++)
-				l.add((AltosBTDevice)a[i]);
-			return l;
+		public java.util.List<AltosBTDevice> selected_list() throws InterruptedException {
+			return getSelectedValuesList();
 		}
 
 		public DeviceList() {
 			devices = new LinkedList<AltosBTDevice>();
-			list_model = new DefaultListModel();
+			list_model = new DefaultListModel<AltosBTDevice>();
 			setModel(list_model);
 			setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 			setLayoutOrientation(JList.HORIZONTAL_WRAP);
@@ -125,18 +113,22 @@ public class AltosBTManage extends AltosDialog implements ActionListener, Iterab
 	}
 
 	public void add_known() {
-		for (AltosBTDevice device : visible_devices.selected_list()) {
-			System.out.printf("Add known %s\n", device.toString());
-			known_devices.add(device);
-			visible_devices.remove(device);
+		try {
+			for (AltosBTDevice device : visible_devices.selected_list()) {
+				known_devices.add(device);
+				visible_devices.remove(device);
+			}
+		} catch (InterruptedException ie) {
 		}
 	}
 
 	public void remove_known() {
-		for (AltosBTDevice device : known_devices.selected_list()) {
-			System.out.printf("Remove known %s\n", device.toString());
-			known_devices.remove(device);
-			visible_devices.add(device);
+		try {
+			for (AltosBTDevice device : known_devices.selected_list()) {
+				known_devices.remove(device);
+				visible_devices.add(device);
+			}
+		} catch (InterruptedException ie) {
 		}
 	}
 
@@ -151,7 +143,6 @@ public class AltosBTManage extends AltosDialog implements ActionListener, Iterab
 
 	public void actionPerformed(ActionEvent e) {
 		String	command = e.getActionCommand();
-		System.out.printf("manage command %s\n", command);
 		if ("ok".equals(command)) {
 			bt_thread.interrupt();
 			commit();