X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosBTManage.java;h=e6e7efd4bf9743bc8c593f2487774d7e73c37b72;hp=4c9b7a6c405f5f827968dd95715b3a71ae50a1f3;hb=02e657e45e217dc483a81f28020cfe65a826e9be;hpb=2120d362cefceba69e75996b6391d9558978c01d

diff --git a/altosui/AltosBTManage.java b/altosui/AltosBTManage.java
index 4c9b7a6c..e6e7efd4 100644
--- a/altosui/AltosBTManage.java
+++ b/altosui/AltosBTManage.java
@@ -23,7 +23,7 @@ import javax.swing.*;
 import javax.swing.plaf.basic.*;
 import java.util.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosBTManage extends AltosUIDialog implements ActionListener, Iterable<AltosBTDevice> {
 	LinkedBlockingQueue<AltosBTDevice> found_devices;
@@ -31,9 +31,9 @@ public class AltosBTManage extends AltosUIDialog implements ActionListener, Iter
 	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)) {
@@ -85,17 +85,13 @@ public class AltosBTManage extends AltosUIDialog implements ActionListener, Iter
 			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);
@@ -117,16 +113,22 @@ public class AltosBTManage extends AltosUIDialog implements ActionListener, Iter
 	}
 
 	public void add_known() {
-		for (AltosBTDevice device : visible_devices.selected_list()) {
-			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()) {
-			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) {
 		}
 	}