Changeset 2624 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-12-13T06:48:07+01:00 (15 years ago)

Author:

mjulius

Message:

fixes #4088,#4155 - when after conflict resolving the primitive has equal semantic attributes as theirs, the primitive will get the same modified flag as theirs.

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/ModifiedConflictResolveCommand.java (added)
• gui/conflict/pair/ConflictResolver.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

@@ -15 +15 @@
 
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.ModifiedConflictResolveCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.command.VersionConflictResolveCommand;
@@ -271 +272 @@
             }
             if (isResolvedCompletely()) {
-                commands.add(
-                        new VersionConflictResolveCommand(my, their)
-                );
+                commands.add(new VersionConflictResolveCommand(my, their));
+                commands.add(new ModifiedConflictResolveCommand(my, their));
             }
         }