AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-4484 make simple time zone serialize on jdk 1.4

Browse Source 
X-SVN-Rev: 17499
This commit is contained in:
Doug Felt 2005-04-21 22:39:24 +00:00
parent 9a02425f60
commit be8edabb11
3 changed files with 193 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
View File

@ -18,10 +18,15 @@ import com.ibm.icu.dev.test.*;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.util.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.lang.reflect.InvocationTargetException;
import java.util.Date;
import java.util.Hashtable;
import java.util.Locale;
import java.lang.reflect.InvocationTargetException;
public class TimeZoneTest extends TestFmwk
{
@ -888,6 +893,57 @@ public class TimeZoneTest extends TestFmwk
errln("expected offset -25200000, got: " + offset);
}
}
// jb4484
public void TestSimpleTimeZoneSerialization()
{
SimpleTimeZone stz0 = new SimpleTimeZone(32400000, "MyTimeZone");
SimpleTimeZone stz1 = new SimpleTimeZone(32400000, "Asia/Tokyo");
SimpleTimeZone stz2 = new SimpleTimeZone(32400000, "Asia/Tokyo");
stz2.setRawOffset(0);
SimpleTimeZone stz3 = new SimpleTimeZone(32400000, "Asia/Tokyo");
stz3.setStartYear(100);
SimpleTimeZone stz4 = new SimpleTimeZone(32400000, "Asia/Tokyo");
stz4.setStartYear(1000);
stz4.setDSTSavings(1800000);
stz4.setStartRule(3, 4, 180000);
stz4.setEndRule(6, 3, 4, 360000);
SimpleTimeZone stz5 = new SimpleTimeZone(32400000, "Asia/Tokyo");
stz5.setStartRule(2, 3, 4, 360000);
stz5.setEndRule(6, 3, 4, 360000);
SimpleTimeZone[] stzs = { stz0, stz1, stz2, stz3, stz4, stz5, };
for (int i = 0; i < stzs.length; ++i) {
SimpleTimeZone stz = stzs[i];
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(stz);
oos.close();
byte[] bytes = baos.toByteArray();
logln("id: " + stz.getID() + " length: " + bytes.length);
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
ObjectInputStream ois = new ObjectInputStream(bais);
SimpleTimeZone stzDeserialized = (SimpleTimeZone)ois.readObject();
ois.close();
assertEquals("time zones", stz, stzDeserialized);
}
catch (ClassCastException cce) {
cce.printStackTrace();
errln("could not deserialize SimpleTimeZone");
}
catch (IOException ioe) {
errln(ioe.getMessage());
}
catch (ClassNotFoundException cnfe) {
errln(cnfe.getMessage());
}
}
}
}
//eof

3
icu4j/src/com/ibm/icu/impl/JDKTimeZone.java
View File

@ -34,7 +34,8 @@ public class JDKTimeZone extends TimeZone {
/**
* The java.util.TimeZone wrapped by this object. Must not be null.
*/
transient java.util.TimeZone zone;
// give access to SimpleTimeZone
protected transient java.util.TimeZone zone;
/**
* Given a java.util.TimeZone, wrap it in the appropriate adapter

138
icu4j/src/com/ibm/icu/util/SimpleTimeZone.java
View File

@ -6,6 +6,8 @@
package com.ibm.icu.util;
import com.ibm.icu.impl.JDKTimeZone;
import java.io.IOException;
///CLOVER:USECLASS
/**
* <code>SimpleTimeZone</code> is a concrete subclass of <code>TimeZone</code>
@ -38,6 +40,7 @@ public class SimpleTimeZone extends JDKTimeZone {
*/
public SimpleTimeZone(int rawOffset, String ID) {
this(new java.util.SimpleTimeZone(rawOffset, ID));
raw = rawOffset;
}
/**
@ -102,8 +105,22 @@ public class SimpleTimeZone extends JDKTimeZone {
int startMonth, int startDay, int startDayOfWeek, int startTime,
int endMonth, int endDay, int endDayOfWeek, int endTime) {
this(new java.util.SimpleTimeZone(rawOffset, ID, startMonth, startDay,
startDayOfWeek, startTime, endMonth,
endDay, endDayOfWeek, endTime));
startDayOfWeek, startTime, endMonth,
endDay, endDayOfWeek, endTime));
raw = rawOffset;
sm = startMonth;
sdwm = startDay;
sdw = startDayOfWeek;
st = startTime;
sdm = -1;
em = endMonth;
edwm = endDay;
edw = endDayOfWeek;
et = endTime;
edm = -1;
}
/**
@ -119,8 +136,28 @@ public class SimpleTimeZone extends JDKTimeZone {
int endMonth, int endDay, int endDayOfWeek, int endTime,
int dstSavings) {
this(new java.util.SimpleTimeZone(rawOffset, ID, startMonth, startDay,
startDayOfWeek, startTime, endMonth,
endDay, endDayOfWeek, endTime, dstSavings));
startDayOfWeek, startTime, endMonth,
endDay, endDayOfWeek, endTime, dstSavings));
raw = rawOffset;
dst = dstSavings;
sm = startMonth;
sdwm = startDay;
sdw = startDayOfWeek;
st = startTime;
sdm = -1;
em = endMonth;
edwm = endDay;
edw = endDayOfWeek;
et = endTime;
edm = -1;
}
public void setRawOffset(int offsetMillis) {
super.setRawOffset(offsetMillis);
raw = offsetMillis;
}
/**
@ -131,6 +168,8 @@ public class SimpleTimeZone extends JDKTimeZone {
*/
public void setStartYear(int year) {
unwrapSTZ().setStartYear(year);
sy = year;
}
/**
@ -157,6 +196,12 @@ public class SimpleTimeZone extends JDKTimeZone {
public void setStartRule(int month, int dayOfWeekInMonth, int dayOfWeek,
int time) {
unwrapSTZ().setStartRule(month, dayOfWeekInMonth, dayOfWeek, time);
sm = month;
sdwm = dayOfWeekInMonth;
sdw = dayOfWeek;
st = time;
sdm = -1;
}
/**
@ -173,6 +218,12 @@ public class SimpleTimeZone extends JDKTimeZone {
*/
public void setStartRule(int month, int dayOfMonth, int time) {
unwrapSTZ().setStartRule(month, dayOfMonth, time);
sm = month;
sdwm = -1;
sdw = -1;
st = time;
sdm = dayOfMonth;
}
/**
@ -194,6 +245,13 @@ public class SimpleTimeZone extends JDKTimeZone {
*/
public void setStartRule(int month, int dayOfMonth, int dayOfWeek, int time, boolean after) {
unwrapSTZ().setStartRule(month, dayOfMonth, dayOfWeek, time, after);
sm = month;
sdwm = -1;
sdw = dayOfWeek;
st = time;
sdm = dayOfMonth;
sa = after;
}
/**
@ -219,6 +277,12 @@ public class SimpleTimeZone extends JDKTimeZone {
public void setEndRule(int month, int dayOfWeekInMonth, int dayOfWeek,
int time) {
unwrapSTZ().setEndRule(month, dayOfWeekInMonth, dayOfWeek, time);
em = month;
edwm = dayOfWeekInMonth;
edw = dayOfWeek;
et = time;
edm = -1;
}
/**
@ -235,6 +299,12 @@ public class SimpleTimeZone extends JDKTimeZone {
*/
public void setEndRule(int month, int dayOfMonth, int time) {
unwrapSTZ().setEndRule(month, dayOfMonth, time);
em = month;
edwm = -1;
edw = -1;
et = time;
edm = dayOfMonth;
}
/**
@ -256,6 +326,13 @@ public class SimpleTimeZone extends JDKTimeZone {
*/
public void setEndRule(int month, int dayOfMonth, int dayOfWeek, int time, boolean after) {
unwrapSTZ().setEndRule(month, dayOfMonth, dayOfWeek, time, after);
em = month;
edwm = -1;
edw = dayOfWeek;
et = time;
edm = dayOfMonth;
ea = after;
}
/**
@ -267,6 +344,7 @@ public class SimpleTimeZone extends JDKTimeZone {
*/
public void setDSTSavings(int millisSavedDuringDST) {
unwrapSTZ().setDSTSavings(millisSavedDuringDST);
dst = millisSavedDuringDST;
}
/**
@ -287,7 +365,13 @@ public class SimpleTimeZone extends JDKTimeZone {
* @internal
*/
public SimpleTimeZone(java.util.SimpleTimeZone tz) {
// public so JDKTimeZone can instantiate it
// note, this is a problem since if the java STZ has been tweaked before
// we get it, we can't extract the info from it so we can't serialize
// or deserialize
super(tz);
raw = tz.getRawOffset();
}
/**
@ -296,6 +380,52 @@ public class SimpleTimeZone extends JDKTimeZone {
java.util.SimpleTimeZone unwrapSTZ() {
return (java.util.SimpleTimeZone) unwrap();
}
// on JDK 1.4 and later, can't deserialize a SimpleTimeZone as a SimpleTimeZone...
private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
if (!(zone instanceof java.util.SimpleTimeZone && zone.getID().equals(getID()))) {
// System.out.println("*** readjust " + zone.getClass().getName() + " " + zone.getID() + " ***");
java.util.SimpleTimeZone stz =
new java.util.SimpleTimeZone(raw, getID());
if (dst != 0) {
stz.setDSTSavings(dst);
// if it is 0, then there shouldn't be start/end rules and the default
// behavior should be no dst
}
if (sy != -1) {
stz.setStartYear(sy);
}
if (sm != -1) {
if (sdm == -1) {
stz.setStartRule(sm, sdwm, sdw, st);
} else if (sdw == -1) {
stz.setStartRule(sm, sdm, st);
} else {
stz.setStartRule(sm, sdm, sdw, st, sa);
}
}
if (em != -1) {
if (edm == -1) {
stz.setEndRule(em, edwm, edw, et);
} else if (edw == -1) {
stz.setEndRule(em, edm, et);
} else {
stz.setEndRule(em, edm, edw, et, ea);
}
}
zone = stz;
}
}
// data needed for streaming mutated SimpleTimeZones in JDK14
int raw, dst = 3600000;
int sy = -1;
int sm = -1, sdwm, sdw, st, sdm;
boolean sa;
int em = -1, edwm, edw, et, edm;
boolean ea;
}
//eof