Browse Source

Remove trailing white spaces.

pull/567/head
Shaopeng Jia 16 years ago
committed by Mihaela Rosca
parent
commit
9d26d810ee
4 changed files with 5 additions and 5 deletions
  1. +1
    -1
      java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
  2. +1
    -1
      java/src/com/google/i18n/phonenumbers/Phonemetadata.java
  3. +2
    -2
      java/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
  4. +1
    -1
      java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java

+ 1
- 1
java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java View File

@ -204,7 +204,7 @@ public class AsYouTypeFormatter {
nationalNumber.setLength(0); nationalNumber.setLength(0);
ableToFormat = true; ableToFormat = true;
positionToRemember = 0; positionToRemember = 0;
originalPosition = 0;
originalPosition = 0;
isInternationalFormatting = false; isInternationalFormatting = false;
isExpectingCountryCode = false; isExpectingCountryCode = false;
possibleFormats.clear(); possibleFormats.clear();


+ 1
- 1
java/src/com/google/i18n/phonenumbers/Phonemetadata.java View File

@ -86,7 +86,7 @@ public final class Phonemetadata {
hasNationalPrefixFormattingRule = false; hasNationalPrefixFormattingRule = false;
nationalPrefixFormattingRule_ = ""; nationalPrefixFormattingRule_ = "";
return this; return this;
}
}
// optional string domestic_carrier_code_formatting_rule = 5; // optional string domestic_carrier_code_formatting_rule = 5;
private boolean hasDomesticCarrierCodeFormattingRule; private boolean hasDomesticCarrierCodeFormattingRule;


+ 2
- 2
java/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java View File

@ -35,7 +35,7 @@ public class AsYouTypeFormatterTest extends TestCase {
"/com/google/i18n/phonenumbers/PhoneNumberMetadataProtoForTesting"; "/com/google/i18n/phonenumbers/PhoneNumberMetadataProtoForTesting";
public AsYouTypeFormatterTest() { public AsYouTypeFormatterTest() {
PhoneNumberUtil.resetInstance();
PhoneNumberUtil.resetInstance();
InputStream in = PhoneNumberUtilTest.class.getResourceAsStream(TEST_META_DATA_FILE); InputStream in = PhoneNumberUtilTest.class.getResourceAsStream(TEST_META_DATA_FILE);
phoneUtil = PhoneNumberUtil.getInstance(in); phoneUtil = PhoneNumberUtil.getInstance(in);
} }
@ -174,7 +174,7 @@ public class AsYouTypeFormatterTest extends TestCase {
} }
public void testAYTFAndRememberPositionUS() { public void testAYTFAndRememberPositionUS() {
AsYouTypeFormatter formatter = phoneUtil.getAsYouTypeFormatter("US");
AsYouTypeFormatter formatter = phoneUtil.getAsYouTypeFormatter("US");
assertEquals("1", formatter.inputDigitAndRememberPosition('1')); assertEquals("1", formatter.inputDigitAndRememberPosition('1'));
assertEquals(1, formatter.getRememberedPosition()); assertEquals(1, formatter.getRememberedPosition());
assertEquals("16", formatter.inputDigit('6')); assertEquals("16", formatter.inputDigit('6'));


+ 1
- 1
java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java View File

@ -338,7 +338,7 @@ public class PhoneNumberUtilTest extends TestCase {
assertEquals("+49 8021 2345", assertEquals("+49 8021 2345",
phoneUtil.format(deNumber, phoneUtil.format(deNumber,
PhoneNumberUtil.PhoneNumberFormat.INTERNATIONAL)); PhoneNumberUtil.PhoneNumberFormat.INTERNATIONAL));
deNumber.clear();
deNumber.clear();
deNumber.setCountryCode(49).setNationalNumber(1234L); deNumber.setCountryCode(49).setNationalNumber(1234L);
// Note this number is correctly formatted without national prefix. Most of the numbers that // Note this number is correctly formatted without national prefix. Most of the numbers that
// are treated as invalid numbers by the library are short numbers, and they are usually not // are treated as invalid numbers by the library are short numbers, and they are usually not


Loading…
Cancel
Save