From 005e2d6a7bb3b0546b0c1273296875621632ec6d Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 26 Jul 2010 15:42:48 -0700 Subject: Switch AltosUI to libaltos for device access Signed-off-by: Keith Packard --- ao-tools/altosui/AltosDeviceDialog.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'ao-tools/altosui/AltosDeviceDialog.java') diff --git a/ao-tools/altosui/AltosDeviceDialog.java b/ao-tools/altosui/AltosDeviceDialog.java index cb1eef8b..b3a0f9be 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) { + altos_device[] devices = null; + 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; } -- cgit v1.2.3 From 17188f36fe18c23bc2eb877ac9a01b7693f4b863 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 26 Jul 2010 17:03:47 -0700 Subject: Present list of altos devices in nice format --- ao-tools/altosui/AltosDevice.java | 18 ++++++++++-------- ao-tools/altosui/AltosDeviceDialog.java | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'ao-tools/altosui/AltosDeviceDialog.java') diff --git a/ao-tools/altosui/AltosDevice.java b/ao-tools/altosui/AltosDevice.java index 8ebd3b99..0e7d01da 100644 --- a/ao-tools/altosui/AltosDevice.java +++ b/ao-tools/altosui/AltosDevice.java @@ -20,32 +20,34 @@ import java.lang.*; import java.util.*; import libaltosJNI.*; -public class AltosDevice { +public class AltosDevice extends altos_device { + + public String toString() { + return String.format("%-20.20s %4d %s", + getProduct(), getSerial(), getPath()); + } static { System.loadLibrary("altos"); libaltos.altos_init(); } - static altos_device[] list(String product) { + static AltosDevice[] list(String product) { SWIGTYPE_p_altos_list list = libaltos.altos_list_start(); - ArrayList device_list = new ArrayList(); + ArrayList device_list = new ArrayList(); if (list != null) { SWIGTYPE_p_altos_file file; for (;;) { - altos_device device = new altos_device(); + AltosDevice device = new AltosDevice(); if (libaltos.altos_list_next(list, device) == 0) break; - System.out.printf("Found device %s %d %s\n", - device.getProduct(), device.getSerial(), device.getPath()); - device_list.add(device); } libaltos.altos_list_finish(list); } - altos_device[] devices = new altos_device[device_list.size()]; + AltosDevice[] devices = new AltosDevice[device_list.size()]; for (int i = 0; i < device_list.size(); i++) devices[i] = device_list.get(i); return devices; diff --git a/ao-tools/altosui/AltosDeviceDialog.java b/ao-tools/altosui/AltosDeviceDialog.java index b3a0f9be..eb70877c 100644 --- a/ao-tools/altosui/AltosDeviceDialog.java +++ b/ao-tools/altosui/AltosDeviceDialog.java @@ -29,7 +29,7 @@ import altosui.AltosDevice; public class AltosDeviceDialog { static altos_device show (JFrame frame, String product) { - altos_device[] devices = null; + AltosDevice[] devices; devices = AltosDevice.list(product); if (devices != null & devices.length > 0) { Object o = JOptionPane.showInputDialog(frame, -- cgit v1.2.3