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

Timestamp:

2017-09-07T21:01:54+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15262 - see #13036 - fix regression in ChangePropertyCommand + optimize commands creation when pasting tags

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/ChangePropertyCommand.java (modified) (2 diffs)
• gui/datatransfer/importers/PrimitiveTagTransferPaster.java (modified) (2 diffs)

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

@@ -140 +140 @@
 
                 if (newVal == null || newVal.isEmpty()) {
-                    if (oldVal != null)
+                    if (oldVal != null) {
                         // new value is null and tag exists (will delete tag)
                         modified = true;
-                } else if (oldVal == null || !newVal.equals(oldVal))
+                        break;
+                    }
+                } else if (oldVal == null || !newVal.equals(oldVal)) {
                     // new value is not null and is different from current value
                     modified = true;
+                    break;
+                }
             }
             if (modified)
@@ -154 +158 @@
     @Override
     public boolean executeCommand() {
+        if (objects.isEmpty())
+            return true;
         final DataSet dataSet = objects.get(0).getDataSet();
         if (dataSet != null) {

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveTagTransferPaster.java

@@ -27 +27 @@
 
 /**
- * This class helps pasting tags form other primitives. It handles resolving conflicts.
+ * This class helps pasting tags from other primitives. It handles resolving conflicts.
  * @author Michael Zangl
  * @since 10737
@@ -50 +50 @@
         List<Command> commands = new ArrayList<>();
         for (Tag tag : tagPaster.execute()) {
-            commands.add(new ChangePropertyCommand(selection, tag.getKey(), "".equals(tag.getValue()) ? null : tag.getValue()));
+            ChangePropertyCommand cmd = new ChangePropertyCommand(selection, tag.getKey(), "".equals(tag.getValue()) ? null : tag.getValue());
+            if (cmd.getObjectsNumber() > 0) {
+                commands.add(cmd);
+            }
         }
         commitCommands(selection, commands);