--- /dev/null 2013-01-18 16:17:08.886776012 -0800
+++ new/test/java/time/tck/java/time/calendar/CopticDate.java 2013-01-22 16:58:40.000000000 -0800
@@ -0,0 +1,340 @@
+/*
+ * 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 tck.java.time.calendar;
+
+import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH;
+import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR;
+import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_MONTH;
+import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR;
+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_OF_ERA;
+
+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.ChronoUnit;
+import java.time.temporal.Era;
+import java.time.temporal.Temporal;
+import java.time.temporal.TemporalAdjuster;
+import java.time.temporal.TemporalAdder;
+import java.time.temporal.TemporalSubtractor;
+import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalUnit;
+import java.time.temporal.ValueRange;
+import java.time.temporal.Year;
+
+/**
+ * A date in the Coptic calendar system.
+ *
+ * This implements {@code ChronoLocalDate} for the {@link CopticChrono Coptic calendar}.
+ *
+ *
Implementation notes
+ * This class is immutable and thread-safe.
+ */
+final class CopticDate
+ implements ChronoLocalDate, Serializable {
+
+ /**
+ * Serialization version.
+ */
+ private static final long serialVersionUID = -7920528871688876868L;
+ /**
+ * The difference between the Coptic and Coptic epoch day count.
+ */
+ private static final int EPOCH_DAY_DIFFERENCE = 574971 + 40587;
+
+ /**
+ * The proleptic year.
+ */
+ private final int prolepticYear;
+ /**
+ * The month.
+ */
+ private final short month;
+ /**
+ * The day.
+ */
+ private final short day;
+
+ //-----------------------------------------------------------------------
+ /**
+ * Creates an instance.
+ *
+ * @param epochDay the epoch day to convert based on 1970-01-01 (ISO)
+ * @return the Coptic date, not null
+ * @throws DateTimeException if the date is invalid
+ */
+ static CopticDate ofEpochDay(long epochDay) {
+ epochDay += EPOCH_DAY_DIFFERENCE;
+ int prolepticYear = (int) (((epochDay * 4) + 1463) / 1461);
+ int startYearEpochDay = (prolepticYear - 1) * 365 + (prolepticYear / 4);
+ int doy0 = (int) (epochDay - startYearEpochDay);
+ int month = doy0 / 30 + 1;
+ int dom = doy0 % 30 + 1;
+ return new CopticDate(prolepticYear, month, dom);
+ }
+
+ private static CopticDate resolvePreviousValid(int prolepticYear, int month, int day) {
+ if (month == 13 && day > 5) {
+ day = CopticChrono.INSTANCE.isLeapYear(prolepticYear) ? 6 : 5;
+ }
+ return new CopticDate(prolepticYear, month, day);
+ }
+
+ //-----------------------------------------------------------------------
+ /**
+ * Creates an instance.
+ *
+ * @param prolepticYear the Coptic proleptic-year
+ * @param month the Coptic month, from 1 to 13
+ * @param dayOfMonth the Coptic day-of-month, from 1 to 30
+ * @throws DateTimeException if the date is invalid
+ */
+ CopticDate(int prolepticYear, int month, int dayOfMonth) {
+ CopticChrono.MOY_RANGE.checkValidValue(month, MONTH_OF_YEAR);
+ ValueRange range;
+ if (month == 13) {
+ range = CopticChrono.INSTANCE.isLeapYear(prolepticYear) ? CopticChrono.DOM_RANGE_LEAP : CopticChrono.DOM_RANGE_NONLEAP;
+ } else {
+ range = CopticChrono.DOM_RANGE;
+ }
+ range.checkValidValue(dayOfMonth, DAY_OF_MONTH);
+
+ this.prolepticYear = prolepticYear;
+ this.month = (short) month;
+ this.day = (short) dayOfMonth;
+ }
+
+ /**
+ * Validates the object.
+ *
+ * @return the resolved date, not null
+ */
+ private Object readResolve() {
+ // TODO: validate
+ return this;
+ }
+
+ //-----------------------------------------------------------------------
+ @Override
+ public CopticChrono getChrono() {
+ return CopticChrono.INSTANCE;
+ }
+
+ //-----------------------------------------------------------------------
+ @Override
+ public int lengthOfMonth() {
+ switch (month) {
+ case 13:
+ return (isLeapYear() ? 6 : 5);
+ default:
+ return 30;
+ }
+ }
+
+ @Override
+ public ValueRange range(TemporalField field) {
+ if (field instanceof ChronoField) {
+ if (isSupported(field)) {
+ ChronoField f = (ChronoField) field;
+ switch (f) {
+ case DAY_OF_MONTH: return ValueRange.of(1, lengthOfMonth());
+ case DAY_OF_YEAR: return ValueRange.of(1, lengthOfYear());
+ case ALIGNED_WEEK_OF_MONTH: return ValueRange.of(1, month == 13 ? 1 : 5);
+ case YEAR:
+ case YEAR_OF_ERA: return (prolepticYear <= 0 ?
+ ValueRange.of(1, Year.MAX_VALUE + 1) : ValueRange.of(1, Year.MAX_VALUE)); // TODO
+ }
+ return getChrono().range(f);
+ }
+ throw new DateTimeException("Unsupported field: " + field.getName());
+ }
+ return field.doRange(this);
+ }
+
+ @Override
+ public long getLong(TemporalField field) {
+ if (field instanceof ChronoField) {
+ switch ((ChronoField) field) {
+ case DAY_OF_WEEK: return Math.floorMod(toEpochDay() + 3, 7) + 1;
+ case ALIGNED_DAY_OF_WEEK_IN_MONTH: return ((day - 1) % 7) + 1;
+ case ALIGNED_DAY_OF_WEEK_IN_YEAR: return ((get(ChronoField.DAY_OF_YEAR) - 1) % 7) + 1;
+ case DAY_OF_MONTH: return day;
+ case DAY_OF_YEAR: return (month - 1) * 30 + day;
+ case EPOCH_DAY: return toEpochDay();
+ case ALIGNED_WEEK_OF_MONTH: return ((day - 1) / 7) + 1;
+ case ALIGNED_WEEK_OF_YEAR: return ((get(ChronoField.DAY_OF_YEAR) - 1) / 7) + 1;
+ case MONTH_OF_YEAR: return month;
+ case YEAR_OF_ERA: return (prolepticYear >= 1 ? prolepticYear : 1 - prolepticYear);
+ case YEAR: return prolepticYear;
+ case ERA: return (prolepticYear >= 1 ? 1 : 0);
+ }
+ throw new DateTimeException("Unsupported field: " + field.getName());
+ }
+ return field.doGet(this);
+ }
+
+ @Override
+ public CopticDate with(TemporalField field, long newValue) {
+ if (field instanceof ChronoField) {
+ ChronoField f = (ChronoField) field;
+ f.checkValidValue(newValue); // TODO: validate value
+ int nvalue = (int) newValue;
+ switch (f) {
+ case DAY_OF_WEEK: return plusDays(newValue - get(ChronoField.DAY_OF_WEEK));
+ case ALIGNED_DAY_OF_WEEK_IN_MONTH: return plusDays(newValue - getLong(ALIGNED_DAY_OF_WEEK_IN_MONTH));
+ case ALIGNED_DAY_OF_WEEK_IN_YEAR: return plusDays(newValue - getLong(ALIGNED_DAY_OF_WEEK_IN_YEAR));
+ case DAY_OF_MONTH: return resolvePreviousValid(prolepticYear, month, nvalue);
+ case DAY_OF_YEAR: return resolvePreviousValid(prolepticYear, ((nvalue - 1) / 30) + 1, ((nvalue - 1) % 30) + 1);
+ case EPOCH_DAY: return ofEpochDay(nvalue);
+ case ALIGNED_WEEK_OF_MONTH: return plusDays((newValue - getLong(ALIGNED_WEEK_OF_MONTH)) * 7);
+ case ALIGNED_WEEK_OF_YEAR: return plusDays((newValue - getLong(ALIGNED_WEEK_OF_YEAR)) * 7);
+ case MONTH_OF_YEAR: return resolvePreviousValid(prolepticYear, nvalue, day);
+ case YEAR_OF_ERA: return resolvePreviousValid(prolepticYear >= 1 ? nvalue : 1 - nvalue, month, day);
+ case YEAR: return resolvePreviousValid(nvalue, month, day);
+ case ERA: return resolvePreviousValid(1 - prolepticYear, month, day);
+ }
+ throw new DateTimeException("Unsupported field: " + field.getName());
+ }
+ return field.doWith(this, newValue);
+ }
+
+ //-----------------------------------------------------------------------
+ @Override
+ public CopticDate plus(long amountToAdd, TemporalUnit unit) {
+ if (unit instanceof ChronoUnit) {
+ ChronoUnit f = (ChronoUnit) unit;
+ switch (f) {
+ case DAYS: return plusDays(amountToAdd);
+ case WEEKS: return plusDays(Math.multiplyExact(amountToAdd, 7));
+ case MONTHS: return plusMonths(amountToAdd);
+ case YEARS: return plusYears(amountToAdd);
+ case DECADES: return plusYears(Math.multiplyExact(amountToAdd, 10));
+ case CENTURIES: return plusYears(Math.multiplyExact(amountToAdd, 100));
+ case MILLENNIA: return plusYears(Math.multiplyExact(amountToAdd, 1000));
+ }
+ throw new DateTimeException(unit.getName() + " not valid for CopticDate");
+ }
+ return unit.doPlus(this, amountToAdd);
+ }
+
+ //-----------------------------------------------------------------------
+ private CopticDate plusYears(long years) {
+ return plusMonths(Math.multiplyExact(years, 13));
+ }
+
+ private CopticDate plusMonths(long months) {
+ if (months == 0) {
+ return this;
+ }
+ long curEm = prolepticYear * 13L + (month - 1);
+ long calcEm = Math.addExact(curEm, months);
+ int newYear = Math.toIntExact(Math.floorDiv(calcEm, 13));
+ int newMonth = (int)Math.floorMod(calcEm, 13) + 1;
+ return resolvePreviousValid(newYear, newMonth, day);
+ }
+
+ private CopticDate plusDays(long days) {
+ if (days == 0) {
+ return this;
+ }
+ return CopticDate.ofEpochDay(Math.addExact(toEpochDay(), days));
+ }
+
+ @Override
+ public long periodUntil(Temporal endDateTime, TemporalUnit unit) {
+ if (endDateTime instanceof ChronoLocalDate == false) {
+ throw new DateTimeException("Unable to calculate period between objects of two different types");
+ }
+ ChronoLocalDate end = (ChronoLocalDate) endDateTime;
+ if (getChrono().equals(end.getChrono()) == false) {
+ throw new DateTimeException("Unable to calculate period between two different chronologies");
+ }
+ if (unit instanceof ChronoUnit) {
+ return LocalDate.from(this).periodUntil(end, unit); // TODO: this is wrong
+ }
+ return unit.between(this, endDateTime).getAmount();
+ }
+
+ //-----------------------------------------------------------------------
+ @Override
+ public long toEpochDay() {
+ long year = (long) prolepticYear;
+ long copticEpochDay = ((year - 1) * 365) + Math.floorDiv(year, 4) + (get(ChronoField.DAY_OF_YEAR) - 1);
+ return copticEpochDay - EPOCH_DAY_DIFFERENCE;
+ }
+
+ @Override
+ public String toString() {
+ // getLong() reduces chances of exceptions in toString()
+ long yoe = getLong(YEAR_OF_ERA);
+ long moy = getLong(MONTH_OF_YEAR);
+ long dom = getLong(DAY_OF_MONTH);
+ StringBuilder buf = new StringBuilder(30);
+ buf.append(getChrono().toString())
+ .append(" ")
+ .append(getEra())
+ .append(" ")
+ .append(yoe)
+ .append(moy < 10 ? "-0" : "-").append(moy)
+ .append(dom < 10 ? "-0" : "-").append(dom);
+ return buf.toString();
+ }
+}