From b6d027192b68657e541c9e102d76e5a9795f909d Mon Sep 17 00:00:00 2001 From: warrenl Date: Tue, 10 Oct 2000 23:09:08 +0000 Subject: * gnu/gcj/text/LocaleData_en.java (monetarySeparator): Added. * java/sql/Date.java (serialVersionUID): New field. * java/sql/Time.java (serialVersionUID): New field. * java/sql/Timestamp.java (serialVersionUID): New field. * java/text/ChoiceFormat.java (serialVersionUID): New field. * java/text/DateFormat.java (getDateTimeInstance (int)): Removed. * java/text/DateFormatSymbols.java (serialVersionUID): New field. * java/text/DecimalFormat.java (serialVersionOnStream): New field. (readObject): New serialization method. * java/text/DecimalFormatSymbols.java (monetarySeparator): New field. (serialVersionOnStream): New field. (readObject): New serialization method. (getMonetaryDecimalSeparator): New method. (setMonetaryDecimalSeparator): New method. * java/text/NumberFormat.java (maxFractionDigits): New field. (maxIntegerDigits): New field. (minFractionDigits): New field. (minIntegerDigits): New field. (serialVersionOnStream): New field. (serialVersionUID): New field. (readObject): New serialization method. (writeObject): New serialization method. * java/text/SimpleDateFormat.java (defaultCenturyStart): Initialized. (serialVersionOnStream): New field. (serialVersionUID): New field. (readObject): New serialization method. Serialization mods. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36831 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/text/SimpleDateFormat.java | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'libjava/java/text/SimpleDateFormat.java') diff --git a/libjava/java/text/SimpleDateFormat.java b/libjava/java/text/SimpleDateFormat.java index 08ed3175c56..feb64f0d02d 100644 --- a/libjava/java/text/SimpleDateFormat.java +++ b/libjava/java/text/SimpleDateFormat.java @@ -9,6 +9,8 @@ details. */ package java.text; import java.util.*; +import java.io.ObjectInputStream; +import java.io.IOException; /** * @author Per Bothner @@ -16,14 +18,29 @@ import java.util.*; */ /* Written using "Java Class Libraries", 2nd edition, plus online * API docs for JDK 1.2 beta from http://www.javasoft.com. - * Status: parse is not implemented. + * Status: Believed complete and correct to 1.2. */ public class SimpleDateFormat extends DateFormat { - private Date defaultCenturyStart; + // Serialization fields. + private Date defaultCenturyStart = new Date(); private DateFormatSymbols formatData; private String pattern; + private int serialVersionOnStream = 1; + private static final long serialVersionUID = 4774881970558875024L; + + // Serialization method. + private void readObject(ObjectInputStream stream) + throws IOException, ClassNotFoundException + { + stream.defaultReadObject(); + if (serialVersionOnStream < 1) + { + defaultCenturyStart = new Date(); + serialVersionOnStream = 1; + } + } public SimpleDateFormat () { -- cgit v1.2.1