Changeset 2936 in josm for trunk/src/org/openstreetmap/josm/data/osm/history/History.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/History.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;
 
     /**