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

Timestamp:

2009-12-04T15:53:55+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3684: Add "chunked" upload mode
Removed support for API "0.5" when uploading (there are still 0.5-files around, but I'm not aware of any 0.5-servers)

File:

• trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (modified) (2 diffs)

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

@@ -68 +68 @@
         super.executeCommand();
 
-        // replace the list of nodes of 'my' way by the list of merged
-        // nodes
+        // replace the list of members of 'my' relation by the list of merged
+        // members
         //
         my.setMembers(mergedMembers);
@@ -87 +87 @@
     public void undoCommand() {
         if (! Main.map.mapView.hasLayer(layer)) {
-            logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present any more",
+            logger.warning(tr("Can''t undo command ''{0}'' because layer ''{1}'' is not present any more",
                     this.toString(),
                     layer.toString()