Changeset 1690 in josm for trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

Timestamp:

2009-06-23T22:03:37+02:00 (17 years ago)

Author:

Gubaer

Message:

new: MultiFetchServerObjectReader using APIs Multi Fetch method
update: now uses Multi Fetch to check for deleted primitives on the server
update: now uses Multi Fetch to update the selected primitives with the state from the server
fixed: cleaned up merging in MergeVisitor
new: conflict resolution dialog; now resolves conflicts due to different visibilities
new: replacement for realEqual() on OsmPrimitive and derived classes; realEqual now @deprecated
fixed: cleaning up OsmReader
fixed: progress indication in OsmApi

File:

• trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

@@ -66 +66 @@
 
         if (decision.equals(MergeDecisionType.KEEP_MINE)) {
-            // do nothing
+            if (my.deleted) {
+                // because my was involved in a conflict it my still be referred
+                // to from a way or a relation. Fix this now.
+                //
+                Main.main.editLayer().data.unlinkReferencesToPrimitive(my);
+            }
         } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
-            my.deleted = their.deleted;
+            if (their.deleted) {
+                Main.main.editLayer().data.unlinkReferencesToPrimitive(my);
+                my.delete(true);
+            } else {
+                my.deleted = their.deleted;
+            }
         } else
             // should not happen