Changeset 3362 in josm for trunk/src/org/openstreetmap/josm/command
- Timestamp:
- 2010-07-03T22:08:57+02:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/command
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java
r3335 r3362 40 40 * 41 41 */ 42 @Deprecated 42 43 public class PurgePrimitivesCommand extends ConflictResolveCommand{ 43 44 -
trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java
r3262 r3362 26 26 * 27 27 */ 28 @Deprecated 28 29 public class UndeletePrimitivesCommand extends ConflictResolveCommand { 29 30 //static private final Logger logger = Logger.getLogger(UndeletePrimitivesCommand.class.getName()); -
trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java
r3262 r3362 51 51 super.executeCommand(); 52 52 if (!conflict.getMy().isNew()) { 53 long myVersion = conflict.getMy().getVersion(); 54 long theirVersion = conflict.getTheir().getVersion(); 53 55 conflict.getMy().setOsmId( 54 56 conflict.getMy().getId(), 55 (int)Math.max( conflict.getMy().getVersion(), conflict.getTheir().getVersion())57 (int)Math.max(myVersion, theirVersion) 56 58 ); 59 // update visiblity state 60 if (theirVersion >= myVersion) { 61 conflict.getMy().setVisible(conflict.getTheir().isVisible()); 62 } 57 63 } 58 64 getLayer().getConflicts().remove(conflict);
Note:
See TracChangeset
for help on using the changeset viewer.