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

Timestamp:

2010-02-04T21:04:02+01:00 (14 years ago)

Author:

jttt

Message:

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

Location:

trunk/src/org/openstreetmap/josm/data/osm/history

Files:

• History.java (modified) (2 diffs)
• HistoryDataSet.java (modified) (2 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm.history;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.text.MessageFormat;
@@ -39 +37 @@
     private ArrayList<HistoryOsmPrimitive> versions;
     /** the object id */
-    private long id;
-    private OsmPrimitiveType type;
+    private final long id;
+    private final OsmPrimitiveType type;
 
     /**

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>());