Update java library version numbers

[fw/altos] / altoslib / AltosPointInt.java

diff --git a/altoslib/AltosPointInt.java b/altoslib/AltosPointInt.java
index 6ee077ab36b82bb6a26b6ae4dcd4cadbaa16cb05..34eb6fd3a4b07bf5f980cd37d083605164754528 100644 (file)
--- a/altoslib/AltosPointInt.java
+++ b/altoslib/AltosPointInt.java
@@ -15,12 +15,24 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_6;
+package org.altusmetrum.altoslib_10;
 
 public class AltosPointInt {
        public int      x, y;
 
-       public boolean equals(AltosPointInt n) {
+       public int hashCode() {
+               return  x ^ y;
+       }
+
+       public boolean equals(Object o) {
+               if (o == null)
+                       return false;
+
+               if (!(o instanceof AltosPointInt))
+                       return false;
+
+               AltosPointInt n = (AltosPointInt) o;
+
                return n.x == x && n.y == y;
        }
 
@@ -28,4 +40,14 @@ public class AltosPointInt {
                this.x = x;
                this.y = y;
        }
+
+       public AltosPointInt(double x, double y) {
+               this.x = (int) (x + 0.5);
+               this.y = (int) (y + 0.5);
+       }
+
+       public AltosPointInt(AltosPointDouble pt_d) {
+               this.x = (int) (pt_d.x + 0.5);
+               this.y = (int) (pt_d.y + 0.5);
+       }
 }