libaltos: remove usb id filtering from darwin code

[fw/altos] / altosui / AltosBTManage.java

diff --git a/altosui/AltosBTManage.java b/altosui/AltosBTManage.java
index a411c83e427ebcfa773151006b56bb4267b12bbd..1015f7c323774db278413bb61364c831c1f90f00 100644 (file)
--- a/altosui/AltosBTManage.java
+++ b/altosui/AltosBTManage.java
@@ -15,25 +15,17 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package AltosUI;
+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;
@@ -93,7 +85,7 @@ public class AltosBTManage extends AltosDialog implements ActionListener, Iterab
                        return devices.iterator();
                }
 
-               public java.util.List<AltosBTDevice> selected_list() {
+               public java.util.List<AltosBTDevice> selected_list() throws InterruptedException {
                        java.util.LinkedList<AltosBTDevice> l = new java.util.LinkedList<AltosBTDevice>();
                        Object[] a = getSelectedValues();
                        for (int i = 0; i < a.length; i++)
@@ -125,16 +117,22 @@ public class AltosBTManage extends AltosDialog implements ActionListener, Iterab
        }
 
        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) {
                }
        }