+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
percent = safeGetChar (res, "percent", '%');
perMill = safeGetChar (res, "perMill", '\u2030');
zeroDigit = safeGetChar (res, "zeroDigit", '0');
+ locale = loc;
}
/**
/**
* @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)
{
monetarySeparator = decimalSeparator;
exponential = 'E';
- serialVersionOnStream = 1;
}
+ if (serialVersionOnStream < 2)
+ locale = Locale.getDefault();
+
+ serialVersionOnStream = 2;
}
}