Ticket #5303: 0002-Only-cleanup-uploaded-deleted-nodes.patch

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -917 +917 @@
         synchronized (selectionLock) {
             while (it.hasNext()) {
                 OsmPrimitive primitive = it.next();
-                if (primitive.isDeleted()) {
+                if (primitive.isDeleted() && !primitive.isModified()) {
                     selectedPrimitives.remove(primitive);
                     selectionSnapshot = null;
                     allPrimitives.remove(primitive);
@@ -928 +928 @@
             }
             if (changed) {
                 selectionSnapshot = null;
-            }
-        }
-        return changed;
-    }
-
-    /**
-     * Removes all primitives from the dataset and resets the currently selected primitives
-     * to the empty collection. Also notifies selection change listeners if necessary.
-     *
-     */
     public void clear() {
         beginUpdate();
         try {

src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -397 +397 @@
         Main.main.undoRedo.clean(this);
 
         // if uploaded, clean the modified flags as well
-        data.cleanupDeletedPrimitives();
         for (OsmPrimitive p: data.allPrimitives()) {
             if (processed.contains(p)) {
                 p.setModified(false);
             }
         }
+        data.cleanupDeletedPrimitives();
     }