X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosPointInt.java;h=14b0dabf438cedf5b088122d4c70a76239ca1729;hb=7175774c4f60ed3efd54417f2035b50ea0108c7b;hp=e133ae9c81165afde4d98f994b6b951aef83d6f9;hpb=cb23b992be8ba40c97d8988c134a814a13ccd58c;p=fw%2Faltos diff --git a/altoslib/AltosPointInt.java b/altoslib/AltosPointInt.java index e133ae9c..14b0dabf 100644 --- 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_7; +package org.altusmetrum.altoslib_11; 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); + } }