altos/telefireone-v2.0: Remove build of ao_product.h from Makefile

[fw/altos] / altosuilib / AltosBTDevice.java

diff --git a/altosuilib/AltosBTDevice.java b/altosuilib/AltosBTDevice.java
index 2c0850213627a6083751d984e493ec807d2c68c1..dcc1f39f02cd958a93e112821c32d6df659d4c2d 100644 (file)
--- a/altosuilib/AltosBTDevice.java
+++ b/altosuilib/AltosBTDevice.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,10 +16,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_3;
+package org.altusmetrum.altosuilib_13;
 
 import libaltosJNI.*;
-import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altoslib_13.*;
 
 public class AltosBTDevice extends altos_bt_device implements AltosDevice {
 
@@ -104,17 +105,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);