diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-24 15:01:41 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-24 15:01:41 +0000 |
| commit | 59f31dd97ddc3f3f918a432ea4e20552c3006d97 (patch) | |
| tree | 7477656e08f6aaff1849d25cd593cd0510bc7d1f /src/net/cbaines/suma/POI.java | |
| parent | 46143c64dbdcbbfb478b2df4949c617682427d63 (diff) | |
| parent | a02e8ae9eed3b2e3c105db19e84c27a0774172dd (diff) | |
| download | southamptonuniversitymap-59f31dd97ddc3f3f918a432ea4e20552c3006d97.tar southamptonuniversitymap-59f31dd97ddc3f3f918a432ea4e20552c3006d97.tar.gz | |
Merge branch 'dev' into dev-rdf
Conflicts:
src/net/cbaines/suma/BuildingActivity.java
Diffstat (limited to 'src/net/cbaines/suma/POI.java')
| -rw-r--r-- | src/net/cbaines/suma/POI.java | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/net/cbaines/suma/POI.java b/src/net/cbaines/suma/POI.java index dba7924..244198d 100644 --- a/src/net/cbaines/suma/POI.java +++ b/src/net/cbaines/suma/POI.java @@ -60,8 +60,6 @@ public abstract class POI { final int prime = 31; int result = 1; result = prime * result + ((id == null) ? 0 : id.hashCode()); - result = prime * result + ((point == null) ? 0 : point.hashCode()); - result = prime * result + ((type == null) ? 0 : type.hashCode()); return result; } @@ -79,16 +77,6 @@ public abstract class POI { return false; } else if (!id.equals(other.id)) return false; - if (point == null) { - if (other.point != null) - return false; - } else if (!point.equals(other.point)) - return false; - if (type == null) { - if (other.type != null) - return false; - } else if (!type.equals(other.type)) - return false; return true; } } |