Changeset 2936 in josm for trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java

Timestamp:

04.02.2010 21:04:02 (2 years ago)

Author:

jttt

Message:

Fixed #4408 confict manager: do not have to solve tag- and element-conficts when deleting

File:

• trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java

@@ -54 +54 @@
     }
 
-    protected void fireHistoryUpdated(SimplePrimitiveId id) {
+    protected void fireHistoryUpdated(PrimitiveId id) {
         for (HistoryDataSetListener l : listeners) {
             l.historyUpdated(this, id);
@@ -94 +94 @@
      */
     public void put(HistoryOsmPrimitive primitive) {
-        SimplePrimitiveId id = new SimplePrimitiveId(primitive.getId(), primitive.getType());
+        PrimitiveId id = new SimplePrimitiveId(primitive.getId(), primitive.getType());
         if (data.get(id) == null) {
             data.put(id, new ArrayList<HistoryOsmPrimitive>());