Changeset 9371 in josm for trunk/src/org/openstreetmap/josm/data/validation
- Timestamp:
- 2016-01-09T23:20:37+01:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/validation
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java
r8444 r9371 7 7 import java.util.HashSet; 8 8 import java.util.List; 9 import java.util.Objects; 9 10 import java.util.Set; 10 11 … … 58 59 @Override 59 60 public int hashCode() { 60 final int prime = 31; 61 int result = 1; 62 result = prime * result + p1.hashCode(); 63 result = prime * result + color.hashCode(); 64 return result; 61 return Objects.hash(p1, color); 65 62 } 66 63 67 64 @Override 68 65 public boolean equals(Object obj) { 69 if (this == obj) 70 return true; 71 if (obj == null) 72 return false; 73 if (getClass() != obj.getClass()) 74 return false; 75 PaintedPoint other = (PaintedPoint) obj; 76 if (!p1.equals(other.p1)) 77 return false; 78 if (!color.equals(other.color)) 79 return false; 80 return true; 66 if (this == obj) return true; 67 if (obj == null || getClass() != obj.getClass()) return false; 68 PaintedPoint that = (PaintedPoint) obj; 69 return Objects.equals(p1, that.p1) && 70 Objects.equals(color, that.color); 81 71 } 82 72 } … … 92 82 @Override 93 83 public int hashCode() { 94 final int prime = 31; 95 int result = super.hashCode(); 96 result = prime * result + p2.hashCode(); 97 return result; 84 return Objects.hash(super.hashCode(), p2); 98 85 } 99 86 100 87 @Override 101 88 public boolean equals(Object obj) { 102 if (!super.equals(obj)) { 103 return false; 104 } 105 PaintedSegment other = (PaintedSegment) obj; 106 if (!p2.equals(other.p2)) 107 return false; 108 return true; 89 if (this == obj) return true; 90 if (obj == null || getClass() != obj.getClass()) return false; 91 if (!super.equals(obj)) return false; 92 PaintedSegment that = (PaintedSegment) obj; 93 return Objects.equals(p2, that.p2); 109 94 } 110 95 } -
trunk/src/org/openstreetmap/josm/data/validation/Test.java
r9345 r9371 8 8 import java.util.Collection; 9 9 import java.util.List; 10 import java.util.Objects; 10 11 11 12 import javax.swing.JCheckBox; … … 340 341 @Override 341 342 public int hashCode() { 342 final int prime = 31; 343 int result = 1; 344 result = prime * result + ((description == null) ? 0 : description.hashCode()); 345 result = prime * result + ((name == null) ? 0 : name.hashCode()); 346 return result; 343 return Objects.hash(name, description); 347 344 } 348 345 349 346 @Override 350 347 public boolean equals(Object obj) { 351 if (this == obj) 352 return true; 353 if (obj == null) 354 return false; 355 if (!(obj instanceof Test)) 356 return false; 357 Test other = (Test) obj; 358 if (description == null) { 359 if (other.description != null) 360 return false; 361 } else if (!description.equals(other.description)) 362 return false; 363 if (name == null) { 364 if (other.name != null) 365 return false; 366 } else if (!name.equals(other.name)) 367 return false; 368 return true; 348 if (this == obj) return true; 349 if (obj == null || getClass() != obj.getClass()) return false; 350 Test test = (Test) obj; 351 return Objects.equals(name, test.name) && 352 Objects.equals(description, test.description); 369 353 } 370 354 } -
trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java
r9067 r9371 10 10 import java.util.List; 11 11 import java.util.Map; 12 import java.util.Objects; 12 13 import java.util.Set; 13 14 … … 55 56 @Override 56 57 public int hashCode() { 57 return role.hashCode()+(int) relId+tags.hashCode()+type.hashCode()+coor.hashCode();58 return Objects.hash(role, type, tags, coor, relId); 58 59 } 59 60 60 61 @Override 61 62 public boolean equals(Object obj) { 62 if (!(obj instanceof RelMember)) return false; 63 RelMember rm = (RelMember) obj; 64 return rm.role.equals(role) && rm.type.equals(type) && rm.relId == relId && rm.tags.equals(tags) && rm.coor.equals(coor); 63 if (this == obj) return true; 64 if (obj == null || getClass() != obj.getClass()) return false; 65 RelMember relMember = (RelMember) obj; 66 return relId == relMember.relId && 67 Objects.equals(role, relMember.role) && 68 type == relMember.type && 69 Objects.equals(tags, relMember.tags) && 70 Objects.equals(coor, relMember.coor); 65 71 } 66 72 … … 117 123 @Override 118 124 public int hashCode() { 119 return members.hashCode();125 return Objects.hash(members); 120 126 } 121 127 122 128 @Override 123 129 public boolean equals(Object obj) { 124 if (!(obj instanceof RelationMembers)) return false; 125 RelationMembers rm = (RelationMembers) obj; 126 return rm.members.equals(members); 130 if (this == obj) return true; 131 if (obj == null || getClass() != obj.getClass()) return false; 132 RelationMembers that = (RelationMembers) obj; 133 return Objects.equals(members, that.members); 127 134 } 128 135 } … … 148 155 @Override 149 156 public int hashCode() { 150 return members.hashCode()+keys.hashCode();157 return Objects.hash(members, keys); 151 158 } 152 159 153 160 @Override 154 161 public boolean equals(Object obj) { 155 if (!(obj instanceof RelationPair)) return false; 156 RelationPair rp = (RelationPair) obj; 157 return rp.members.equals(members) && rp.keys.equals(keys); 162 if (this == obj) return true; 163 if (obj == null || getClass() != obj.getClass()) return false; 164 RelationPair that = (RelationPair) obj; 165 return Objects.equals(members, that.members) && 166 Objects.equals(keys, that.keys); 158 167 } 159 168 } -
trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
r8850 r9371 11 11 import java.util.List; 12 12 import java.util.Map; 13 import java.util.Objects; 13 14 import java.util.Set; 14 15 … … 49 50 @Override 50 51 public int hashCode() { 51 return coor.hashCode() + keys.hashCode();52 return Objects.hash(coor, keys); 52 53 } 53 54 54 55 @Override 55 56 public boolean equals(Object obj) { 56 if (!(obj instanceof WayPair)) 57 return false; 58 WayPair wp = (WayPair) obj; 59 return wp.coor.equals(coor) && wp.keys.equals(keys); 57 if (this == obj) return true; 58 if (obj == null || getClass() != obj.getClass()) return false; 59 WayPair wayPair = (WayPair) obj; 60 return Objects.equals(coor, wayPair.coor) && 61 Objects.equals(keys, wayPair.keys); 60 62 } 61 63 } … … 74 76 @Override 75 77 public int hashCode() { 76 return coor.hashCode();78 return Objects.hash(coor); 77 79 } 78 80 79 81 @Override 80 82 public boolean equals(Object obj) { 81 if (!(obj instanceof WayPairNoTags)) return false; 82 WayPairNoTags wp = (WayPairNoTags) obj; 83 return wp.coor.equals(coor); 83 if (this == obj) return true; 84 if (obj == null || getClass() != obj.getClass()) return false; 85 WayPairNoTags that = (WayPairNoTags) obj; 86 return Objects.equals(coor, that.coor); 84 87 } 85 88 } -
trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
r9359 r9371 23 23 import java.util.Locale; 24 24 import java.util.Map; 25 import java.util.Objects; 25 26 import java.util.Set; 26 27 import java.util.regex.Matcher; … … 95 96 @Override 96 97 public int hashCode() { 97 final int prime = 31; 98 int result = 1; 99 result = prime * result + ((declaration == null) ? 0 : declaration.hashCode()); 100 result = prime * result + ((selectors == null) ? 0 : selectors.hashCode()); 101 return result; 98 return Objects.hash(selectors, declaration); 102 99 } 103 100 104 101 @Override 105 102 public boolean equals(Object obj) { 106 if (this == obj) 107 return true; 108 if (obj == null) 109 return false; 110 if (!(obj instanceof GroupedMapCSSRule)) 111 return false; 112 GroupedMapCSSRule other = (GroupedMapCSSRule) obj; 113 if (declaration == null) { 114 if (other.declaration != null) 115 return false; 116 } else if (!declaration.equals(other.declaration)) 117 return false; 118 if (selectors == null) { 119 if (other.selectors != null) 120 return false; 121 } else if (!selectors.equals(other.selectors)) 122 return false; 123 return true; 103 if (this == obj) return true; 104 if (obj == null || getClass() != obj.getClass()) return false; 105 GroupedMapCSSRule that = (GroupedMapCSSRule) obj; 106 return Objects.equals(selectors, that.selectors) && 107 Objects.equals(declaration, that.declaration); 124 108 } 125 109 … … 660 644 @Override 661 645 public int hashCode() { 662 final int prime = 31; 663 int result = super.hashCode(); 664 result = prime * result + ((rule == null) ? 0 : rule.hashCode()); 665 return result; 646 return Objects.hash(super.hashCode(), rule); 666 647 } 667 648 … … 825 806 @Override 826 807 public synchronized int hashCode() { 827 final int prime = 31; 828 int result = super.hashCode(); 829 result = prime * result + ((checks == null) ? 0 : checks.hashCode()); 830 return result; 808 return Objects.hash(super.hashCode(), checks); 831 809 } 832 810 833 811 @Override 834 812 public synchronized boolean equals(Object obj) { 835 if (this == obj) 836 return true; 837 if (!super.equals(obj)) 838 return false; 839 if (!(obj instanceof MapCSSTagChecker)) 840 return false; 841 MapCSSTagChecker other = (MapCSSTagChecker) obj; 842 if (checks == null) { 843 if (other.checks != null) 844 return false; 845 } else if (!checks.equals(other.checks)) 846 return false; 847 return true; 813 if (this == obj) return true; 814 if (obj == null || getClass() != obj.getClass()) return false; 815 if (!super.equals(obj)) return false; 816 MapCSSTagChecker that = (MapCSSTagChecker) obj; 817 return Objects.equals(checks, that.checks); 848 818 } 849 819 }
Note:
See TracChangeset
for help on using the changeset viewer.