Changeset 2448 in josm for trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

Timestamp:

2009-11-14T17:59:10+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3352: History doesn't get invalidated on upload?
fixed #3912: Extend history dialog to contain the currently modified version
new: zoom to node in list of nodes in history dialog (popup menu)
new: load history of node from node list in history dialog (popup menu or double click)
fixed: close all history dialogs when the number of layers drop to 0
fixed: implemented equals() and hashCode() on SimplePrimitiveId
fixed: history features now usePrimitiveId instead of long.

File:

• trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (modified) (7 diffs)

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

@@ -10 +10 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 
 /**
@@ -45 +47 @@
      * @param user  the user (! null required)
      * @param uid the user id (> 0 required)
-     * @param changesetId the changeset id (> 0 required)
+     * @param changesetId the changeset id (may be null if the changeset isn't known)
      * @param timestamp the timestamp (! null required)
      *
@@ -53 +55 @@
         ensurePositiveLong(id, "id");
         ensurePositiveLong(version, "version");
-        if(uid != -1) /* allow -1 for anonymous users */
+        if(uid != -1) {
             ensurePositiveLong(uid, "uid");
-        ensurePositiveLong(changesetId, "changesetId");
+        }
         ensureNotNull(user, "user");
         ensureNotNull(timestamp, "timestamp");
@@ -63 +65 @@
         this.user = user;
         this.uid = uid;
+        // FIXME: restrict to IDs > 0 as soon as OsmPrimitive holds the
+        // changeset id too
         this.changesetId  = changesetId;
         this.timestamp = timestamp;
@@ -71 +75 @@
         return id;
     }
+
+    public PrimitiveId getPrimitiveId() {
+        return new SimplePrimitiveId(id, getType());
+    }
+
     public boolean isVisible() {
         return visible;
@@ -103 +112 @@
     public int compareTo(HistoryOsmPrimitive o) {
         if (this.id != o.id)
-            throw new ClassCastException(tr("Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''.", o.id, this.id));
+            throw new ClassCastException(tr("Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''.", o.id, this.id));
         return new Long(this.version).compareTo(o.version);
     }
@@ -121 +130 @@
     public Map<String,String> getTags() {
         return Collections.unmodifiableMap(tags);
+    }
+
+    /**
+     * Sets the tags for this history primitive. Removes all
+     * tags if <code>tags</code> is null.
+     * 
+     * @param tags the tags. May be null.
+     */
+    public void setTags(Map<String,String> tags) {
+        if (tags == null) {
+            this.tags = new HashMap<String, String>();
+        } else {
+            this.tags = new HashMap<String, String>(tags);
+        }
     }