From: Keith Packard <keithp@keithp.com>
Date: Tue, 27 Jul 2010 00:03:47 +0000 (-0700)
Subject: Present list of altos devices in nice format
X-Git-Tag: debian/0.6+268+gd0fd53b~7^2~9
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=17188f36fe18c23bc2eb877ac9a01b7693f4b863

Present list of altos devices in nice format
---

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<altos_device> device_list = new ArrayList<altos_device>();
+		ArrayList<AltosDevice> device_list = new ArrayList<AltosDevice>();
 		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,