1 files changed, 6 insertions, 6 deletions
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
index a0d9957b..c9a1f5c3 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
@@ -62,7 +62,7 @@ public class AsYouTypeFormatter {
   // code, from the national number.
   private static final char SEPARATOR_BEFORE_NATIONAL_NUMBER = ' ';
   private static final PhoneMetadata EMPTY_METADATA =
-      new PhoneMetadata().setInternationalPrefix("NA");
+      PhoneMetadata.newBuilder().setId("<ignored>").setInternationalPrefix("NA").build();
   private PhoneMetadata defaultMetadata;
   private PhoneMetadata currentMetadata;
 
@@ -166,9 +166,9 @@ public class AsYouTypeFormatter {
     // First decide whether we should use international or national number rules.
     boolean isInternationalNumber = isCompleteNumber && extractedNationalPrefix.length() == 0;
     List<NumberFormat> formatList =
-        (isInternationalNumber && currentMetadata.intlNumberFormatSize() > 0)
-            ? currentMetadata.intlNumberFormats()
-            : currentMetadata.numberFormats();
+        (isInternationalNumber && currentMetadata.getIntlNumberFormatCount() > 0)
+            ? currentMetadata.getIntlNumberFormatList()
+            : currentMetadata.getNumberFormatList();
     for (NumberFormat format : formatList) {
       // Discard a few formats that we know are not relevant based on the presence of the national
       // prefix.
@@ -203,12 +203,12 @@ public class AsYouTypeFormatter {
     Iterator<NumberFormat> it = possibleFormats.iterator();
     while (it.hasNext()) {
       NumberFormat format = it.next();
-      if (format.leadingDigitsPatternSize() == 0) {
+      if (format.getLeadingDigitsPatternCount() == 0) {
         // Keep everything that isn't restricted by leading digits.
         continue;
       }
       int lastLeadingDigitsPattern =
-          Math.min(indexOfLeadingDigitsPattern, format.leadingDigitsPatternSize() - 1);
+          Math.min(indexOfLeadingDigitsPattern, format.getLeadingDigitsPatternCount() - 1);
       Pattern leadingDigitsPattern = regexCache.getPatternForRegex(
           format.getLeadingDigitsPattern(lastLeadingDigitsPattern));
       Matcher m = leadingDigitsPattern.matcher(leadingDigits);