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

Timestamp:

2010-07-03T22:08:57+02:00 (14 years ago)

Author:

stoecker

Message:

fix #5182 - Conflict system simplification - patch by Upliner

Location:

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

Files:

• DataSet.java (modified) (1 diff)
• DataSetMerger.java (modified) (3 diffs)

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

@@ -997 +997 @@
         }
     }
+
+    /**
+     * Marks all "invisible" objects as deleted. These objects should be always marked as
+     * deleted when downloaded from the server. They can be undeleted later if necessary.
+     * 
+     */
+    public void deleteInvisible() {
+        for (OsmPrimitive primitive:allPrimitives) {
+            if (!primitive.isVisible()) {
+                primitive.setDeleted(true);
+            }
+        }
+    }
 }

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

@@ -11 +11 @@
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -23 +22 @@
  */
 public class DataSetMerger {
-    private static Logger logger = Logger.getLogger(DataSetMerger.class.getName());
 
     /** the collection of conflicts created during merging */
@@ -244 +242 @@
             // target.version > source.version => keep target version
             return true;
-        if (! target.isVisible() && source.isVisible() && target.getVersion() == source.getVersion()) {
-            // should not happen
-            conflicts.add(target,source);
-        } else if (target.isVisible() && ! source.isVisible()) {
-            // this is always a conflict because the user has to decide whether
-            // he wants to create a clone of its target primitive or whether he
-            // wants to purge the target from the local dataset. He can't keep it unchanged
-            // because it was deleted on the server.
-            //
-            conflicts.add(target,source);
-        } else if (target.isIncomplete() && !source.isIncomplete()) {
+
+        if (target.isIncomplete() && !source.isIncomplete()) {
             // target is incomplete, source completes it
             // => merge source into target