X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosui%2FAltosBTManage.java;h=e6e7efd4bf9743bc8c593f2487774d7e73c37b72;hb=02e657e45e217dc483a81f28020cfe65a826e9be;hp=1015f7c323774db278413bb61364c831c1f90f00;hpb=e26306c9350ef1d107d4257ef1c09d15165c9154;p=fw%2Faltos diff --git a/altosui/AltosBTManage.java b/altosui/AltosBTManage.java index 1015f7c3..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 { LinkedBlockingQueue found_devices; @@ -31,9 +31,9 @@ public class AltosBTManage extends AltosUIDialog implements ActionListener, Iter LinkedList listeners; AltosBTKnown bt_known; - class DeviceList extends JList implements Iterable { - LinkedList devices; - DefaultListModel list_model; + class DeviceList extends JList implements Iterable { + LinkedList devices; + DefaultListModel list_model; public void add (AltosBTDevice device) { if (!devices.contains(device)) { @@ -86,16 +86,12 @@ public class AltosBTManage extends AltosUIDialog implements ActionListener, Iter } public java.util.List selected_list() throws InterruptedException { - java.util.LinkedList l = new java.util.LinkedList(); - Object[] a = getSelectedValues(); - for (int i = 0; i < a.length; i++) - l.add((AltosBTDevice)a[i]); - return l; + return getSelectedValuesList(); } public DeviceList() { devices = new LinkedList(); - list_model = new DefaultListModel(); + list_model = new DefaultListModel(); setModel(list_model); setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); setLayoutOrientation(JList.HORIZONTAL_WRAP);