Ignore:
Timestamp:
2009-09-03T15:13:20+02:00 (15 years ago)
Author:
Gubaer
Message:

applied #3377: patch by xeen: Less warnings for JOSM

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

    r2025 r2039  
    6969            }
    7070        } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
    71             if (conflict.getTheir().deleted) {
     71            if (conflict.getTheir().isDeleted()) {
    7272                layer.data.unlinkReferencesToPrimitive(conflict.getMy());
    7373                conflict.getMy().delete(true);
    7474            } else {
    75                 conflict.getMy().deleted = conflict.getTheir().deleted;
     75                conflict.getMy().delete(conflict.getTheir().isDeleted());
    7676            }
    7777        } else
Note: See TracChangeset for help on using the changeset viewer.