X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosDeviceDialog.java;h=5fb1331ee210a5cf40618e5b58a7e91c69a0974f;hb=cc64e0e9d35e01b349680159a5bbd68d059134cd;hp=cde545a72b10852ca0be857a87a0d8c1876b83ec;hpb=8af405f1ac4d1b930f10465fd0270a49176f16d1;p=fw%2Faltos

diff --git a/altosuilib/AltosDeviceDialog.java b/altosuilib/AltosDeviceDialog.java
index cde545a7..5fb1331e 100644
--- a/altosuilib/AltosDeviceDialog.java
+++ b/altosuilib/AltosDeviceDialog.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib;
+package org.altusmetrum.altosuilib_6;
 
 import javax.swing.*;
 import java.awt.*;
@@ -23,14 +23,14 @@ import java.awt.event.*;
 
 public abstract class AltosDeviceDialog extends AltosUIDialog implements ActionListener {
 
-	private AltosDevice	value;
-	private JList		list;
-	private JButton		cancel_button;
-	private JButton		select_button;
-	public Frame		frame;
-	public int		product;
-	public JPanel		buttonPane;
-	
+	private AltosDevice		value;
+	private JList<AltosDevice>	list;
+	private JButton			cancel_button;
+	private JButton			select_button;
+	public Frame			frame;
+	public int			product;
+	public JPanel			buttonPane;
+
 	public AltosDevice getValue() {
 		return value;
 	}
@@ -65,7 +65,7 @@ public abstract class AltosDeviceDialog extends AltosUIDialog implements ActionL
 			select_button.setEnabled(false);
 		getRootPane().setDefaultButton(select_button);
 
-		list = new JList(devices) {
+		list = new JList<AltosDevice>(devices) {
 				//Subclass JList to workaround bug 4832765, which can cause the
 				//scroll pane to not let the user easily scroll up to the beginning
 				//of the list.  An alternative would be to set the unitIncrement
@@ -131,7 +131,8 @@ public abstract class AltosDeviceDialog extends AltosUIDialog implements ActionL
 		buttonPane.add(cancel_button);
 		buttonPane.add(Box.createRigidArea(new Dimension(10, 0)));
 
-		add_bluetooth();
+		if (AltosUILib.has_bluetooth)
+			add_bluetooth();
 
 		buttonPane.add(select_button);