Changeset 10662 in josm for trunk/src/org/openstreetmap/josm/data/conflict

Timestamp:

2016-07-28T01:00:46+02:00 (9 years ago)

Author:

Don-vip

Message:

see #12472, fix #13230, fix #13225, fix #13228 - disable ReferenceEquality warning + partial revert of r10656 + r10659, causes too much problems

File:

• trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

@@ -48 +48 @@
 
     public boolean isMatchingMy(OsmPrimitive my) {
-        return Objects.equals(this.my, my);
+        return this.my == my;
     }
 
     public boolean isMatchingTheir(OsmPrimitive their) {
-        return Objects.equals(this.their, their);
+        return this.their == their;
     }