diff options
Diffstat (limited to 'libphonenumber/src/com/google/i18n/phonenumbers/internal')
-rw-r--r-- | libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java | 2 | ||||
-rw-r--r-- | libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java b/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java index ac201366..38319cbb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java @@ -16,7 +16,7 @@ package com.google.i18n.phonenumbers.internal; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; /** * Internal phonenumber matching API used to isolate the underlying implementation of the diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java b/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java index b1e7a23f..125a1822 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java @@ -16,8 +16,8 @@ package com.google.i18n.phonenumbers.internal; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; import com.google.i18n.phonenumbers.RegexCache; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; import java.util.regex.Matcher; @@ -38,7 +38,7 @@ public final class RegexBasedMatcher implements MatcherApi { public boolean matchesNationalNumber(String nationalNumber, PhoneNumberDesc numberDesc, boolean allowPrefixMatch) { Matcher nationalNumberPatternMatcher = regexCache.getPatternForRegex( - numberDesc.nationalNumberPattern).matcher(nationalNumber); + numberDesc.getNationalNumberPattern()).matcher(nationalNumber); return nationalNumberPatternMatcher.matches() || (allowPrefixMatch && nationalNumberPatternMatcher.lookingAt()); } @@ -46,7 +46,7 @@ public final class RegexBasedMatcher implements MatcherApi { // @Override public boolean matchesPossibleNumber(String nationalNumber, PhoneNumberDesc numberDesc) { Matcher possibleNumberPatternMatcher = regexCache.getPatternForRegex( - numberDesc.possibleNumberPattern).matcher(nationalNumber); + numberDesc.getPossibleNumberPattern()).matcher(nationalNumber); return possibleNumberPatternMatcher.matches(); } } |