Changeset 2305 in josm for trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

Timestamp:

2009-10-24T21:22:49+02:00 (15 years ago)

Author:

jttt

Message:

Use PrimitiveData for Copy, Paste and Paste tags actions

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -36 +36 @@
 abstract public class OsmPrimitive implements Comparable<OsmPrimitive>, Tagged {
 
-    static final AtomicLong idCounter = new AtomicLong(0);
+    private static final AtomicLong idCounter = new AtomicLong(0);
+
+    static long generateUniqueId() {
+        return idCounter.decrementAndGet();
+    }
 
     private static final int FLAG_MODIFIED = 1 << 0;
@@ -164 +168 @@
                 throw new IllegalArgumentException(tr("Expected ID >= 0. Got {0}.", id));
             else if (id == 0) {
-                this.id = idCounter.decrementAndGet();
+                this.id = generateUniqueId();
             } else {
                 this.id = id;
@@ -400 +404 @@
      */
     public void clearOsmId() {
-        this.id = idCounter.decrementAndGet();
+        this.id = generateUniqueId();
         this.version = 0;
         this.incomplete = false;
@@ -456 +460 @@
         if(directionKeys == null) {
             directionKeys = Main.pref.getCollection("tags.direction",
-                    Arrays.asList(new String[]{"oneway","incline","incline_steep","aerialway"}));
+                    Arrays.asList("oneway","incline","incline_steep","aerialway"));
         }
         return directionKeys;
@@ -841 +845 @@
 
     protected void saveCommonAttributes(PrimitiveData data) {
-        data.setId(data.getId());
+        data.setId(id);
         data.getKeys().clear();
         data.getKeys().putAll(getKeys());