diff options
author | Andy Staudacher <staudacher@google.com> | 2015-02-11 13:54:21 +0100 |
---|---|---|
committer | Andy Staudacher <staudacher@google.com> | 2015-02-11 13:54:21 +0100 |
commit | b0d1cb1662daab3451e5fa59b8f073e9992b628b (patch) | |
tree | 05b9cec10b5088e7590941e06a182a529f976fe4 /libphonenumber/src/com/google/i18n | |
parent | cba5c4007938cbcdd46b0640af8a864f6fb89fa5 (diff) | |
download | libphonenumber-b0d1cb1662daab3451e5fa59b8f073e9992b628b.tar.gz |
Update libphonenumber to 7.0.2 (from 7.0.1).
See release_notes.txt for details.
Change-Id: I3788937ba2dab27376fe1b23e64f9dd8a7e81790
Signed-off-by: Andy Staudacher <staudacher@google.com>
Diffstat (limited to 'libphonenumber/src/com/google/i18n')
17 files changed, 7 insertions, 1 deletions
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java index 34e8d163..c74b21ab 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java @@ -347,7 +347,6 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> { */ private PhoneNumberMatch extractInnerMatch(String candidate, int offset) { for (Pattern possibleInnerMatch : INNER_MATCHES) { - int rangeStart = 0; Matcher groupMatcher = possibleInnerMatch.matcher(candidate); boolean isFirstMatch = true; while (groupMatcher.find() && maxTries > 0) { @@ -690,6 +689,7 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> { return true; } + @Override public boolean hasNext() { if (state == State.NOT_READY) { lastMatch = find(searchIndex); @@ -703,6 +703,7 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> { return state == State.READY; } + @Override public PhoneNumberMatch next() { // Check the state and find the next match as a side-effect if necessary. if (!hasNext()) { @@ -719,6 +720,7 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> { /** * Always throws {@link UnsupportedOperationException} as removal is not supported. */ + @Override public void remove() { throw new UnsupportedOperationException(); } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java index 418164a8..173461c1 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java @@ -58,6 +58,7 @@ import java.util.regex.Pattern; public class PhoneNumberUtil { // @VisibleForTesting static final MetadataLoader DEFAULT_METADATA_LOADER = new MetadataLoader() { + @Override public InputStream loadMetadata(String metadataFileName) { return PhoneNumberUtil.class.getResourceAsStream(metadataFileName); } @@ -487,6 +488,7 @@ public class PhoneNumberUtil { } return PhoneNumberMatcher.checkNumberGroupingIsValid( number, candidate, util, new PhoneNumberMatcher.NumberGroupingChecker() { + @Override public boolean checkGroups(PhoneNumberUtil util, PhoneNumber number, StringBuilder normalizedCandidate, String[] expectedNumberGroups) { @@ -518,6 +520,7 @@ public class PhoneNumberUtil { } return PhoneNumberMatcher.checkNumberGroupingIsValid( number, candidate, util, new PhoneNumberMatcher.NumberGroupingChecker() { + @Override public boolean checkGroups(PhoneNumberUtil util, PhoneNumber number, StringBuilder normalizedCandidate, String[] expectedNumberGroups) { @@ -2830,6 +2833,7 @@ public class PhoneNumberUtil { final long maxTries) { return new Iterable<PhoneNumberMatch>() { + @Override public Iterator<PhoneNumberMatch> iterator() { return new PhoneNumberMatcher( PhoneNumberUtil.this, text, defaultRegion, leniency, maxTries); diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD Binary files differindex 7b3a4f28..a101edcf 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH Binary files differindex d930cfc1..6d37f636 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH Binary files differindex f9a97fa7..7221d941 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH Binary files differindex cd8b59a0..b237efb6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN Binary files differindex 43fc271c..e67ad27e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM Binary files differindex 17200e0f..8a6be133 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU Binary files differindex fd878778..466bea59 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA Binary files differindex 333d0870..73e4eab0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY Binary files differindex 2e455305..b1deefa8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF Binary files differindex 615256de..d4f230ad 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG Binary files differindex 384af71e..862188eb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK Binary files differindex f569c5cd..729d06b7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB Binary files differindex 49974502..bfd2828e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT Binary files differindex 7d3b2e0e..5afe1cc1 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ Binary files differindex f9f553b7..2e95acf2 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ |