diff options
| author | Guilhem Lavaux <guilhem@kaffe.org> | 2003-11-27 09:49:22 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-11-27 09:49:22 +0000 |
| commit | 95f5c6a243531ccb6b102cadbd52c91fe4f265b6 (patch) | |
| tree | f829830e19e6685bdfdc64ce5db74dd394b985fc /libjava | |
| parent | 76167dc0ff996db06526c1a0f445662a195876db (diff) | |
| download | gcc-95f5c6a243531ccb6b102cadbd52c91fe4f265b6.zip gcc-95f5c6a243531ccb6b102cadbd52c91fe4f265b6.tar.gz gcc-95f5c6a243531ccb6b102cadbd52c91fe4f265b6.tar.bz2 | |
DecimalFormatSymbols.java (locale): New field.
2003-11-27 Guilhem Lavaux <guilhem@kaffe.org>
* 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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/java/text/DecimalFormatSymbols.java | 17 |
2 files changed, 21 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 544f2c4..fb7e8f7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,12 @@ 2003-11-27 Guilhem Lavaux <guilhem@kaffe.org> + * 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 <guilhem@kaffe.org> + * java/text/FormatCharacterIterator.java: Documented the class and 2003-11-27 Guilhem Lavaux <guilhem@kaffe.org> diff --git a/libjava/java/text/DecimalFormatSymbols.java b/libjava/java/text/DecimalFormatSymbols.java index 1cb8f4f..268fe2c 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; } } |