Changeset 1692 in josm for trunk/src/org


Ignore:
Timestamp:
2009-06-24T21:03:17+02:00 (15 years ago)
Author:
Gubaer
Message:
 
Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

    r1690 r1692  
    246246                    merged.put(other, my);
    247247                } else if (! my.modified && !other.modified) {
    248                     // nothing to merge
     248                    // both not modified. Keep mine
    249249                    //
    250250                    merged.put(other,my);
     251                } else if (my.modified && ! other.modified && my.version == other.version) {
     252                    // my is same as other but mine is modified
     253                    // => keep mine
     254                    merged.put(other, my);
    251255                } else if (my.deleted != other.deleted) {
    252256                    // if we get here my is modified. Differences in deleted state
  • trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java

    r1690 r1692  
    337337        if (myCoords != null && theirCoords == null) return true;
    338338        if (myCoords == null && theirCoords == null) return false;
    339         return !myCoords.equalsEpsilon(theirCoords);
     339        return !myCoords.equals(theirCoords);
    340340    }
    341341
Note: See TracChangeset for help on using the changeset viewer.