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

diff --git a/altosui/AltosBTManage.java b/altosui/AltosBTManage.java
index 98a8b757..ad1c28b6 100644
--- a/altosui/AltosBTManage.java
+++ b/altosui/AltosBTManage.java
@@ -20,27 +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.altosuilib_1.*;
 
-import libaltosJNI.*;
-
-public class AltosBTManage extends JDialog 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)) {
@@ -92,17 +85,13 @@ public class AltosBTManage extends JDialog implements ActionListener, Iterable<A
 			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);
@@ -124,18 +113,22 @@ public class AltosBTManage extends JDialog implements ActionListener, Iterable<A
 	}
 
 	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) {
 		}
 	}
 
@@ -150,7 +143,6 @@ public class AltosBTManage extends JDialog implements ActionListener, Iterable<A
 
 	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();
@@ -241,6 +233,8 @@ public class AltosBTManage extends JDialog implements ActionListener, Iterable<A
 		c.gridy = 0;
 		c.gridwidth = 1;
 		c.gridheight = 1;
+		c.weightx = 0;
+		c.weighty = 0;
 		pane.add(new JLabel("Known Devices"), c);
 
 		known_devices = new DeviceList();
@@ -256,6 +250,8 @@ public class AltosBTManage extends JDialog implements ActionListener, Iterable<A
 		c.gridy = 1;
 		c.gridwidth = 1;
 		c.gridheight = 2;
+		c.weightx = 1;
+		c.weighty = 1;
 		pane.add(known_list_scroller, c);
 
 		/*
@@ -267,6 +263,9 @@ public class AltosBTManage extends JDialog implements ActionListener, Iterable<A
 		c.gridy = 0;
 		c.gridwidth = 1;
 		c.gridheight = 1;
+		c.weightx = 0;
+		c.weighty = 0;
+
 		pane.add(new JLabel("Visible Devices"), c);
 
 		visible_devices = new DeviceList();
@@ -279,6 +278,8 @@ public class AltosBTManage extends JDialog implements ActionListener, Iterable<A
 		c.gridy = 1;
 		c.gridheight = 2;
 		c.gridwidth = 1;
+		c.weightx = 1;
+		c.weighty = 1;
 		pane.add(visible_list_scroller, c);
 
 		/*
@@ -293,6 +294,8 @@ public class AltosBTManage extends JDialog implements ActionListener, Iterable<A
 		c.gridy = 1;
 		c.gridheight = 1;
 		c.gridwidth = 1;
+		c.weightx = 0;
+		c.weighty = 0;
 		pane.add(select_arrow, c);
 
 		BasicArrowButton deselect_arrow = new BasicArrowButton(SwingConstants.EAST);
@@ -304,6 +307,8 @@ public class AltosBTManage extends JDialog implements ActionListener, Iterable<A
 		c.gridy = 2;
 		c.gridheight = 1;
 		c.gridwidth = 1;
+		c.weightx = 0;
+		c.weighty = 0;
 		pane.add(deselect_arrow, c);
 
 		JButton cancel_button = new JButton("Cancel");
@@ -315,6 +320,8 @@ public class AltosBTManage extends JDialog implements ActionListener, Iterable<A
 		c.gridy = 3;
 		c.gridheight = 1;
 		c.gridwidth = 1;
+		c.weightx = 0;
+		c.weighty = 0;
 		pane.add(cancel_button, c);
 
 		JButton ok_button = new JButton("OK");
@@ -326,6 +333,8 @@ public class AltosBTManage extends JDialog implements ActionListener, Iterable<A
 		c.gridy = 3;
 		c.gridheight = 1;
 		c.gridwidth = 1;
+		c.weightx = 0;
+		c.weighty = 0;
 		pane.add(ok_button, c);
 
 		getRootPane().setDefaultButton(ok_button);