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

Timestamp:

03.02.2010 22:53:24 (2 years ago)

Author:

mjulius

Message:

bring PrimitiveData.getId() in line with OsmPrimitive.getId()
remove OsmReader.OsmPrimitiveData and use PrimitiveData instead

File:

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

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

@@ -223 +223 @@
     }
 
-    protected OsmPrimitive(PrimitiveData data) {
-        version = data.getVersion();
-        id = data.getId();
+    /**
+     * Creates a new primitive for the given id and version.
+     *
+     * If allowNegativeId is set, provided id can be < 0 and will be set to primitive without any processing.
+     * If allowNegativeId is not set, then id will have to be 0 (in that case new unique id will be generated) or
+     * positive number.
+     * 
+     * If id is not > 0 version is ignored and set to 0.
+     *
+     * @param id
+     * @param version
+     * @param allowNegativeId
+     * @throws IllegalArgumentException thrown if id < 0 and allowNegativeId is false
+     */
+    protected OsmPrimitive(long id, int version, boolean allowNegativeId) throws IllegalArgumentException {
+        this(id, allowNegativeId);
+        this.version = (id > 0 ? version : 0);
     }
 
@@ -1161 +1175 @@
     public void load(PrimitiveData data) {
         setKeys(data.getKeys());
-        timestamp = data.getTimestamp();
+        setTimestamp(data.getTimestamp());
         user = data.getUser();
         setChangesetId(data.getChangesetId());
@@ -1180 +1194 @@
         data.getKeys().clear();
         data.getKeys().putAll(getKeys());
-        data.setTimestamp(timestamp);
+        data.setTimestamp(getTimestamp());
         data.setUser(user);
         data.setDeleted(isDeleted());