Changeset 24014 in osm for applications/editors

Timestamp:

2010-11-02T12:04:32+01:00 (14 years ago)

Author:

oliverw

Message:

Renamed getStreet -> getStreetName.

Location:

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses

Files:

• AddressEditContainer.java (modified) (1 diff)
• AddressNode.java (modified) (4 diffs)
• gui/IncompleteAddressesTableModel.java (modified) (1 diff)
• gui/UnresolvedAddressesTableModel.java (modified) (1 diff)

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java

@@ -432 +432 @@
          */
         private boolean assignAddressToStreet(AddressNode aNode) {
-                String streetName = aNode.getStreet();
+                String streetName = aNode.getStreetName();
                 
                 if (streetName != null && shadowStreetDict.containsKey(streetName)) {

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressNode.java

@@ -47 +47 @@
          * @return
          */
-        public String getStreet() {
+        public String getStreetName() {
                 if (osmObject == null) return MISSING_TAG;
                 /*
@@ -202 +202 @@
                                 cc = this.getCity().compareTo(other.getCity());                         
                                 if (cc  == 0) {
-                                        cc = this.getStreet().compareTo(other.getStreet());                                     
+                                        cc = this.getStreetName().compareTo(other.getStreetName());                                     
                                         if (cc  == 0) {
                                                 if (hasGuessedStreetName()) {                                                   
                                                         if (other.hasStreetName()) {
                                                                 // Compare guessed name with the real name
-                                                                cc = this.getGuessedStreetName().compareTo(other.getStreet());
+                                                                cc = this.getGuessedStreetName().compareTo(other.getStreetName());
                                                                 if (cc == 0) {
                                                                         cc = this.getHouseNumber().compareTo(other.getHouseNumber());
@@ -237 +237 @@
                 if (node == null || !node.hasName()) return;
                 
-                if (!node.getName().equals(getStreet())) {
+                if (!node.getName().equals(getStreetName())) {
                         setStreetName(node.getName());                  
                         node.addAddress(this);
@@ -304 +304 @@
                 // DE
                 String guessed = node.getGuessedStreetName();
-                String sName = node.getStreet();
+                String sName = node.getStreetName();
                 if (!StringUtils.isNullOrEmpty(guessed) && MISSING_TAG.equals(sName)) {
                         sName = String.format("(%s)", guessed);

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java

@@ -77 +77 @@
                 case 4:
                         if (!StringUtils.isNullOrEmpty(aNode.getGuessedStreetName()) && 
-                                        AddressNode.MISSING_TAG.equals(aNode.getStreet())) {
+                                        AddressNode.MISSING_TAG.equals(aNode.getStreetName())) {
                                 
                                 return "(" + aNode.getGuessedStreetName() + ")";
                         } else {
-                                return aNode.getStreet();
+                                return aNode.getStreetName();
                         }
                 default:

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java

@@ -103 +103 @@
                 case 0:
                         String guessed = aNode.getGuessedStreetName();
-                        String cur = aNode.getStreet();
+                        String cur = aNode.getStreetName();
                         if (aNode.hasGuessedStreetName() && AddressNode.MISSING_TAG.equals(cur)) {                              
                                 return "*" + guessed;
                         } else {
-                                return aNode.getStreet();
+                                return aNode.getStreetName();
                         }
                 case 1: