Bug fixes for code and metadata improvement. Also added new PAGER type support in the library.

java/release_notes.txt

@@ -1,3 +1,12 @@
+September 4th, 2010
+* Code improvement:
+  - Added new phone number type: pager
+* Metadata change:
+  - update to existing country: GG, IM, JE, RS, RU
+* Bug fixes:
+  - ArrayOutOfBoundException in AsYouTypeFormatter.getRememberedPosition()
+  - AsYouTypeFormatter for UK childline number
+
 September 1st, 2010
 * Bug fix on KZ metadata.
 
@@ -19,7 +28,6 @@ August 16th, 2010
   - update to existing countries: BF, FR, UK, PK, RE
 
 August 4th, 2010
-
 * Further improve startup performance
   - Preload no country specific metadata at startup.
   - Stop creating the file containing mapping from country calling code to region code
@@ -35,7 +43,6 @@ July 31th, 2010
   - Same change also applied to unittests
 
 July 30th, 2010
-
 * Metadata change:
   - new country: TL
   - update to existing country: AZ, CN, FR, GH, JO, LA, PG, PK, QA, SZ, UA, VN

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

@@ -213,6 +213,7 @@ public class BuildMetadataFromXml {
     metadata.setVoip(processPhoneNumberDescElement(generalDesc, element, "voip"));
     metadata.setPersonalNumber(processPhoneNumberDescElement(generalDesc, element,
                                                              "personalNumber"));
+    metadata.setPager(processPhoneNumberDescElement(generalDesc, element, "pager"));
 
     if (metadata.getMobile().getNationalNumberPattern().equals(
         metadata.getFixedLine().getNationalNumberPattern())) {

java/resources/com/google/i18n/phonenumbers/proto/phonemetadata.proto

@@ -117,6 +117,7 @@ message PhoneMetadata {
   required PhoneNumberDesc shared_cost = 6;
   required PhoneNumberDesc personal_number = 7;
   required PhoneNumberDesc voip = 8;
+  required PhoneNumberDesc pager = 21;
 
   // The ISO 3166-1 alpha-2 representation of a country/region
   required string id = 9;

java/resources/com/google/i18n/phonenumbers/src/PhoneNumberMetaData.xml

@@ -35,7 +35,7 @@
     <!ELEMENT phoneNumberMetadata (territories)>
     <!ELEMENT territories (territory+)>
     <!ELEMENT territory (availableFormats?, generalDesc?, fixedLine?, mobile?, tollFree?,
-        premiumRate?, sharedCost?, personalNumber?, voip?)>
+        premiumRate?, sharedCost?, personalNumber?, voip?, pager?)>
     <!ELEMENT generalDesc (nationalNumberPattern, possibleNumberPattern, exampleNumber?)>
     <!ELEMENT fixedLine (nationalNumberPattern?, possibleNumberPattern?, exampleNumber?)>
     <!ELEMENT mobile (nationalNumberPattern?, possibleNumberPattern?, exampleNumber?)>
@@ -44,6 +44,7 @@
     <!ELEMENT sharedCost (nationalNumberPattern?, possibleNumberPattern?, exampleNumber?)>
     <!ELEMENT personalNumber (nationalNumberPattern?, possibleNumberPattern?, exampleNumber?)>
     <!ELEMENT voip (nationalNumberPattern?, possibleNumberPattern?, exampleNumber?)>
+    <!ELEMENT pager (nationalNumberPattern?, possibleNumberPattern?, exampleNumber?)>
     <!ELEMENT availableFormats (numberFormat+, intlNumberFormat*)>
     <!ELEMENT nationalNumberPattern (#PCDATA)>
     <!ELEMENT possibleNumberPattern (#PCDATA)>
@@ -2659,13 +2660,16 @@
           <format>$1 $2</format>
         </numberFormat>
         <!-- UK child line -->
-        <numberFormat pattern="(800)(1111)">
+        <numberFormat pattern="(800)(\d{4})">
           <leadingDigits>800</leadingDigits>
           <leadingDigits>8001</leadingDigits>
+          <leadingDigits>80011</leadingDigits>
+          <leadingDigits>800111</leadingDigits>
+          <leadingDigits>8001111</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(8\d{2})(\d{3})(\d{3,4})">
-          <leadingDigits>8(?:0|4[3-5]|7[01])</leadingDigits>
+          <leadingDigits>8(?:0|4[3-5]|7[0-3])</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
       </availableFormats>
@@ -2818,7 +2822,7 @@
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>1481\d{6}</nationalNumberPattern>
-        <exampleNumber>1481123456</exampleNumber>
+        <exampleNumber>1481223456</exampleNumber>
       </fixedLine>
       <mobile>
         <nationalNumberPattern>7(?:781|839|911)\d{6}</nationalNumberPattern>
@@ -2829,7 +2833,7 @@
       <tollFree>
         <nationalNumberPattern>80(?:01111|\d{7,8})|500\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
-        <exampleNumber>8012345678</exampleNumber>
+        <exampleNumber>8001234567</exampleNumber>
       </tollFree>
       <premiumRate>
         <nationalNumberPattern>(?:9[018]\d|87[1-3])\d{7}</nationalNumberPattern>
@@ -3585,7 +3589,7 @@
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>1624\d{6}</nationalNumberPattern>
-        <exampleNumber>1624123456</exampleNumber>
+        <exampleNumber>1624223456</exampleNumber>
       </fixedLine>
       <mobile>
         <nationalNumberPattern>7[69]24\d{6}</nationalNumberPattern>
@@ -3595,7 +3599,7 @@
       <tollFree>
         <nationalNumberPattern>80(?:01111|\d{7,8})|500\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
-        <exampleNumber>8012345678</exampleNumber>
+        <exampleNumber>8001234567</exampleNumber>
       </tollFree>
       <premiumRate>
         <nationalNumberPattern>(?:9[018]\d|87[1-3])\d{7}</nationalNumberPattern>
@@ -3941,7 +3945,7 @@
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>1534\d{6}</nationalNumberPattern>
-        <exampleNumber>1534123456</exampleNumber>
+        <exampleNumber>1534223456</exampleNumber>
       </fixedLine>
       <mobile>
         <nationalNumberPattern>7(?:7(?:00|97)|829|937)\d{6}</nationalNumberPattern>
@@ -3952,7 +3956,7 @@
       <tollFree>
         <nationalNumberPattern>80(?:01111|\d{7,8})|500\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
-        <exampleNumber>8012345678</exampleNumber>
+        <exampleNumber>8001234567</exampleNumber>
       </tollFree>
       <premiumRate>
         <nationalNumberPattern>(?:9[018]\d|87[1-3])\d{7}</nationalNumberPattern>
@@ -6575,7 +6579,7 @@
           <leadingDigits>6</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
-        <numberFormat pattern="([89]0\d)(\d{3,6})">
+        <numberFormat pattern="([89]\d{2})(\d{3,6})">
           <leadingDigits>[89]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -6617,11 +6621,11 @@
         as http://www.minjust.ru/ru/structure/contact/. Contains formatting
         instructions for Kazakhstan as well. -->
         <numberFormat pattern="([34689]\d{2})(\d{3})(\d{2})(\d{2})">
-          <leadingDigits>[34689]</leadingDigits>
+          <leadingDigits>[3489]</leadingDigits>
           <format>$1 $2-$3-$4</format>
         </numberFormat>
-        <numberFormat pattern="([7]\d{2})(\d{3})(\d{4})">
-          <leadingDigits>7</leadingDigits>
+        <numberFormat pattern="([67]\d{2})(\d{3})(\d{4})">
+          <leadingDigits>[67]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
       </availableFormats>

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

@@ -324,7 +324,9 @@ public class AsYouTypeFormatter {
       return originalPosition;
     }
     int accruedInputIndex = 0, currentOutputIndex = 0;
-    while (accruedInputIndex < positionToRemember) {
+    int currentOutputLength = currentOutput.length();
+    
+    while (accruedInputIndex < positionToRemember && currentOutputIndex < currentOutputLength) {
       if (accruedInputWithoutFormatting.charAt(accruedInputIndex) ==
           currentOutput.charAt(currentOutputIndex)) {
         accruedInputIndex++;

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

@@ -324,6 +324,7 @@ public class PhoneNumberUtil {
     // MOBILE or FIXED_LINE number. Some more information can be found here:
     // http://en.wikipedia.org/wiki/Personal_Numbers
     PERSONAL_NUMBER,
+    PAGER,
     // A phone number is of type UNKNOWN when it does not fit any of the known patterns for a
     // specific country.
     UNKNOWN
@@ -495,7 +496,7 @@ public class PhoneNumberUtil {
    * be used:
    *
    * PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
-   * PhoneNumber number = phoneUtil.parse("16502530000", RegionCode.US);
+   * PhoneNumber number = phoneUtil.parse("16502530000", "US");
    * String nationalSignificantNumber = PhoneNumberUtil.getNationalSignificantNumber(number);
    * String areaCode;
    * String subscriberNumber;
@@ -1066,6 +1067,8 @@ public class PhoneNumberUtil {
         return metadata.getVoip();
       case PERSONAL_NUMBER:
         return metadata.getPersonalNumber();
+      case PAGER:
+        return metadata.getPager();
       default:
         return metadata.getGeneralDesc();
     }
@@ -1108,6 +1111,9 @@ public class PhoneNumberUtil {
     if (isNumberMatchingDesc(nationalNumber, metadata.getPersonalNumber())) {
       return PhoneNumberType.PERSONAL_NUMBER;
     }
+    if (isNumberMatchingDesc(nationalNumber, metadata.getPager())) {
+      return PhoneNumberType.PAGER;
+    }
 
     boolean isFixedLine = isNumberMatchingDesc(nationalNumber, metadata.getFixedLine());
     if (isFixedLine) {

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

@@ -360,6 +360,20 @@ public final class Phonemetadata {
       return this;
     }
 
+    // required PhoneNumberDesc pager = 21;
+    private boolean hasPager;
+    private PhoneNumberDesc pager_ = null;
+    public boolean hasPager() { return hasPager; }
+    public PhoneNumberDesc getPager() { return pager_; }
+    public PhoneMetadata setPager(PhoneNumberDesc value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      hasPager = true;
+      pager_ = value;
+      return this;
+    }
+
     // required string id = 9;
     private boolean hasId;
     private String id_ = "";
@@ -550,6 +564,10 @@ public final class Phonemetadata {
       if (hasVoip) {
         voip_.writeExternal(objectOutput);
       }
+      objectOutput.writeBoolean(hasPager);
+      if (hasPager) {
+        pager_.writeExternal(objectOutput);
+      }
 
       objectOutput.writeUTF(id_);
       objectOutput.writeInt(countryCode_);
@@ -651,6 +669,12 @@ public final class Phonemetadata {
         desc.readExternal(objectInput);
         setVoip(desc);
       }
+      hasDesc = objectInput.readBoolean();
+      if (hasDesc) {
+        PhoneNumberDesc desc = new PhoneNumberDesc();
+        desc.readExternal(objectInput);
+        setPager(desc);
+      }
 
       setId(objectInput.readUTF());
       setCountryCode(objectInput.readInt());