diff options
7 files changed, 2 insertions, 16 deletions
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java index 9ae0380..3af06bf 100644 --- a/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java @@ -650,13 +650,13 @@ public class PhoneNumberUtil { // We assume that the first-group symbol will never be _before_ the national prefix. candidateNationalPrefixRule = candidateNationalPrefixRule.substring(0, candidateNationalPrefixRule.indexOf("$1")); - candidateNationalPrefixRule = util.normalizeDigitsOnly(candidateNationalPrefixRule); + candidateNationalPrefixRule = normalizeDigitsOnly(candidateNationalPrefixRule); if (candidateNationalPrefixRule.length() == 0) { // National Prefix not needed for this number. return true; } // Normalize the remainder. - String rawInputCopy = util.normalizeDigitsOnly(number.getRawInput()); + String rawInputCopy = normalizeDigitsOnly(number.getRawInput()); StringBuilder rawInput = new StringBuilder(rawInputCopy); // Check if we found a national prefix and/or carrier code at the start of the raw input, // and return the result. diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java index 2a23d7c..c67fa36 100644 --- a/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java +++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java @@ -17,7 +17,6 @@ package com.google.i18n.phonenumbers; import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; import java.util.regex.Pattern; diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java index 1e2ef45..1e2e8fe 100644 --- a/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java +++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java @@ -16,8 +16,6 @@ package com.google.i18n.phonenumbers; -import junit.framework.TestCase; - /** * Unit tests for AsYouTypeFormatter.java * diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java index 30a8fab..626d65a 100644 --- a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java +++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java @@ -19,8 +19,6 @@ package com.google.i18n.phonenumbers; import com.google.i18n.phonenumbers.PhoneNumberUtil.Leniency; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; -import junit.framework.TestCase; - import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java index fd15168..7c5837b 100644 --- a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java +++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java @@ -23,8 +23,6 @@ import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource; -import junit.framework.TestCase; - import java.util.ArrayList; import java.util.List; diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java index c6d2c74..682e872 100644 --- a/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java +++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java @@ -16,10 +16,6 @@ package com.google.i18n.phonenumbers; -import junit.framework.TestCase; - -import java.io.InputStream; - /** * Unit tests for ShortNumberUtil.java * diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java index 4577125..17131b4 100644 --- a/java/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java +++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java @@ -18,9 +18,6 @@ package com.google.i18n.phonenumbers; import junit.framework.TestCase; -import java.io.IOException; -import java.io.InputStream; - /** * Root class for PhoneNumberUtil tests that depend on the test metadata file. * <p> |