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

diff --git a/altosui/AltosBTManage.java b/altosui/AltosBTManage.java
index 1015f7c3..ad1c28b6 100644
--- a/altosui/AltosBTManage.java
+++ b/altosui/AltosBTManage.java
@@ -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)) {
@@ -86,16 +86,12 @@ public class AltosBTManage extends AltosUIDialog implements ActionListener, Iter
 		}
 
 		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++)
-				l.add((AltosBTDevice)a[i]);
-			return l;
+			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);