+2004-10-08 Bryce McKinlay <mckinlay@redhat.com>
+
+ * java/util/Calendar.java (set): Invalidate DST_OFFSET
+ field as a DST boundary may have been crossed.
+ * java/util/GregorianCalendar.java (add): Throw
+ IllegalArgumentException on attempt to add to DST_OFFSET or
+ ZONE_OFFSET fields. Update javadoc.
+
2004-10-09 Michael Koch <konqueror@gmx.de>
* java/io/CharArrayWriter.java
isSet[HOUR_OF_DAY] = false;
break;
}
+
+ // May have crossed over a DST boundary.
+ if (field != DST_OFFSET && field != ZONE_OFFSET)
+ isSet[DST_OFFSET] = false;
}
/**
isSet[WEEK_OF_MONTH] = false;
isSet[DAY_OF_WEEK] = false;
isSet[DAY_OF_WEEK_IN_MONTH] = false;
+
+ isSet[DST_OFFSET] = false; // May have crossed a DST boundary.
}
/**
fields[DAY_OF_WEEK] = weekday;
// get a first approximation of the year. This may be one
- // year to big.
+ // year too big.
int year = 1970 + (gregorian
? ((day - 100) * 400) / (365 * 400 + 100 - 4 + 1)
: ((day - 100) * 4) / (365 * 4 + 1));
* it does what you expect: Jan, 25 + 10 Days is Feb, 4.
* @param field the time field. One of the time field constants.
* @param amount the amount of time.
+ * @exception IllegalArgumentException if <code>field</code> is
+ * <code>ZONE_OFFSET</code>, <code>DST_OFFSET</code>, or invalid; or
+ * if <code>amount</code> contains an out-of-range value and the calendar
+ * is not in lenient mode.
*/
public void add(int field, int amount)
{
areFieldsSet = false;
break;
case ZONE_OFFSET:
- complete();
- fields[ZONE_OFFSET] += amount;
- time -= amount;
- break;
case DST_OFFSET:
- complete();
- fields[DST_OFFSET] += amount;
- isTimeSet = false;
- break;
default:
- throw new IllegalArgumentException
- ("Unknown Calendar field: " + field);
+ throw new IllegalArgumentException("Invalid or unknown field");
}
}