Changeset 23837 in osm for applications/editors

Timestamp:

2010-10-26T01:12:25+02:00 (14 years ago)

Author:

oliverw

Message:

Put changes in undo/redo queue.

File:

• applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressNode.java (modified) (5 diffs)

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressNode.java

@@ -14 +14 @@
 package org.openstreetmap.josm.plugins.addressEdit;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
@@ -149 +152 @@
                 if (streetName != null && streetName.length() == 0) return;
                 
-                this.osmObject.put(TagUtils.ADDR_STREET_TAG, streetName);
-                this.osmObject.setModified(true);
-        }
+                changeAddressValue(TagUtils.ADDR_STREET_TAG, streetName);
+        }
+
         
         /**
@@ -160 +163 @@
                 if (state != null && state.length() == 0) return;
                 
-                this.osmObject.put(TagUtils.ADDR_STATE_TAG, state);
-                this.osmObject.setModified(true);
+                changeAddressValue(TagUtils.ADDR_STATE_TAG, state);
         }
         
@@ -171 +173 @@
                 if (country != null && country.length() == 0) return;
                 
-                this.osmObject.put(TagUtils.ADDR_COUNTRY_TAG, country);
-                this.osmObject.setModified(true);
+                changeAddressValue(TagUtils.ADDR_COUNTRY_TAG, country);
         }
         
@@ -182 +183 @@
                 if (postCode != null && postCode.length() == 0) return;
                 
-                this.osmObject.put(TagUtils.ADDR_POSTCODE_TAG, postCode);
-                this.osmObject.setModified(true);
-        }
+                changeAddressValue(TagUtils.ADDR_POSTCODE_TAG, postCode);
+        }
+        
+        /**
+         * Internal helper method which changes the given property and
+         * puts the appropriate command {@link src.org.openstreetmap.josm.command.Command}
+         * into the undo/redo queue.
+         * @param tag The tag to change.
+         * @param newValue The new value for the tag.
+         */
+        private void changeAddressValue(String tag, String newValue) {
+                Node oldNode = (Node)osmObject;
+                OsmPrimitive newNode = new Node(oldNode);
+                newNode.put(tag, newValue);
+                Main.main.undoRedo.add( new ChangeCommand(oldNode, newNode));
+        }
+
 
         @Override