From 297eb795b24ec31f6599f48bc8c3769557a7ec6f Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 5 Aug 2018 12:32:42 +0800 Subject: Bump java lib versions to 13 Signed-off-by: Keith Packard --- altosuilib/AltosUSBDevice.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'altosuilib/AltosUSBDevice.java') diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java index 49f966f3..f7aae38a 100644 --- a/altosuilib/AltosUSBDevice.java +++ b/altosuilib/AltosUSBDevice.java @@ -16,7 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altosuilib_12; +package org.altusmetrum.altosuilib_13; import java.util.*; import libaltosJNI.*; -- cgit v1.2.3 From 91bb344a74a413f7dcee379c4d760c34599749bc Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 22 Aug 2018 00:53:46 -0700 Subject: altosuilib: Add 'equals' method to AltosDevice Signed-off-by: Keith Packard --- altosuilib/AltosDevice.java | 1 + altosuilib/AltosUSBDevice.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) (limited to 'altosuilib/AltosUSBDevice.java') diff --git a/altosuilib/AltosDevice.java b/altosuilib/AltosDevice.java index 483d337b..a5a068b4 100644 --- a/altosuilib/AltosDevice.java +++ b/altosuilib/AltosDevice.java @@ -28,4 +28,5 @@ public interface AltosDevice { public abstract boolean matchProduct(int product); public abstract String getErrorString(); public SWIGTYPE_p_altos_file open(); + public abstract boolean equals(Object obj); } diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java index f7aae38a..16a0e770 100644 --- a/altosuilib/AltosUSBDevice.java +++ b/altosuilib/AltosUSBDevice.java @@ -94,6 +94,23 @@ public class AltosUSBDevice extends altos_device implements AltosDevice { return false; } + public int hashCode() { + return getVendor() ^ getProduct() ^ getSerial(); + } + + public boolean equals(Object o) { + if (o == null) + return false; + + if (!(o instanceof AltosUSBDevice)) + return false; + AltosUSBDevice other = (AltosUSBDevice) o; + + return getVendor() == other.getVendor() && + getProduct() == other.getProduct() && + getSerial() == other.getSerial(); + } + static public java.util.List list(int product) { if (!AltosUILib.load_library()) return null; -- cgit v1.2.3 From ba285ecf51e317917858740504a7d691b9839588 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 22 Aug 2018 17:43:17 -0700 Subject: altosuilib: Include device path in equals test of AltosUSBDevice Ensure that multiple AltosFlash devices don't appear the same; they all use serial number 1. Signed-off-by: Keith Packard --- altosuilib/AltosUSBDevice.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'altosuilib/AltosUSBDevice.java') diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java index 16a0e770..f43d6bef 100644 --- a/altosuilib/AltosUSBDevice.java +++ b/altosuilib/AltosUSBDevice.java @@ -95,7 +95,7 @@ public class AltosUSBDevice extends altos_device implements AltosDevice { } public int hashCode() { - return getVendor() ^ getProduct() ^ getSerial(); + return getVendor() ^ getProduct() ^ getSerial() ^ getPath().hashCode(); } public boolean equals(Object o) { @@ -108,7 +108,8 @@ public class AltosUSBDevice extends altos_device implements AltosDevice { return getVendor() == other.getVendor() && getProduct() == other.getProduct() && - getSerial() == other.getSerial(); + getSerial() == other.getSerial() && + getPath().equals(other.getPath()); } static public java.util.List list(int product) { -- cgit v1.2.3