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 <keithp@keithp.com>

diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index 16a0e7709dd5be7c3793bd3eb42c86c481164d6c..f43d6befda46e57ec9ee26f0d105452308afe9b9 100644 (file)
--- a/altosuilib/AltosUSBDevice.java
+++ b/altosuilib/AltosUSBDevice.java
@@ -95,7 +95,7 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
        }
 
        public int hashCode() {
        }
 
        public int hashCode() {

-               return getVendor() ^ getProduct() ^ getSerial();
+               return getVendor() ^ getProduct() ^ getSerial() ^ getPath().hashCode();

        }
 
        public boolean equals(Object o) {
        }
 
        public boolean equals(Object o) {


@@ -108,7 +108,8 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
 
                return getVendor() == other.getVendor() &&
                        getProduct() == other.getProduct() &&
 
                return getVendor() == other.getVendor() &&
                        getProduct() == other.getProduct() &&

-                       getSerial() == other.getSerial();
+                       getSerial() == other.getSerial() &&
+                       getPath().equals(other.getPath());

        }
 
        static public java.util.List<AltosDevice> list(int product) {
        }
 
        static public java.util.List<AltosDevice> list(int product) {