Ignore:
Timestamp:
2016-07-28T01:00:46+02:00 (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

    r10659 r10662  
    4848
    4949    public boolean isMatchingMy(OsmPrimitive my) {
    50         return Objects.equals(this.my, my);
     50        return this.my == my;
    5151    }
    5252
    5353    public boolean isMatchingTheir(OsmPrimitive their) {
    54         return Objects.equals(this.their, their);
     54        return this.their == their;
    5555    }
    5656
Note: See TracChangeset for help on using the changeset viewer.