Changeset 2932 in josm for trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.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/PrimitiveData.java (modified) (5 diffs)

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

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -47 +48 @@
     private User user;
     private int version;
-    private int timestamp;
+    private Date timestamp = new Date();
     private int changesetId;
 
@@ -69 +70 @@
     }
     public long getId() {
-        return id;
+        return id > 0 ? id : 0;
     }
     public void setId(long id) {
@@ -86 +87 @@
         this.version = version;
     }
-    public int getTimestamp() {
+    public Date getTimestamp() {
         return timestamp;
     }
-    public void setTimestamp(int timestamp) {
+    public void setTimestamp(Date timestamp) {
         this.timestamp = timestamp;
     }
@@ -194 +195 @@
     }
 
+    /**
+     * Returns a PrimitiveId object for this primitive
+     *
+     * @return the PrimitiveId for this primitive
+     */
+    public PrimitiveId getPrimitiveId() {
+        return new SimplePrimitiveId(getUniqueId(), getType());
+    }
+
     public boolean isNew() {
         return id <= 0;