Changeset 23846 in osm for applications/editors/josm

Timestamp:

2010-10-26T17:52:56+02:00 (14 years ago)

Author:

oliverw

Message:

Move changeAddressValue to base class.

Location:

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit

Files:

• AddressNode.java (modified) (4 diffs)
• NodeEntityBase.java (modified) (2 diffs)

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

@@ -152 +152 @@
                 if (streetName != null && streetName.length() == 0) return;
                 
-                changeAddressValue(TagUtils.ADDR_STREET_TAG, streetName);
+                setOSMTag(TagUtils.ADDR_STREET_TAG, streetName);
         }
 
@@ -163 +163 @@
                 if (state != null && state.length() == 0) return;
                 
-                changeAddressValue(TagUtils.ADDR_STATE_TAG, state);
+                setOSMTag(TagUtils.ADDR_STATE_TAG, state);
         }
         
@@ -173 +173 @@
                 if (country != null && country.length() == 0) return;
                 
-                changeAddressValue(TagUtils.ADDR_COUNTRY_TAG, country);
+                setOSMTag(TagUtils.ADDR_COUNTRY_TAG, country);
         }
         
@@ -183 +183 @@
                 if (postCode != null && postCode.length() == 0) return;
                 
-                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));
-        }
-
-
+                setOSMTag(TagUtils.ADDR_POSTCODE_TAG, postCode);
+        }
+        
         @Override
         public String toString() {

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

@@ -19 +19 @@
 import java.util.List;
 
+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;
 
@@ -89 +92 @@
                 return TagUtils.hasNameTag(osmObject);
         }
+        
+        /**
+         * 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.
+         */
+        protected void setOSMTag(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));
+        }
 
         /* (non-Javadoc)