Changeset 2604 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2009-12-10T18:42:41+01:00 (14 years ago)

Author:

Gubaer

Message:

New: JOSM reading, writing, merging changeset attribute
fixed #4090: Add changeset:* search option to JOSM's search engine

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• Changeset.java (modified) (6 diffs)
• OsmPrimitive.java (modified) (7 diffs)
• PrimitiveData.java (modified) (2 diffs)

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

@@ -17 +17 @@
 public final class Changeset implements Tagged {
     /** the changeset id */
-    private long id;
+    private int id;
     /** the user who owns the changeset */
     private User user;
@@ -50 +50 @@
      * @param id the id
      */
-    public Changeset(long id) {
+    public Changeset(int id) {
         this.id = id;
         this.incomplete = id > 0;
@@ -90 +90 @@
 
     public int compareTo(Changeset other) {
-        return Long.valueOf(getId()).compareTo(other.getId());
+        return Integer.valueOf(getId()).compareTo(other.getId());
     }
 
@@ -102 +102 @@
     }
 
-    public long getId() {
+    public int getId() {
         return id;
     }
 
-    public void setId(long id) {
+    public void setId(int id) {
         this.id = id;
     }
@@ -234 +234 @@
         final int prime = 31;
         int result = 1;
-        result = prime * result + (int) (id ^ (id >>> 32));
+        result = prime * result + (id ^ (id >>> 32));
         if (id > 0)
             return prime * result + getClass().hashCode();
@@ -306 +306 @@
         return id <= 0;
     }
+
+    public void mergeFrom(Changeset other) {
+        if (other == null)
+            return;
+        if (id != other.id)
+            return;
+        this.user = other.user;
+        this.createdAt = other.createdAt;
+        this.closedAt = other.closedAt;
+        this.open  = other.open;
+        this.min = other.min;
+        this.max = other.max;
+        this.tags.clear();
+        this.tags.putAll(other.tags);
+    }
 }

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

@@ -238 +238 @@
 
     /**
+     * The id of the changeset this primitive was last uploaded to.
+     * 0 if it wasn't uploaded to a changeset yet of if the changeset
+     * id isn't known.
+     */
+    private int changesetId;
+
+    /**
      * Creates a new primitive for the given id. If the id > 0, the primitive is marked
      * as incomplete.
@@ -577 +584 @@
     public void setUser(User user) {
         this.user = user;
+    }
+
+
+    /**
+     * Replies the id of the changeset this primitive was last uploaded to.
+     * 0 if this primitive wasn't uploaded to a changeset yet or if the
+     * changeset isn't known.
+     * 
+     * @return the id of the changeset this primitive was last uploaded to.
+     */
+    public int getChangesetId() {
+        return changesetId;
+    }
+
+
+    /**
+     * Sets the changeset id of this primitive. Can't be set on a new
+     * primitive.
+     * 
+     * @param changesetId the id. >= 0 required.
+     * @throws IllegalStateException thrown if this primitive is new.
+     * @throws IllegalArgumentException thrown if id < 0
+     */
+    public void setChangesetId(int changesetId) throws IllegalStateException, IllegalArgumentException {
+        if (changesetId < 0)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' >= 0 expected, got {1}", "changesetId", changesetId));
+        if (isNew() && changesetId > 0)
+            throw new IllegalStateException(tr("Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is {0}", changesetId));
+        this.changesetId = changesetId;
     }
 
@@ -916 +952 @@
      * use this only in the data initializing phase
      */
-    public void cloneFrom(OsmPrimitive osm) {
-        setKeys(osm.getKeys());
-        id = osm.id;
-        timestamp = osm.timestamp;
-        version = osm.version;
-        setIncomplete(osm.isIncomplete());
-        flags = osm.flags;
-        user= osm.user;
+    public void cloneFrom(OsmPrimitive other) {
+        setKeys(other.getKeys());
+        id = other.id;
+        timestamp = other.timestamp;
+        version = other.version;
+        setIncomplete(other.isIncomplete());
+        flags = other.flags;
+        user= other.user;
+        changesetId = other.changesetId;
         clearCached();
     }
@@ -951 +988 @@
         flags = other.flags;
         user= other.user;
+        changesetId = other.changesetId;
     }
 
@@ -1000 +1038 @@
         && version == other.version
         && isVisible() == other.isVisible()
-        && (user == null ? other.user==null : user==other.user);
+        && (user == null ? other.user==null : user==other.user)
+        && changesetId == other.changesetId;
     }
 
@@ -1098 +1137 @@
         timestamp = data.getTimestamp();
         user = data.getUser();
+        changesetId = data.getChangesetId();
         setDeleted(data.isDeleted());
         setModified(data.isModified());
@@ -1118 +1158 @@
         data.setModified(isModified());
         data.setVisible(isVisible());
+        data.setChangesetId(changesetId);
     }
 

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

@@ -46 +46 @@
     private int version;
     private int timestamp;
+    private int changesetId;
 
     public boolean isModified() {
@@ -89 +90 @@
         this.timestamp = timestamp;
     }
+
+    public int getChangesetId() {
+        return changesetId;
+    }
+
+    public void setChangesetId(int changesetId) {
+        this.changesetId = changesetId;
+    }
+
     public Map<String, String> getKeys() {
         return keys;