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

Timestamp:

2009-08-30T15:41:28+02:00 (14 years ago)

Author:

Gubaer

Message:

new: tag conflict resolution when pasting tags (only if necessary)
fixed #2611: cant copy'n'past tags from a relation to ways or other way round
fixed #3137: Paste Tags does not work for relations

File:

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

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

@@ -100 +100 @@
             if (value == null) {
                 switch(OsmPrimitiveType.from(primitive)) {
-                case NODE: msg = marktr("Remove \"{0}\" for node ''{1}''"); break;
-                case WAY: msg = marktr("Remove \"{0}\" for way ''{1}''"); break;
-                case RELATION: msg = marktr("Remove \"{0}\" for relation ''{1}''"); break;
+                    case NODE: msg = marktr("Remove \"{0}\" for node ''{1}''"); break;
+                    case WAY: msg = marktr("Remove \"{0}\" for way ''{1}''"); break;
+                    case RELATION: msg = marktr("Remove \"{0}\" for relation ''{1}''"); break;
                 }
                 text = tr(msg, key, primitive.getDisplayName(DefaultNameFormatter.getInstance()));
             } else {
                 switch(OsmPrimitiveType.from(primitive)) {
-                case NODE: msg = marktr("Set {0}={1} for node ''{2}''"); break;
-                case WAY: msg = marktr("Set {0}={1} for way ''{2}''"); break;
-                case RELATION: msg = marktr("Set {0}={1} for relation ''{2}''"); break;
+                    case NODE: msg = marktr("Set {0}={1} for node ''{2}''"); break;
+                    case WAY: msg = marktr("Set {0}={1} for way ''{2}''"); break;
+                    case RELATION: msg = marktr("Set {0}={1} for relation ''{2}''"); break;
                 }
                 text = tr(msg, key, value, primitive.getDisplayName(DefaultNameFormatter.getInstance()));
             }
-        }
-        else
-        {
+        } else {
             text = value == null
             ? tr("Remove \"{0}\" for {1} {2}", key, objects.size(), trn("object","objects",objects.size()))