altoslib/altosuilib: Fix equals methods, add hashCode

Whenever we use a class as a HashMap key, that class needs to override
the equals(Object) and hashCode() methods. Otherwise, the hash table
won't work right.

Signed-off-by: Keith Packard <keithp@keithp.com>

2 files changed, 18 insertions, 6 deletions

diff --git a/altosuilib/AltosBTDevice.java b/altosuilib/AltosBTDevice.java
index 76221df2..d6eed64d 100644
--- a/altosuilib/AltosBTDevice.java
+++ b/altosuilib/AltosBTDevice.java
@@ -104,17 +104,20 @@ public class AltosBTDevice extends altos_bt_device implements AltosDevice {
 		return false;
 	}
 
+	public int hashCode() {
+		return getName().hashCode() ^ getAddr().hashCode();
+	}
+
 	public boolean equals(Object o) {
+		if (o == null)
+			return false;
+
 		if (!(o instanceof AltosBTDevice))
 			return false;
 		AltosBTDevice other = (AltosBTDevice) o;
 		return getName().equals(other.getName()) && getAddr().equals(other.getAddr());
 	}
 
-	public int hashCode() {
-		return getName().hashCode() ^ getAddr().hashCode();
-	}
-
 	public AltosBTDevice(String name, String addr) {
 		AltosUILib.load_library();
 		libaltos.altos_bt_fill_in(name, addr,this);
diff --git a/altosuilib/AltosScanUI.java b/altosuilib/AltosScanUI.java
index 03115824..fccfbaee 100644
--- a/altosuilib/AltosScanUI.java
+++ b/altosuilib/AltosScanUI.java
@@ -62,9 +62,18 @@ class AltosScanResult {
 		rate = in_rate;
 	}
 
-	public boolean equals(AltosScanResult other) {
+	public int hashCode() {
+		return serial ^ frequency.hashCode() ^ telemetry ^ rate;
+	}
+
+	public boolean equals(Object o) {
+		if (o == null)
+			return false;
+		if (!(o instanceof AltosScanResult))
+			return false;
+		AltosScanResult other = (AltosScanResult) o;
 		return (serial == other.serial &&
-			frequency.frequency == other.frequency.frequency &&
+			frequency.equals(other.frequency) &&
 			telemetry == other.telemetry &&
 			rate == other.rate);
 	}