diff options
author | Narayan Kamath <narayan@google.com> | 2015-12-10 18:10:03 +0000 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2015-12-10 18:10:03 +0000 |
commit | f8e6609c7ee7dd2a0f515a65ceb995e80f7731ee (patch) | |
tree | 9438552aece29c04ab731436eaae545eb14fff96 /libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java | |
parent | 8fda25a631103958dd4e335fa1149913d0552e0a (diff) | |
download | libphonenumber-f8e6609c7ee7dd2a0f515a65ceb995e80f7731ee.tar.gz |
Revert "Upgrade to version 7.2.1"
This reverts commit 8fda25a631103958dd4e335fa1149913d0552e0a.
Change-Id: Id96b831dc6dd5508b90d597e0bb78d02c39f0203
Diffstat (limited to 'libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java')
-rw-r--r-- | libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java index a9d918f2..c74b21ab 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java @@ -19,10 +19,10 @@ package com.google.i18n.phonenumbers; import com.google.i18n.phonenumbers.PhoneNumberUtil.Leniency; import com.google.i18n.phonenumbers.PhoneNumberUtil.MatchType; import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; -import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; +import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource; -import com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import java.lang.Character.UnicodeBlock; import java.util.Iterator; @@ -585,7 +585,7 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> { PhoneMetadata alternateFormats = MetadataManager.getAlternateFormatsForCountry(number.getCountryCode()); if (alternateFormats != null) { - for (NumberFormat alternateFormat : alternateFormats.numberFormat) { + for (NumberFormat alternateFormat : alternateFormats.numberFormats()) { formattedNumberGroups = getNationalNumberGroups(util, number, alternateFormat); if (checker.checkGroups(util, number, normalizedCandidate, formattedNumberGroups)) { return true; @@ -665,17 +665,17 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> { // Check if a national prefix should be present when formatting this number. String nationalNumber = util.getNationalSignificantNumber(number); NumberFormat formatRule = - util.chooseFormattingPatternForNumber(metadata.numberFormat, nationalNumber); + util.chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber); // To do this, we check that a national prefix formatting rule was present and that it wasn't // just the first-group symbol ($1) with punctuation. - if ((formatRule != null) && formatRule.nationalPrefixFormattingRule.length() > 0) { - if (formatRule.nationalPrefixOptionalWhenFormatting) { + if ((formatRule != null) && formatRule.getNationalPrefixFormattingRule().length() > 0) { + if (formatRule.isNationalPrefixOptionalWhenFormatting()) { // The national-prefix is optional in these cases, so we don't need to check if it was // present. return true; } if (PhoneNumberUtil.formattingRuleHasFirstGroupOnly( - formatRule.nationalPrefixFormattingRule)) { + formatRule.getNationalPrefixFormattingRule())) { // National Prefix not needed for this number. return true; } |