altos/telefireone-v1.0: Clean up Makefile

[fw/altos] / altoslib / AltosPointDouble.java

diff --git a/altoslib/AltosPointDouble.java b/altoslib/AltosPointDouble.java
index 96fb9161c6fe61f010363660661d814ebd3581c2..59e2f76c9fff051508a7f8d246dc3d35b616cca1 100644 (file)
--- a/altoslib/AltosPointDouble.java
+++ b/altoslib/AltosPointDouble.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,12 +16,24 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_6;
+package org.altusmetrum.altoslib_13;
 
 public class AltosPointDouble {
        public double   x, y;
 
-       public boolean equals(AltosPointDouble n) {
+       public int hashCode() {
+               return new Double(x).hashCode() ^ new Double(y).hashCode();
+       }
+
+       public boolean equals(Object o) {
+               if (o == null)
+                       return false;
+
+               if (!(o instanceof AltosPointDouble))
+                       return false;
+
+               AltosPointDouble n = (AltosPointDouble) o;
+
                return n.x == x && n.y == y;
        }