X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosBTDevice.java;fp=altosuilib%2FAltosBTDevice.java;h=d6eed64dee73057591c03a885dd21799a0946da5;hp=0dd1cab231b3ed32db9fe0211591115a4d6cf4dc;hb=643c2fb03833d658320f476ef731bbb06fe3cc31;hpb=e41786fb384892961a6547e17812a24314ce9623

diff --git a/altosuilib/AltosBTDevice.java b/altosuilib/AltosBTDevice.java
index 0dd1cab2..d6eed64d 100644
--- a/altosuilib/AltosBTDevice.java
+++ b/altosuilib/AltosBTDevice.java
@@ -15,10 +15,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_6;
+package org.altusmetrum.altosuilib_7;
 
 import libaltosJNI.*;
-import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altoslib_7.*;
 
 public class AltosBTDevice extends altos_bt_device implements AltosDevice {
 
@@ -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);