Merge branch 'macos'

1 files changed, 8 insertions, 6 deletions

diff --git a/ao-tools/altosui/AltosDeviceDialog.java b/ao-tools/altosui/AltosDeviceDialog.java
index cb1eef8b..eb70877c 100644
--- a/ao-tools/altosui/AltosDeviceDialog.java
+++ b/ao-tools/altosui/AltosDeviceDialog.java
@@ -20,15 +20,17 @@ package altosui;
 import java.lang.*;
 import java.util.*;
 import javax.swing.*;
+import libaltosJNI.libaltos;
+import libaltosJNI.altos_device;
+import libaltosJNI.SWIGTYPE_p_altos_file;
+import libaltosJNI.SWIGTYPE_p_altos_list;
 import altosui.AltosDevice;
-import altosui.AltosDeviceLinux;
 
 public class AltosDeviceDialog {
 
-	static AltosDevice show (JFrame frame, String product) {
-		AltosDevice[]	devices = null;
-		if (System.getProperty("os.name").startsWith("Linux"))
-			devices = AltosDeviceLinux.list(product);
+	static altos_device show (JFrame frame, String product) {
+		AltosDevice[]	devices;
+		devices = AltosDevice.list(product);
 		if (devices != null & devices.length > 0) {
 			Object o = JOptionPane.showInputDialog(frame,
 							       "Select a device",
@@ -37,7 +39,7 @@ public class AltosDeviceDialog {
 							       null,
 							       devices,
 							       devices[0]);
-			return (AltosDevice) o;
+			return (altos_device) o;
 		} else {
 			return null;
 		}