Update phone number metadata and reorganize reg-exes for readability.

java/release_notes.txt

@@ -1,3 +1,10 @@
+November 25th, 2010
+* Metadata changes:
+  - Updates to existing countries: AD, AG, AI, AN, AS, BB, BG, BM, BS, BW, CA, DM, DO, GD, GH, GM,
+    GU, IN, JM, KN, KY, KZ, LB, LC, MP, MS, PR, SY, TC, TT, TZ, US, VC, VG, VI.
+  - Reorganize reg-exes for better readability.
+  - Updated comments.
+
 October 22nd, 2010
 * Metadata changes:
   - Updates to existing countries: AE, GB, GG, IM, JE
@@ -5,7 +12,8 @@ October 22nd, 2010
 October 15th, 2010
 * Code improvements:
   - Allowed parsing of numbers that start with "++" or a full-width "+" symbol
-  - Allowed reg-exs for national and possible number patterns to have white space in them in the source XML file
+  - Allowed reg-exes for national and possible number patterns to have white space in them in the
+    source XML file
   - Added a more useful toString method for the phone number proto class
 * Metadata changes:
   - Updates to existing countries: AF, BF, BO, ES, GB, GG, IM, IS, JE, JE, JP, KR, PE, PT, RU, SE,

java/resources/com/google/i18n/phonenumbers/BuildMetadataFromXml.java

@@ -237,7 +237,7 @@ public class BuildMetadataFromXml {
     if (numOfLeadingDigitsPatterns > 0) {
       for (int i = 0; i < numOfLeadingDigitsPatterns; i++) {
         format.addLeadingDigitsPattern(
-            validateRE((leadingDigitsPatternNodes.item(i)).getFirstChild().getNodeValue()));
+            validateRE((leadingDigitsPatternNodes.item(i)).getFirstChild().getNodeValue(), true));
       }
     }
   }

java/resources/com/google/i18n/phonenumbers/JSArrayBuilder.java

@@ -121,15 +121,15 @@ public class JSArrayBuilder implements CharSequence {
     }
   }
 
-  @Override public char charAt(int index) {
+  public char charAt(int index) {
     return data.charAt(index);
   }
 
-  @Override public int length() {
+  public int length() {
     return data.length();
   }
 
-  @Override public CharSequence subSequence(int start, int end) {
+  public CharSequence subSequence(int start, int end) {
     return data.subSequence(start, end);
   }
 }

java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java

@@ -483,8 +483,8 @@ public class PhoneNumberUtil {
 
   /**
    * Converts all alpha characters in a number to their respective digits on a keypad, but retains
-   * existing formatting. Also converts wide-ascii digits to normal ascii digits, and converts
-   * Arabic-Indic numerals to European numerals.
+   * existing formatting. This Java implementation of this function also converts wide-ascii digits
+   * to normal ascii digits, and converts Arabic-Indic numerals to European numerals.
    */
   public static String convertAlphaCharactersInNumber(String number) {
     return normalizeHelper(number, ALL_NORMALIZATION_MAPPINGS, false);
@@ -1398,15 +1398,14 @@ public class PhoneNumberUtil {
    *
    * @param number  the number that needs to be checked, in the form of a string
    * @param countryDialingFrom  the ISO 3166-1 two-letter country code that denotes
-   *            the country that we are expecting the number to be dialed from.
-   *            Note this is different from the country where the number belongs.
-   *            For example, the number +1 650 253 0000 is a number that belongs to US.
-   *            When written in this form, it could be dialed from any country.
-   *            When it is written as 00 1 650 253 0000, it could be dialed from
-   *            any country which has international prefix 00. When it is written as
-   *            650 253 0000, it could only be dialed from US, and when written as
-   *            253 0000, it could only be dialed from US (Mountain View, CA, to be
-   *            more specific).
+   *     the country that we are expecting the number to be dialed from.
+   *     Note this is different from the country where the number belongs. For example, the number
+   *     +1 650 253 0000 is a number that belongs to US. When written in this form, it could be
+   *     dialed from any country. When it is written as 00 1 650 253 0000, it could be dialed from
+   *     any country which uses an international dialling prefix of 00. When it is written as 650
+   *     253 0000, it could only be dialed from within the US, and when written as 253 0000, it
+   *     could only be dialed from within a smaller area in the US (Mountain View, CA, to be more
+   *     specific).
    * @return  true if the number is possible
    */
   public boolean isPossibleNumber(String number, String countryDialingFrom) {