From 95f5c6a243531ccb6b102cadbd52c91fe4f265b6 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Thu, 27 Nov 2003 09:49:22 +0000 Subject: [PATCH] DecimalFormatSymbols.java (locale): New field. 2003-11-27 Guilhem Lavaux * java/text/DecimalFormatSymbols.java (locale): New field. (DecimalFormatSymbols (Locale)): Set locale. (serialVersionOnStream): Upgraded to number 2. (readObject): Assign locale if it wasn't by the serializer. From-SVN: r73987 --- libjava/ChangeLog | 7 +++++++ libjava/java/text/DecimalFormatSymbols.java | 17 ++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 544f2c48ef4..fb7e8f7cd9d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-11-27 Guilhem Lavaux + + * java/text/DecimalFormatSymbols.java (locale): New field. + (DecimalFormatSymbols (Locale)): Set locale. + (serialVersionOnStream): Upgraded to number 2. + (readObject): Assign locale if it wasn't by the serializer. + 2003-11-27 Guilhem Lavaux * java/text/FormatCharacterIterator.java: Documented the class and diff --git a/libjava/java/text/DecimalFormatSymbols.java b/libjava/java/text/DecimalFormatSymbols.java index 1cb8f4f1769..268fe2cf987 100644 --- a/libjava/java/text/DecimalFormatSymbols.java +++ b/libjava/java/text/DecimalFormatSymbols.java @@ -158,6 +158,7 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable percent = safeGetChar (res, "percent", '%'); perMill = safeGetChar (res, "perMill", '\u2030'); zeroDigit = safeGetChar (res, "zeroDigit", '0'); + locale = loc; } /** @@ -580,13 +581,20 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable /** * @serial This value represents the type of object being de-serialized. * 0 indicates a pre-Java 1.1.6 version, 1 indicates 1.1.6 or later. - */ - private int serialVersionOnStream = 1; + * 0 indicates a pre-Java 1.1.6 version, 1 indicates 1.1.6 or later, + * 2 indicates 1.4 or later + */ + private int serialVersionOnStream = 2; /** * @serial This is the character used to represent 0. */ private char zeroDigit; + /** + * @serial The locale of these currency symbols. + */ + private Locale locale; + private static final long serialVersionUID = 5772796243397350300L; private void readObject(ObjectInputStream stream) @@ -597,7 +605,10 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable { monetarySeparator = decimalSeparator; exponential = 'E'; - serialVersionOnStream = 1; } + if (serialVersionOnStream < 2) + locale = Locale.getDefault(); + + serialVersionOnStream = 2; } } -- 2.30.2