Changeset 2938 in josm for trunk/src


Ignore:
Timestamp:
2010-02-04T21:51:27+01:00 (10 years ago)
Author:
jttt
Message:

Addition to #4408 (don't require to merge coordinates after primitive was deleted)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

    r2936 r2938  
    653653
    654654    public void deletePrimitive(boolean deleted) {
    655         // Do nothing
     655        if (deleted) {
     656            if (model.getMergedCoords() == null) {
     657                model.decideCoordsConflict(MergeDecisionType.KEEP_MINE);
     658            }
     659        } else {
     660            model.decideCoordsConflict(MergeDecisionType.UNDECIDED);
     661        }
    656662    }
    657663}
Note: See TracChangeset for help on using the changeset viewer.