From d01a8c3f67b07847537cf77307d488c029e0c5f1 Mon Sep 17 00:00:00 2001 From: Shaopeng Jia Date: Mon, 7 Jun 2010 09:38:59 +0000 Subject: [PATCH] Stops PhoneNumber from implementing Serializable and make it non-final. --- java/src/com/google/i18n/phonenumbers/Phonemetadata.java | 4 ++-- java/src/com/google/i18n/phonenumbers/Phonenumber.java | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/java/src/com/google/i18n/phonenumbers/Phonemetadata.java b/java/src/com/google/i18n/phonenumbers/Phonemetadata.java index 7bbdc2d8d..f7715c126 100644 --- a/java/src/com/google/i18n/phonenumbers/Phonemetadata.java +++ b/java/src/com/google/i18n/phonenumbers/Phonemetadata.java @@ -172,7 +172,7 @@ public final class Phonemetadata { objectOutput.writeBoolean(hasExampleNumber); if (hasExampleNumber) { objectOutput.writeUTF(exampleNumber_); - } + } } public void readExternal(ObjectInput objectInput) throws IOException, ClassNotFoundException { @@ -503,7 +503,7 @@ public final class Phonemetadata { if (hasNationalPrefixTransformRule) { objectOutput.writeUTF(nationalPrefixTransformRule_); } - + objectOutput.writeBoolean(sameMobileAndFixedLinePattern_); int numberFormatSize = getNumberFormatCount(); diff --git a/java/src/com/google/i18n/phonenumbers/Phonenumber.java b/java/src/com/google/i18n/phonenumbers/Phonenumber.java index c093eb11f..82dec43fb 100644 --- a/java/src/com/google/i18n/phonenumbers/Phonenumber.java +++ b/java/src/com/google/i18n/phonenumbers/Phonenumber.java @@ -22,12 +22,9 @@ package com.google.i18n.phonenumbers; -import java.io.Serializable; - public final class Phonenumber { private Phonenumber() {} - public static final class PhoneNumber implements Serializable { - private static final long serialVersionUID = 1; + public static class PhoneNumber { public enum CountryCodeSource { FROM_NUMBER_WITH_PLUS_SIGN, FROM_NUMBER_WITH_IDD,