Changeset 3034 in josm for trunk/src/org/openstreetmap/josm/data/conflict

Timestamp:

2010-02-23T08:58:12+01:00 (15 years ago)

Author:

jttt

Message:

Fix #4467 Don't silently drop locally deleted member primitives from downloaded ways and relation (fix the issue when deleted primitive is referenced)

Location:

trunk/src/org/openstreetmap/josm/data/conflict

Files:

• Conflict.java (modified) (2 diffs)
• ConflictCollection.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

@@ -21 +21 @@
     private final T my;
     private final T their;
+    private final boolean isMyDeleted;
 
     public Conflict(T my, T their) {
+        this(my, their, false);
+    }
+
+    public Conflict(T my, T their, boolean isMyDeleted) {
         this.my = my;
         this.their = their;
+        this.isMyDeleted = isMyDeleted;
     }
 
@@ -96 +102 @@
         return true;
     }
+
+    /**
+     * 
+     * @return True if my primitive was deleted but it has set non deleted status because it's referred by another
+     * primitive and references to deleted primitives are not allowed.
+     */
+    public boolean isMyDeleted() {
+        return isMyDeleted;
+    }
 }

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -33 +33 @@
  * </ul>
  */
-public class ConflictCollection implements Iterable<Conflict<?>>{
-    private final List<Conflict<?>> conflicts;
+public class ConflictCollection implements Iterable<Conflict<? extends OsmPrimitive>>{
+    private final List<Conflict<? extends OsmPrimitive>> conflicts;
     private CopyOnWriteArrayList<IConflictListener> listeners;