Changeset 9371 in josm for trunk/src/org/openstreetmap/josm/data/osm
- Timestamp:
- 2016-01-09T23:20:37+01:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/osm
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/BBox.java
r9243 r9371 4 4 import java.awt.geom.Rectangle2D; 5 5 import java.util.Arrays; 6 import java.util.Objects; 6 7 7 8 import org.openstreetmap.josm.data.coor.LatLon; -
trunk/src/org/openstreetmap/josm/data/osm/Changeset.java
r8840 r9371 9 9 import java.util.List; 10 10 import java.util.Map; 11 import java.util.Objects; 11 12 12 13 import org.openstreetmap.josm.data.Bounds; … … 278 279 @Override 279 280 public int hashCode() { 280 if (id > 0) 281 return id; 282 else 283 return super.hashCode(); 281 return Objects.hash(id); 284 282 } 285 283 286 284 @Override 287 285 public boolean equals(Object obj) { 288 if (this == obj) 289 return true; 290 if (obj == null) 291 return false; 292 if (getClass() != obj.getClass()) 293 return false; 294 Changeset other = (Changeset) obj; 295 if (this.id > 0 && other.id == this.id) 296 return true; 297 return this == obj; 286 if (this == obj) return true; 287 if (obj == null || getClass() != obj.getClass()) return false; 288 Changeset changeset = (Changeset) obj; 289 return id == changeset.id; 298 290 } 299 291 -
trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
r9268 r9371 17 17 import java.util.Locale; 18 18 import java.util.Map; 19 import java.util.Objects; 19 20 import java.util.Set; 20 21 … … 1320 1321 @Override 1321 1322 public boolean equals(Object obj) { 1322 if (obj instanceof OsmPrimitive) 1323 return ((OsmPrimitive) obj).id == id && obj.getClass() == getClass(); 1324 return false; 1323 if (this == obj) return true; 1324 if (obj == null || getClass() != obj.getClass()) return false; 1325 OsmPrimitive that = (OsmPrimitive) obj; 1326 return Objects.equals(id, that.id); 1325 1327 } 1326 1328 … … 1331 1333 */ 1332 1334 @Override 1333 public finalint hashCode() {1334 return (int) id;1335 public int hashCode() { 1336 return Objects.hash(id); 1335 1337 } 1336 1338 -
trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java
r8510 r9371 3 3 4 4 import java.util.Arrays; 5 import java.util.Objects; 5 6 6 7 import org.openstreetmap.josm.tools.CheckParameterUtil; … … 165 166 @Override 166 167 public int hashCode() { 167 final int prime = 31; 168 int result = 1; 169 result = prime * result + member.hashCode(); 170 result = prime * result + role.hashCode(); 171 return result; 168 return Objects.hash(role, member); 172 169 } 173 170 174 171 @Override 175 172 public boolean equals(Object obj) { 176 if ( obj instanceof RelationMember) {177 RelationMember other = (RelationMember) obj;178 return member.equals(other.getMember()) && role.equals(other.getRole());179 } else180 return false;173 if (this == obj) return true; 174 if (obj == null || getClass() != obj.getClass()) return false; 175 RelationMember that = (RelationMember) obj; 176 return Objects.equals(role, that.role) && 177 Objects.equals(member, that.member); 181 178 } 182 179 -
trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java
r8846 r9371 1 1 // License: GPL. For details, see LICENSE file. 2 2 package org.openstreetmap.josm.data.osm; 3 4 import java.util.Objects; 3 5 4 6 public class RelationMemberData implements PrimitiveId { … … 62 64 @Override 63 65 public int hashCode() { 64 final int prime = 31; 65 int result = 1; 66 result = prime * result + (int) (memberId ^ (memberId >>> 32)); 67 result = prime * result 68 + ((memberType == null) ? 0 : memberType.hashCode()); 69 result = prime * result + ((role == null) ? 0 : role.hashCode()); 70 return result; 66 return Objects.hash(role, memberId, memberType); 71 67 } 72 68 73 69 @Override 74 70 public boolean equals(Object obj) { 75 if (this == obj) 76 return true; 77 if (obj == null) 78 return false; 79 if (getClass() != obj.getClass()) 80 return false; 81 RelationMemberData other = (RelationMemberData) obj; 82 if (memberId != other.memberId) 83 return false; 84 if (memberType != other.memberType) 85 return false; 86 if (role == null) { 87 if (other.role != null) 88 return false; 89 } else if (!role.equals(other.role)) 90 return false; 91 return true; 71 if (this == obj) return true; 72 if (obj == null || getClass() != obj.getClass()) return false; 73 RelationMemberData that = (RelationMemberData) obj; 74 return memberId == that.memberId && 75 Objects.equals(role, that.role) && 76 memberType == that.memberType; 92 77 } 93 78 } -
trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java
r9067 r9371 4 4 import java.util.Collection; 5 5 import java.util.HashSet; 6 import java.util.Objects; 6 7 import java.util.Set; 7 8 … … 78 79 79 80 @Override 80 public int hashCode() {81 final int prime = 31;82 i nt result = 1;83 result = prime * result + ((child == null) ? 0 : child.hashCode());84 re sult = prime * result + ((parent == null) ? 0 : parent.hashCode());85 result = prime * result + position;86 result = prime * result + ((role == null) ? 0 : role.hashCode());87 return result;81 public boolean equals(Object obj) { 82 if (this == obj) return true; 83 if (obj == null || getClass() != obj.getClass()) return false; 84 RelationToChildReference that = (RelationToChildReference) obj; 85 return position == that.position && 86 Objects.equals(parent, that.parent) && 87 Objects.equals(role, that.role) && 88 Objects.equals(child, that.child); 88 89 } 89 90 90 91 @Override 91 public boolean equals(Object obj) { 92 if (this == obj) 93 return true; 94 if (obj == null) 95 return false; 96 if (getClass() != obj.getClass()) 97 return false; 98 RelationToChildReference other = (RelationToChildReference) obj; 99 if (child == null) { 100 if (other.child != null) 101 return false; 102 } else if (!child.equals(other.child)) 103 return false; 104 if (parent == null) { 105 if (other.parent != null) 106 return false; 107 } else if (!parent.equals(other.parent)) 108 return false; 109 if (position != other.position) 110 return false; 111 if (role == null) { 112 if (other.role != null) 113 return false; 114 } else if (!role.equals(other.role)) 115 return false; 116 return true; 92 public int hashCode() { 93 return Objects.hash(parent, position, role, child); 117 94 } 118 95 } -
trunk/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java
r8496 r9371 5 5 import java.util.ArrayList; 6 6 import java.util.List; 7 import java.util.Objects; 7 8 import java.util.regex.MatchResult; 8 9 import java.util.regex.Matcher; … … 42 43 @Override 43 44 public int hashCode() { 44 final int prime = 31; 45 int result = 1; 46 result = prime * result + (int) (id ^ (id >>> 32)); 47 result = prime * result + ((type == null) ? 0 : type.hashCode()); 48 return result; 45 return Objects.hash(id, type); 49 46 } 50 47 51 48 @Override 52 49 public boolean equals(Object obj) { 53 if (this == obj) 54 return true; 55 if (obj == null) 56 return false; 57 if (getClass() != obj.getClass()) 58 return false; 59 SimplePrimitiveId other = (SimplePrimitiveId) obj; 60 if (id != other.id) 61 return false; 62 if (type == null) { 63 if (other.type != null) 64 return false; 65 } else if (!type.equals(other.type)) 66 return false; 67 return true; 50 if (this == obj) return true; 51 if (obj == null || getClass() != obj.getClass()) return false; 52 SimplePrimitiveId that = (SimplePrimitiveId) obj; 53 return id == that.id && 54 type == that.type; 68 55 } 69 56 -
trunk/src/org/openstreetmap/josm/data/osm/Tag.java
r8846 r9371 1 1 // License: GPL. For details, see LICENSE file. 2 2 package org.openstreetmap.josm.data.osm; 3 4 import java.util.Objects; 3 5 4 6 import org.openstreetmap.josm.tools.CheckParameterUtil; … … 84 86 @Override 85 87 public int hashCode() { 86 final int prime = 31; 87 int result = 1; 88 result = prime * result + key.hashCode(); 89 result = prime * result + value.hashCode(); 90 return result; 88 return Objects.hash(key, value); 91 89 } 92 90 93 91 @Override 94 92 public boolean equals(Object obj) { 95 if ( obj instanceof Tag) {96 Tag other = (Tag) obj;97 return key.equals(other.getKey()) && value.equals(other.getValue());98 } else99 return false;93 if (this == obj) return true; 94 if (obj == null || getClass() != obj.getClass()) return false; 95 Tag tag = (Tag) obj; 96 return Objects.equals(key, tag.key) && 97 Objects.equals(value, tag.value); 100 98 } 101 99 -
trunk/src/org/openstreetmap/josm/data/osm/User.java
r9243 r9371 9 9 import java.util.List; 10 10 import java.util.Map; 11 import java.util.Objects; 11 12 import java.util.Set; 12 13 … … 219 220 @Override 220 221 public int hashCode() { 221 final int prime = 31; 222 int result = 1; 223 result = prime * result + getName().hashCode(); 224 result = prime * result + (int) (uid ^ (uid >>> 32)); 225 return result; 222 return Objects.hash(uid); 226 223 } 227 224 228 225 @Override 229 226 public boolean equals(Object obj) { 230 if (!(obj instanceof User)) 231 return false; 232 User other = (User) obj; 233 if (uid != other.uid) 234 return false; 235 return true; 227 if (this == obj) return true; 228 if (obj == null || getClass() != obj.getClass()) return false; 229 User user = (User) obj; 230 return uid == user.uid; 236 231 } 237 232 -
trunk/src/org/openstreetmap/josm/data/osm/WaySegment.java
r9243 r9371 3 3 4 4 import java.awt.geom.Line2D; 5 import java.util.Objects; 5 6 6 7 /** … … 79 80 @Override 80 81 public boolean equals(Object o) { 81 return o instanceof WaySegment 82 && ((WaySegment) o).way == way 83 && ((WaySegment) o).lowerIndex == lowerIndex; 82 if (this == o) return true; 83 if (o == null || getClass() != o.getClass()) return false; 84 WaySegment that = (WaySegment) o; 85 return lowerIndex == that.lowerIndex && 86 Objects.equals(way, that.way); 84 87 } 85 88 86 89 @Override 87 90 public int hashCode() { 88 return way.hashCode() ^ lowerIndex;91 return Objects.hash(way, lowerIndex); 89 92 } 90 93 -
trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
r9059 r9371 5 5 import java.util.Arrays; 6 6 import java.util.List; 7 import java.util.Objects; 7 8 import java.util.Queue; 8 9 import java.util.concurrent.CopyOnWriteArrayList; … … 115 116 @Override 116 117 public int hashCode() { 117 return listener.hashCode();118 return Objects.hash(listener); 118 119 } 119 120 120 121 @Override 121 122 public boolean equals(Object o) { 122 return o instanceof ListenerInfo && ((ListenerInfo) o).listener == listener; 123 if (this == o) return true; 124 if (o == null || getClass() != o.getClass()) return false; 125 ListenerInfo that = (ListenerInfo) o; 126 return Objects.equals(listener, that.listener); 123 127 } 124 128 } -
trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
r8836 r9371 4 4 import java.util.Collection; 5 5 import java.util.List; 6 import java.util.Objects; 6 7 import java.util.concurrent.CopyOnWriteArrayList; 7 8 … … 35 36 @Override 36 37 public int hashCode() { 37 return listener.hashCode();38 return Objects.hash(listener); 38 39 } 39 40 40 41 @Override 41 42 public boolean equals(Object o) { 42 return o instanceof ListenerInfo && ((ListenerInfo) o).listener == listener; 43 if (this == o) return true; 44 if (o == null || getClass() != o.getClass()) return false; 45 ListenerInfo that = (ListenerInfo) o; 46 return Objects.equals(listener, that.listener); 43 47 } 44 48 } -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
r8846 r9371 10 10 import java.util.Locale; 11 11 import java.util.Map; 12 import java.util.Objects; 12 13 13 14 import org.openstreetmap.josm.data.osm.Changeset; … … 249 250 @Override 250 251 public int hashCode() { 251 final int prime = 31; 252 int result = 1; 253 result = prime * result + (int) (id ^ (id >>> 32)); 254 result = prime * result + (int) (version ^ (version >>> 32)); 255 return result; 252 return Objects.hash(id, version); 256 253 } 257 254 258 255 @Override 259 256 public boolean equals(Object obj) { 260 if (this == obj) 261 return true; 262 if (!(obj instanceof HistoryOsmPrimitive)) 263 return false; 264 // equal semantics is valid for subclasses like {@link HistoryOsmNode} etc. too. 265 // So, don't enforce equality of class. 266 HistoryOsmPrimitive other = (HistoryOsmPrimitive) obj; 267 if (id != other.id) 268 return false; 269 if (version != other.version) 270 return false; 271 return true; 257 if (this == obj) return true; 258 if (obj == null || getClass() != obj.getClass()) return false; 259 HistoryOsmPrimitive that = (HistoryOsmPrimitive) obj; 260 return id == that.id && 261 version == that.version; 272 262 } 273 263
Note:
See TracChangeset
for help on using the changeset viewer.