Changeset 5993 in josm for trunk/src/org/openstreetmap/josm/command
- Timestamp:
- 2013-06-06T20:53:11+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/PurgeCommand.java
r5905 r5993 15 15 import javax.swing.Icon; 16 16 17 import org.openstreetmap.josm.data.conflict.Conflict; 18 import org.openstreetmap.josm.data.conflict.ConflictCollection; 17 19 import org.openstreetmap.josm.data.osm.DataSet; 18 20 import org.openstreetmap.josm.data.osm.Node; … … 37 39 38 40 protected Map<PrimitiveId, PrimitiveData> makeIncompleteData_byPrimId; 41 42 protected final ConflictCollection purgedConflicts = new ConflictCollection(); 39 43 40 44 final protected DataSet ds; … … 76 80 ds.beginUpdate(); 77 81 try { 82 purgedConflicts.get().clear(); 78 83 /** 79 84 * Loop from back to front to keep referential integrity. … … 97 102 } else { 98 103 ds.removePrimitive(osm); 104 Conflict<?> conflict = getLayer().getConflicts().getConflictForMy(osm); 105 if (conflict != null) { 106 purgedConflicts.add(conflict); 107 getLayer().getConflicts().remove(conflict); 108 } 99 109 } 100 110 } … … 121 131 ds.addPrimitive(osm); 122 132 } 133 } 134 135 for (Conflict<?> conflict : purgedConflicts) { 136 getLayer().getConflicts().add(conflict); 123 137 } 124 138 }
Note:
See TracChangeset
for help on using the changeset viewer.