diff options
author | Christopher Baines <cbaines8@gmail.com> | 2012-03-09 10:49:50 +0000 |
---|---|---|
committer | Christopher Baines <cbaines8@gmail.com> | 2012-03-09 10:49:50 +0000 |
commit | c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7 (patch) | |
tree | 69ba7ee4c132b2bf6ec138fdcaf0988309b40e56 /src/net/cbaines/suma/Bus.java | |
parent | a32b31c29d45b68918ec2a28fff7d87e675c6768 (diff) | |
parent | 4a45362d8823a84cf9c3c805c006331303a0da33 (diff) | |
download | southamptonuniversitymap-c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7.tar southamptonuniversitymap-c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7.tar.gz |
Merge branch 'dev-search' into dev
Conflicts:
gen/net/cbaines/suma/R.java
res/values/strings.xml
src/net/cbaines/suma/DataManager.java
src/net/cbaines/suma/MapActivity.java
src/net/cbaines/suma/POI.java
Diffstat (limited to 'src/net/cbaines/suma/Bus.java')
-rw-r--r-- | src/net/cbaines/suma/Bus.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/net/cbaines/suma/Bus.java b/src/net/cbaines/suma/Bus.java index 865384f..9894e6b 100644 --- a/src/net/cbaines/suma/Bus.java +++ b/src/net/cbaines/suma/Bus.java @@ -115,7 +115,7 @@ public class Bus { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + gid; + result = prime * result + ((id == null) ? 0 : id.hashCode()); return result; } @@ -128,7 +128,10 @@ public class Bus { if (getClass() != obj.getClass()) return false; Bus other = (Bus) obj; - if (id != other.id) + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) return false; return true; } |