Changeset 3362 in josm for trunk/src/org/openstreetmap/josm/command

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/command

Files:

• PurgePrimitivesCommand.java (modified) (1 diff)
• UndeletePrimitivesCommand.java (modified) (1 diff)
• VersionConflictResolveCommand.java (modified) (1 diff)

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

@@ -40 +40 @@
  *
  */
+@Deprecated
 public class PurgePrimitivesCommand extends ConflictResolveCommand{
 

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

@@ -26 +26 @@
  *
  */
+@Deprecated
 public class UndeletePrimitivesCommand extends ConflictResolveCommand {
     //static private final Logger logger = Logger.getLogger(UndeletePrimitivesCommand.class.getName());

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

@@ -51 +51 @@
         super.executeCommand();
         if (!conflict.getMy().isNew()) {
+            long myVersion = conflict.getMy().getVersion();
+            long theirVersion = conflict.getTheir().getVersion();
             conflict.getMy().setOsmId(
                     conflict.getMy().getId(),
-                    (int)Math.max(conflict.getMy().getVersion(), conflict.getTheir().getVersion())
+                    (int)Math.max(myVersion, theirVersion)
             );
+            // update visiblity state
+            if (theirVersion >= myVersion) {
+                conflict.getMy().setVisible(conflict.getTheir().isVisible());
+            }
         }
         getLayer().getConflicts().remove(conflict);