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

Timestamp:

2008-07-05T14:12:34+02:00 (17 years ago)

Author:

stoecker

Message:

finished XML based translations of presets fixes #960
correct bounding box illegal access fixes #1044
do no longer modify objects when unnessesary (can result in 0 objects
modified in Undo :-)
correct typo fixes #730
some I18N corrections

File:

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

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

@@ -41 +41 @@
         
         public ChangePropertyCommand(Collection<OsmPrimitive> objects, String key, String value) {
-                this.objects = new LinkedList<OsmPrimitive>(objects);
+                this.objects = new LinkedList<OsmPrimitive>();
                 this.key = key;
                 this.value = value;
+                if (value == null) {
+                        for (OsmPrimitive osm : objects) {
+                                if(osm.get(key) != null)
+                                        this.objects.add(osm);
+                        }
+                } else {
+                        for (OsmPrimitive osm : objects) {
+                                String val = osm.get(key);
+                                if(val == null || !value.equals(val))
+                                {
+                                        this.objects.add(osm);
+                                }
+                        }
+                }
         }
 
         public ChangePropertyCommand(OsmPrimitive object, String key, String value) {
-                this.objects = new LinkedList<OsmPrimitive>(Collections.singleton(object));
+                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);
         }