X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosDeviceDialog.java;h=ec78e2889fcdef70f1ac37be7eb240f8705945d1;hp=c60bd7c3ee35a388f5733259e84d8e2d3e4946e4;hb=61590b8729831cb138b2ba6b88802c208d114753;hpb=7877496d47ce6d25210c0e1c6500666dbfc0876c

diff --git a/ao-tools/altosui/AltosDeviceDialog.java b/ao-tools/altosui/AltosDeviceDialog.java
index c60bd7c3..ec78e288 100644
--- a/ao-tools/altosui/AltosDeviceDialog.java
+++ b/ao-tools/altosui/AltosDeviceDialog.java
@@ -31,16 +31,16 @@ import altosui.AltosDevice;
 public class AltosDeviceDialog extends JDialog implements ActionListener {
 
 	private static AltosDeviceDialog	dialog;
-	private static altos_device		value = null;
+	private static AltosDevice		value = null;
 	private JList				list;
 
-	public static altos_device show (Component frameComp, String product) {
+	public static AltosDevice show (Component frameComp, int product) {
 
 		Frame frame = JOptionPane.getFrameForComponent(frameComp);
 		AltosDevice[]	devices;
 		devices = AltosDevice.list(product);
 
-		if (devices != null & devices.length > 0) {
+		if (devices != null && devices.length > 0) {
 			value = null;
 			dialog = new AltosDeviceDialog(frame, frameComp,
 						       devices,
@@ -49,10 +49,15 @@ public class AltosDeviceDialog extends JDialog implements ActionListener {
 			dialog.setVisible(true);
 			return value;
 		} else {
-			JOptionPane.showMessageDialog(frame,
-						      "No AltOS devices available",
-						      "No AltOS devices",
-						      JOptionPane.ERROR_MESSAGE);
+			/* check for missing altos JNI library, which
+			 * will put up its own error dialog
+			 */
+			if (AltosUI.load_library(frame)) {
+				JOptionPane.showMessageDialog(frame,
+							      "No AltOS devices available",
+							      "No AltOS devices",
+							      JOptionPane.ERROR_MESSAGE);
+			}
 			return null;
 		}
 	}
@@ -153,7 +158,7 @@ public class AltosDeviceDialog extends JDialog implements ActionListener {
 	//Handle clicks on the Set and Cancel buttons.
 	public void actionPerformed(ActionEvent e) {
 		if ("select".equals(e.getActionCommand()))
-			AltosDeviceDialog.value = (altos_device)(list.getSelectedValue());
+			AltosDeviceDialog.value = (AltosDevice)(list.getSelectedValue());
 		AltosDeviceDialog.dialog.setVisible(false);
 	}