organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 17:24:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-8753 Replace confusing use of dst variable with prevOffset / newOffset

Browse source 
X-SVN-Rev: 30772
This commit is contained in:
Peter Edberg 2011-09-30 21:32:41 +00:00
parent c27fc1d6e5
commit 69bb199a1b
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java
View file

@ -3076,30 +3076,30 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
}
// In order to keep the hour invariant (for fields where this is
// appropriate), record the DST_OFFSET before and after the add()
// operation. If it has changed, then adjust the millis to
// compensate.
int dst = 0;
// appropriate), check the combined DST & ZONE offset before and
// after the add() operation. If it changes, then adjust the millis
// to compensate.
int prevOffset = 0;
int hour = 0;
if (keepHourInvariant) {
dst = get(DST_OFFSET) + get(ZONE_OFFSET);
prevOffset = get(DST_OFFSET) + get(ZONE_OFFSET);
hour = internalGet(HOUR_OF_DAY);
}
setTimeInMillis(getTimeInMillis() + delta);
if (keepHourInvariant) {
dst -= get(DST_OFFSET) + get(ZONE_OFFSET);
if (dst != 0) {
int newOffset = get(DST_OFFSET) + get(ZONE_OFFSET);
if (newOffset != prevOffset) {
// We have done an hour-invariant adjustment but the
// DST offset has altered. We adjust millis to keep
// the hour constant. In cases such as midnight after
// combined offset has changed. We adjust millis to keep
// the hour constant. In cases such as midnight after
// a DST change which occurs at midnight, there is the
// danger of adjusting into a different day. To avoid
// danger of adjusting into a different day. To avoid
// this we make the adjustment only if it actually
// maintains the hour.
long t = time;
setTimeInMillis(time + dst);
setTimeInMillis(time + prevOffset - newOffset);
if (get(HOUR_OF_DAY) != hour) {
setTimeInMillis(t);
}