Changeset 4302 in josm

Timestamp:

Aug 8, 2011 12:39:06 AM (22 months ago)

Author:

stoecker

Message:

fix #6364 - patch by simon04 - can't remove tag with preset (hopefully don't break anything with this patch)

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/ChangePropertyCommand.java (modified) (4 diffs)
• gui/tagging/TaggingPreset.java (modified) (1 diff)

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

@@ -6 +6 @@
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -45 +46 @@
         this.objects = new LinkedList<OsmPrimitive>();
         this.key = key;
-        this.value = value;
-        if (value == null) {
+        this.value = (value == null || value.isEmpty()) ? null : value;
+        if (this.value == null) {
             for (OsmPrimitive osm : objects) {
                 if(osm.get(key) != null) {
@@ -55 +56 @@
             for (OsmPrimitive osm : objects) {
                 String val = osm.get(key);
-                if (val == null || !value.equals(val)) {
+                if (val == null || !this.value.equals(val)) {
                     this.objects.add(osm);
                 }
@@ -63 +64 @@
 
     public ChangePropertyCommand(OsmPrimitive object, String key, String value) {
-        this.objects = new LinkedList<OsmPrimitive>();
-        this.key = key;
-        this.value = value;
-        String val = object.get(key);
-        if ((value == null && val != null)
-                || (value != null && (val == null || !value.equals(val)))) {
-            this.objects.add(object);
-        }
+        this(Arrays.asList(object), key, value);
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -1495 +1495 @@
         List<Command> cmds = new ArrayList<Command>();
         for (Tag tag: changedTags) {
-            if (!tag.getValue().isEmpty()) {
-                cmds.add(new ChangePropertyCommand(sel, tag.getKey(), tag.getValue()));
-            }
+            cmds.add(new ChangePropertyCommand(sel, tag.getKey(), tag.getValue()));
         }