Ignore:
Timestamp:
2016-07-27T02:48:44+02:00 (4 years ago)
Author:
Don-vip
Message:

see #12472 - fix more warnings, increase maximum number of reported warnings from 100 to 1000

File:
1 edited

Legend:

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

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