--- old/src/share/classes/java/time/calendar/ThaiBuddhistDate.java 2013-02-08 10:48:22.000000000 -0800 +++ /dev/null 2013-01-18 16:17:08.886776012 -0800 @@ -1,259 +0,0 @@ -/* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * Copyright (c) 2012, Stephen Colebourne & Michael Nascimento Santos - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * * Neither the name of JSR-310 nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package java.time.calendar; - -import static java.time.calendar.ThaiBuddhistChrono.YEARS_DIFFERENCE; -import static java.time.temporal.ChronoField.DAY_OF_MONTH; -import static java.time.temporal.ChronoField.MONTH_OF_YEAR; -import static java.time.temporal.ChronoField.YEAR; - -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.io.Serializable; -import java.time.DateTimeException; -import java.time.LocalDate; -import java.time.temporal.ChronoField; -import java.time.temporal.ChronoLocalDate; -import java.time.temporal.TemporalField; -import java.time.temporal.ValueRange; -import java.util.Objects; - -/** - * A date in the Thai Buddhist calendar system. - *
- * This implements {@code ChronoLocalDate} for the {@link ThaiBuddhistChrono Thai Buddhist calendar}. - * - *
+ * This date operates using the {@linkplain ThaiBuddhistChronology Thai Buddhist calendar}. + * This calendar system is primarily used in Thailand. + * Dates are aligned such that {@code 2484-01-01 (Buddhist)} is {@code 1941-01-01 (ISO)}. + * + *
+ * This will query the {@link Clock#systemDefaultZone() system clock} in the default + * time-zone to obtain the current date. + *
+ * Using this method will prevent the ability to use an alternate clock for testing + * because the clock is hard-coded. + * + * @return the current date using the system clock and default time-zone, not null + */ + public static ThaiBuddhistDate now() { + return now(Clock.systemDefaultZone()); + } + + /** + * Obtains the current {@code ThaiBuddhistDate} from the system clock in the specified time-zone. + *
+ * This will query the {@link Clock#system(ZoneId) system clock} to obtain the current date. + * Specifying the time-zone avoids dependence on the default time-zone. + *
+ * Using this method will prevent the ability to use an alternate clock for testing + * because the clock is hard-coded. + * + * @param zone the zone ID to use, not null + * @return the current date using the system clock, not null + */ + public static ThaiBuddhistDate now(ZoneId zone) { + return now(Clock.system(zone)); + } + + /** + * Obtains the current {@code ThaiBuddhistDate} from the specified clock. + *
+ * This will query the specified clock to obtain the current date - today. + * Using this method allows the use of an alternate clock for testing. + * The alternate clock may be introduced using {@linkplain Clock dependency injection}. + * + * @param clock the clock to use, not null + * @return the current date, not null + * @throws DateTimeException if the current date cannot be obtained + */ + public static ThaiBuddhistDate now(Clock clock) { + return ThaiBuddhistChronology.INSTANCE.date(LocalDate.now(clock)); + } + + /** + * Obtains a {@code ThaiBuddhistDate} representing a date in the Thai Buddhist calendar + * system from the proleptic-year, month-of-year and day-of-month fields. + *
+ * This returns a {@code ThaiBuddhistDate} with the specified fields. + * The day must be valid for the year and month, otherwise an exception will be thrown. + * + * @param prolepticYear the Thai Buddhist proleptic-year + * @param month the Thai Buddhist month-of-year, from 1 to 12 + * @param dayOfMonth the Thai Buddhist day-of-month, from 1 to 31 + * @return the date in Thai Buddhist calendar system, not null + * @throws DateTimeException if the value of any field is out of range, + * or if the day-of-month is invalid for the month-year + */ + public static ThaiBuddhistDate of(int prolepticYear, int month, int dayOfMonth) { + return new ThaiBuddhistDate(LocalDate.of(prolepticYear - YEARS_DIFFERENCE, month, dayOfMonth)); + } + + /** + * Obtains a {@code ThaiBuddhistDate} from a temporal object. + *
+ * This obtains a date in the Thai Buddhist calendar system based on the specified temporal. + * A {@code TemporalAccessor} represents an arbitrary set of date and time information, + * which this factory converts to an instance of {@code ThaiBuddhistDate}. + *
+ * The conversion typically uses the {@link ChronoField#EPOCH_DAY EPOCH_DAY} + * field, which is standardized across calendar systems. + *
+ * This method matches the signature of the functional interface {@link TemporalQuery}
+ * allowing it to be used as a query via method reference, {@code ThaiBuddhistDate::from}.
+ *
+ * @param temporal the temporal object to convert, not null
+ * @return the date in Thai Buddhist calendar system, not null
+ * @throws DateTimeException if unable to convert to a {@code ThaiBuddhistDate}
+ */
+ public static ThaiBuddhistDate from(TemporalAccessor temporal) {
+ return ThaiBuddhistChronology.INSTANCE.date(temporal);
+ }
+
+ //-----------------------------------------------------------------------
+ /**
+ * Creates an instance from an ISO date.
+ *
+ * @param isoDate the standard local date, validated not null
+ */
+ ThaiBuddhistDate(LocalDate isoDate) {
+ Objects.requireNonNull(isoDate, "isoDate");
+ this.isoDate = isoDate;
+ }
+
+ //-----------------------------------------------------------------------
+ @Override
+ public ThaiBuddhistChronology getChronology() {
+ return ThaiBuddhistChronology.INSTANCE;
+ }
+
+ @Override
+ public int lengthOfMonth() {
+ return isoDate.lengthOfMonth();
+ }
+
+ @Override
+ public ValueRange range(TemporalField field) {
+ if (field instanceof ChronoField) {
+ if (isSupported(field)) {
+ ChronoField f = (ChronoField) field;
+ switch (f) {
+ case DAY_OF_MONTH:
+ case DAY_OF_YEAR:
+ case ALIGNED_WEEK_OF_MONTH:
+ return isoDate.range(field);
+ case YEAR_OF_ERA: {
+ ValueRange range = YEAR.range();
+ long max = (getProlepticYear() <= 0 ? -(range.getMinimum() + YEARS_DIFFERENCE) + 1 : range.getMaximum() + YEARS_DIFFERENCE);
+ return ValueRange.of(1, max);
+ }
+ }
+ return getChronology().range(f);
+ }
+ throw new DateTimeException("Unsupported field: " + field.getName());
+ }
+ return field.rangeRefinedBy(this);
+ }
+
+ @Override
+ public long getLong(TemporalField field) {
+ if (field instanceof ChronoField) {
+ switch ((ChronoField) field) {
+ case YEAR_OF_ERA: {
+ int prolepticYear = getProlepticYear();
+ return (prolepticYear >= 1 ? prolepticYear : 1 - prolepticYear);
+ }
+ case YEAR:
+ return getProlepticYear();
+ case ERA:
+ return (getProlepticYear() >= 1 ? 1 : 0);
+ }
+ return isoDate.getLong(field);
+ }
+ return field.getFrom(this);
+ }
+
+ private int getProlepticYear() {
+ return isoDate.getYear() + YEARS_DIFFERENCE;
+ }
+
+ //-----------------------------------------------------------------------
+ @Override
+ public ThaiBuddhistDate with(TemporalField field, long newValue) {
+ if (field instanceof ChronoField) {
+ ChronoField f = (ChronoField) field;
+ if (getLong(f) == newValue) {
+ return this;
+ }
+ switch (f) {
+ case YEAR_OF_ERA:
+ case YEAR:
+ case ERA: {
+ f.checkValidValue(newValue);
+ int nvalue = (int) newValue;
+ switch (f) {
+ case YEAR_OF_ERA:
+ return with(isoDate.withYear((getProlepticYear() >= 1 ? nvalue : 1 - nvalue) - YEARS_DIFFERENCE));
+ case YEAR:
+ return with(isoDate.withYear(nvalue - YEARS_DIFFERENCE));
+ case ERA:
+ return with(isoDate.withYear((1 - getProlepticYear()) - YEARS_DIFFERENCE));
+ }
+ }
+ }
+ return with(isoDate.with(field, newValue));
+ }
+ return (ThaiBuddhistDate) ChronoLocalDate.super.with(field, newValue);
+ }
+
+ /**
+ * {@inheritDoc}
+ * @throws DateTimeException {@inheritDoc}
+ * @throws ArithmeticException {@inheritDoc}
+ */
+ @Override
+ public ThaiBuddhistDate with(TemporalAdjuster adjuster) {
+ return (ThaiBuddhistDate)super.with(adjuster);
+ }
+
+ /**
+ * {@inheritDoc}
+ * @throws DateTimeException {@inheritDoc}
+ * @throws ArithmeticException {@inheritDoc}
+ */
+ @Override
+ public ThaiBuddhistDate plus(TemporalAmount amount) {
+ return (ThaiBuddhistDate)super.plus(amount);
+ }
+
+ /**
+ * {@inheritDoc}
+ * @throws DateTimeException {@inheritDoc}
+ * @throws ArithmeticException {@inheritDoc}
+ */
+ @Override
+ public ThaiBuddhistDate minus(TemporalAmount amount) {
+ return (ThaiBuddhistDate)super.minus(amount);
+ }
+
+ //-----------------------------------------------------------------------
+ @Override
+ ThaiBuddhistDate plusYears(long years) {
+ return with(isoDate.plusYears(years));
+ }
+
+ @Override
+ ThaiBuddhistDate plusMonths(long months) {
+ return with(isoDate.plusMonths(months));
+ }
+
+ @Override
+ ThaiBuddhistDate plusWeeks(long weeksToAdd) {
+ return (ThaiBuddhistDate)super.plusWeeks(weeksToAdd);
+ }
+
+ @Override
+ ThaiBuddhistDate plusDays(long days) {
+ return with(isoDate.plusDays(days));
+ }
+
+ @Override
+ public ThaiBuddhistDate plus(long amountToAdd, TemporalUnit unit) {
+ return (ThaiBuddhistDate)super.plus(amountToAdd, unit);
+ }
+
+ @Override
+ public ThaiBuddhistDate minus(long amountToAdd, TemporalUnit unit) {
+ return (ThaiBuddhistDate)super.minus(amountToAdd, unit);
+ }
+
+ @Override
+ ThaiBuddhistDate minusYears(long yearsToSubtract) {
+ return (ThaiBuddhistDate)super.minusYears(yearsToSubtract);
+ }
+
+ @Override
+ ThaiBuddhistDate minusMonths(long monthsToSubtract) {
+ return (ThaiBuddhistDate)super.minusMonths(monthsToSubtract);
+ }
+
+ @Override
+ ThaiBuddhistDate minusWeeks(long weeksToSubtract) {
+ return (ThaiBuddhistDate)super.minusWeeks(weeksToSubtract);
+ }
+
+ @Override
+ ThaiBuddhistDate minusDays(long daysToSubtract) {
+ return (ThaiBuddhistDate)super.minusDays(daysToSubtract);
+ }
+
+ private ThaiBuddhistDate with(LocalDate newDate) {
+ return (newDate.equals(isoDate) ? this : new ThaiBuddhistDate(newDate));
+ }
+
+ @Override // for javadoc and covariant return type
+ public final ChronoLocalDateTime