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>

1 files changed, 11 insertions, 2 deletions

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);
 	}