Changeset 24227 in osm

Timestamp:

2010-11-14T18:53:18+01:00 (14 years ago)

Author:

oliverw

Message:

PostCode -> PostalCode

Location:

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

Files:

• OSMAddress.java (modified) (7 diffs)
• PostalCodeChecker.java (modified) (1 diff)
• gui/IncompleteAddressesTableModel.java (modified) (2 diffs)
• gui/UnresolvedAddressesTableModel.java (modified) (2 diffs)

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

@@ -65 +65 @@
                 boolean isComplete =    hasCity() && 
                                                                 hasHouseNumber() &&
-                                                                (hasPostCode() && PostalCodeChecker.hasValidPostalCode(this)) && 
+                                                                (hasPostalCode() && PostalCodeChecker.hasValidPostalCode(this)) && 
                                                                 hasCity() && 
                                                                 hasStreetName();
@@ -151 +151 @@
          * @return the guessedPostCode
          */
-        public String getGuessedPostCode() {
+        public String getGuessedPostalCode() {
                 return getGuessedValue(TagUtils.ADDR_POSTCODE_TAG);
         }
@@ -161 +161 @@
          * @param srcObj srcObj the source object of the guess
          */
-        public void setGuessedPostCode(String guessedPostCode, OsmPrimitive srcObj) {
+        public void setGuessedPostalCode(String guessedPostCode, OsmPrimitive srcObj) {
                 setGuessedValue(TagUtils.ADDR_POSTCODE_TAG, guessedPostCode, srcObj);
         }
@@ -170 +170 @@
          * @return true, if this instance has a guessed post code.
          */
-        public boolean hasGuessedPostCode() {
+        public boolean hasGuessedPostalCode() {
                 return hasGuessedValue(TagUtils.ADDR_POSTCODE_TAG);
         }
@@ -228 +228 @@
          * @return
          */
-        public String getPostCode() {
+        public String getPostalCode() {
                 String pc = getTagValueWithGuess(TagUtils.ADDR_POSTCODE_TAG);
                 
@@ -252 +252 @@
          * @return true, if successful
          */
-        public boolean hasPostCode() {
+        public boolean hasPostalCode() {
                 return hasTag(TagUtils.ADDR_POSTCODE_TAG);
         }
@@ -645 +645 @@
                                 node.getHouseNumber(),
                                 node.getCountry(),
-                                node.getPostCode(),
+                                node.getPostalCode(),
                                 node.getCity(),
                                 node.getState());

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

@@ -39 +39 @@
                 CheckParameterUtil.ensureParameterNotNull(address, "address");
                 
-                if (address.hasPostCode()) {
+                if (address.hasPostalCode()) {
                         return false; // no postal code available
                 }
                 
                 String ctry = getCountry(address);
-                String postalCode = address.getPostCode();
+                String postalCode = address.getPostalCode();
                 
                 return hasValidPostalCode(ctry, postalCode);

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

@@ -88 +88 @@
                         return aNode.getCity();
                 case 2:
-                        return aNode.getPostCode();
+                        return aNode.getPostalCode();
                 case 3:
                         return aNode.getStreetName();                   
@@ -180 +180 @@
                                 break;
                         case 2:
-                                cc=arg0.getPostCode().compareTo(arg1.getPostCode());
+                                cc=arg0.getPostalCode().compareTo(arg1.getPostalCode());
                                 break;
                         case 3:

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

@@ -121 +121 @@
                         return aNode.getCity();
                 case 3:
-                        return aNode.getPostCode();
+                        return aNode.getPostalCode();
                 case 4:
                         return aNode.getName();
@@ -225 +225 @@
                                 break;
                         case 3:
-                                cc = arg0.getPostCode().compareTo(arg1.getPostCode());
+                                cc = arg0.getPostalCode().compareTo(arg1.getPostalCode());
                                 break;
                         case 4: