diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-19 10:42:04 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-19 10:42:04 +0000 |
| commit | 40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d (patch) | |
| tree | b6a6fa2fdbb7009859ef0ca4616a8b9c59169440 /src/net/cbaines/suma/POI.java | |
| parent | 4b4a5a0ebc7f285d7cdcfa1d72640dbc097bdbb2 (diff) | |
| parent | a02e8ae9eed3b2e3c105db19e84c27a0774172dd (diff) | |
| download | southamptonuniversitymap-40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d.tar southamptonuniversitymap-40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d.tar.gz | |
Merge branch 'dev'
Conflicts:
AndroidManifest.xml
res/values/strings.xml
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; } } |