X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosUSBDevice.java;h=dc746a64fb4aa7de038872bbf18f5fde13d7d523;hp=03ddf5a89c1792415bc065f268bc0fdfc70ccf94;hb=2e7b7b80432bb251ac39efa1fa05d32b5f250e14;hpb=9cdef76c1275b343099d0d01af82d7eadd36a410

diff --git a/altosui/AltosUSBDevice.java b/altosui/AltosUSBDevice.java
index 03ddf5a8..dc746a64 100644
--- a/altosui/AltosUSBDevice.java
+++ b/altosui/AltosUSBDevice.java
@@ -43,7 +43,7 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 		return libaltos.altos_open(this);
 	}
 
-	public boolean isAltusMetrum() {
+	private boolean isAltusMetrum() {
 		if (getVendor() != Altos.vendor_altusmetrum)
 			return false;
 		if (getProduct() < Altos.product_altusmetrum_min)
@@ -77,13 +77,13 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 		return false;
 	}
 
-	static AltosUSBDevice[] list(int product) {
+	static java.util.List<AltosDevice> list(int product) {
 		if (!Altos.load_library())
 			return null;
 
 		SWIGTYPE_p_altos_list list = libaltos.altos_list_start();
 
-		ArrayList<AltosUSBDevice> device_list = new ArrayList<AltosUSBDevice>();
+		ArrayList<AltosDevice> device_list = new ArrayList<AltosDevice>();
 		if (list != null) {
 			for (;;) {
 				AltosUSBDevice device = new AltosUSBDevice();
@@ -95,9 +95,6 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 			libaltos.altos_list_finish(list);
 		}
 
-		AltosUSBDevice[] devices = new AltosUSBDevice[device_list.size()];
-		for (int i = 0; i < device_list.size(); i++)
-			devices[i] = device_list.get(i);
-		return devices;
+		return device_list;
 	}
 }
\ No newline at end of file