Changeset 5143 in josm for trunk/src

Timestamp:

2012-03-31T17:04:08+02:00 (12 years ago)

Author:

xeen

Message:

fix #7504 -- Remove superfluous check

File:

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

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

@@ -114 +114 @@
 
             for (OsmPrimitive osm : objects) {
-                boolean modified = false;
-
-                 // loop over all tags
+                // loop over all tags
                 for (Map.Entry<String, String> tag : this.tags.entrySet()) {
                     String oldVal = osm.get(tag.getKey());
@@ -122 +120 @@
 
                     if (newVal == null || newVal.isEmpty()) {
-                        if (oldVal != null) {
+                        if (oldVal != null)
                             osm.remove(tag.getKey());
-                            modified = true;
-                        }
                     }
                     else if (oldVal == null || !newVal.equals(oldVal))
                         osm.put(tag.getKey(), newVal);
-                        modified = true;
-                }
-                if (modified)
-                    osm.setModified(true);
+                }
+                // init() only keeps modified primitives. Therefore the modified
+                // bit can be set without further checks.
+                osm.setModified(true);
             }
             return true;