Changeset 2188 in josm for trunk/src/org/openstreetmap/josm/data/APIDataSet.java

Timestamp:

2009-09-26T09:43:40+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3570: uploated deletions create conflicts at next upload

File:

• trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -28 +28 @@
  * The collection is derived from the modified primitives of an {@see DataSet}.
  * 
- * 
  */
 public class APIDataSet {
@@ -45 +44 @@
 
     /**
-     * initializes the API data set with the modified primitives in <code>ds</ds>
-     * 
-     * @param ds the data set. Ignore, if null.
+     * initializes the API data set with the modified primitives in <code>ds</code>
+     * 
+     * @param ds the data set. Ignored, if null.
      */
     public void init(DataSet ds) {
@@ -63 +62 @@
             } else if (osm.isModified() && !osm.isDeleted()) {
                 toUpdate.addLast(osm);
-            } else if (osm.isDeleted() && osm.getId() != 0) {
+            } else if (osm.isDeleted() && osm.getId() != 0 && osm.isModified()) {
                 toDelete.addFirst(osm);
             }
@@ -70 +69 @@
 
     /**
-     * initializes the API data set with the modified primitives in <code>ds</ds>
-     * 
-     * @param ds the data set. Ignore, if null.
+     * initializes the API data set with the modified primitives in <code>ds</code>
+     * 
+     * @param ds the data set. Ignored, if null.
      */
     public APIDataSet(DataSet ds) {