diff -r c588664d547e -r 55b829ca2334 jdk/src/share/classes/java/time/calendar/JapaneseDate.java --- a/jdk/src/share/classes/java/time/calendar/JapaneseDate.java Tue Feb 12 16:02:14 2013 +0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,377 +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.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.ObjectInputStream; -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.Calendar; -import java.util.Objects; - -import sun.util.calendar.LocalGregorianCalendar; - -/** - * A date in the Japanese Imperial calendar system. - *
- * This implements {@code ChronoLocalDate} for the - * {@linkplain JapaneseChrono Japanese Imperial calendar}. - * - *
- * This method changes the year of the date. - * If the month-day is invalid for the year, then the previous valid day - * will be selected instead. - *
- * This instance is immutable and unaffected by this method call. - * - * @param era the era to set in the result, not null - * @param yearOfEra the year-of-era to set in the returned date - * @return a {@code JapaneseDate} based on this date with the requested year, never null - * @throws DateTimeException if {@code year} is invalid - */ - private JapaneseDate withYear(JapaneseEra era, int yearOfEra) { - int year = JapaneseChrono.INSTANCE.prolepticYear(era, yearOfEra); - return with(isoDate.withYear(year)); - } - - /** - * Returns a copy of this date with the year-of-era altered. - *
- * This method changes the year-of-era of the date. - * If the month-day is invalid for the year, then the previous valid day - * will be selected instead. - *
- * This instance is immutable and unaffected by this method call.
- *
- * @param year the year to set in the returned date
- * @return a {@code JapaneseDate} based on this date with the requested year-of-era, never null
- * @throws DateTimeException if {@code year} is invalid
- */
- private JapaneseDate withYear(int year) {
- return withYear((JapaneseEra) getEra(), year);
- }
-
- //-----------------------------------------------------------------------
- @Override
- JapaneseDate plusYears(long years) {
- return with(isoDate.plusYears(years));
- }
-
- @Override
- JapaneseDate plusMonths(long months) {
- return with(isoDate.plusMonths(months));
- }
-
- @Override
- JapaneseDate plusDays(long days) {
- return with(isoDate.plusDays(days));
- }
-
- private JapaneseDate with(LocalDate newDate) {
- return (newDate.equals(isoDate) ? this : new JapaneseDate(newDate));
- }
-
- @Override // override for performance
- public long toEpochDay() {
- return isoDate.toEpochDay();
- }
-
- //-------------------------------------------------------------------------
- @Override // override for performance
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj instanceof JapaneseDate) {
- JapaneseDate otherDate = (JapaneseDate) obj;
- return this.isoDate.equals(otherDate.isoDate);
- }
- return false;
- }
-
- @Override // override for performance
- public int hashCode() {
- return getChrono().getId().hashCode() ^ isoDate.hashCode();
- }
-
- @Override
- public String toString() {
- if (era == JapaneseEra.SEIREKI) {
- return getChrono().getId() + " " + isoDate.toString();
- }
- return super.toString();
- }
-
- //-----------------------------------------------------------------------
- private Object writeReplace() {
- return new Ser(Ser.JAPANESE_DATE_TYPE, this);
- }
-
- void writeExternal(DataOutput out) throws IOException {
- // JapaneseChrono is implicit in the JAPANESE_DATE_TYPE
- out.writeInt(get(YEAR));
- out.writeByte(get(MONTH_OF_YEAR));
- out.writeByte(get(DAY_OF_MONTH));
- }
-
- static ChronoLocalDate