--- old/src/share/classes/java/time/calendar/JapaneseEra.java 2013-02-08 10:48:18.000000000 -0800 +++ /dev/null 2013-01-18 16:17:08.886776012 -0800 @@ -1,335 +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 java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.io.InvalidObjectException; -import java.io.ObjectStreamException; -import java.io.Serializable; -import java.time.DateTimeException; -import java.time.LocalDate; -import java.time.temporal.Era; -import java.util.Arrays; - -import sun.util.calendar.CalendarDate; - -/** - * An era in the Japanese Imperial calendar system. - *
- * This class defines the valid eras for the Japanese chronology. - * Only Meiji (1868-09-08 - 1912-07-29) and later eras are supported. - * Japan introduced the Gregorian calendar since Meiji 6. The dates - * between Meiji 1 - 5 are not historically correct. - * The older eras are recognized as Seireki (Western calendar) era, - * and the year of era of Seireki is proleptic Gregorian year. - * (The Julian to Gregorian transition is not supported.) - * - *
- * The {@link #SHOWA} era that contains 1970-01-01 (ISO calendar system) has the value 1 - * Later era is numbered 2 ({@link #HEISEI}). Earlier eras are numbered 0 ({@link #TAISHO}), - * -1 ({@link #MEIJI}), only Meiji and later eras are supported. The prior to Meiji, - * {@link #SEIREKI} is used. - * - * @param japaneseEra the era to represent - * @return the {@code JapaneseEra} singleton, never null - * @throws DateTimeException if {@code japaneseEra} is invalid - */ - public static JapaneseEra of(int japaneseEra) { - if (japaneseEra != SEIREKI.eraValue && - (japaneseEra < MEIJI.eraValue || japaneseEra > HEISEI.eraValue)) { - throw new DateTimeException("japaneseEra is invalid"); - } - return KNOWN_ERAS[ordinal(japaneseEra)]; - } - - /** - * Returns an array of JapaneseEras. - * @return an array of JapaneseEras - */ - static JapaneseEra[] values() { - return Arrays.copyOf(KNOWN_ERAS, KNOWN_ERAS.length); - } - - //----------------------------------------------------------------------- - /** - * Obtains an instance of {@code JapaneseEra} from a date. - * - * @param date the date, not null - * @return the Era singleton, never null - */ - static JapaneseEra from(LocalDate date) { - for (int i = KNOWN_ERAS.length - 1; i > 0; i--) { - JapaneseEra era = KNOWN_ERAS[i]; - if (date.compareTo(era.since) >= 0) { - return era; - } - } - return SEIREKI; - } - - static JapaneseEra toJapaneseEra(sun.util.calendar.Era privateEra) { - for (int i = ERA_CONFIG.length - 1; i > 0; i--) { - if (ERA_CONFIG[i].equals(privateEra)) { - return KNOWN_ERAS[i]; - } - } - return SEIREKI; - } - - static sun.util.calendar.Era privateEraFrom(LocalDate isoDate) { - for (int i = KNOWN_ERAS.length - 1; i > 0; i--) { - JapaneseEra era = KNOWN_ERAS[i]; - if (isoDate.compareTo(era.since) >= 0) { - return ERA_CONFIG[i]; - } - } - return null; - } - - /** - * Returns the index into the arrays from the Era value. - * the eraValue is a valid Era number, -999, -1..2. - * @param eravalue the era value to convert to the index - * @return the index of the current Era - */ - private static int ordinal(int eravalue) { - return (eravalue == SEIREKI.eraValue) ? 0 : eravalue + ERA_OFFSET; - } - - //----------------------------------------------------------------------- - /** - * Returns the numeric value of this {@code JapaneseEra}. - *
- * The {@link #SHOWA} era that contains 1970-01-01 (ISO calendar system) has the value 1. - * Later eras are numbered from 2 ({@link #HEISEI}). - * Earlier eras are numbered 0 ({@link #TAISHO}), -1 ({@link #MEIJI}), and -999 ({@link #SEIREKI}). - * - * @return the era value - */ - @Override - public int getValue() { - return eraValue; - } - - @Override - public JapaneseChrono getChrono() { - return JapaneseChrono.INSTANCE; - } - - //----------------------------------------------------------------------- - String getAbbreviation() { - int index = ordinal(getValue()); - if (index == 0) { - return ""; - } - return ERA_CONFIG[index].getAbbreviation(); - } - - String getName() { - int index = ordinal(getValue()); - if (index == 0) { - return "Seireki"; - } - return ERA_CONFIG[index].getName(); - } - - @Override - public String toString() { - return getName(); - } - - //----------------------------------------------------------------------- - private Object writeReplace() { - return new Ser(Ser.JAPANESE_ERA_TYPE, this); - } - - void writeExternal(DataOutput out) throws IOException { - out.writeByte(this.getValue()); - } - - static JapaneseEra readExternal(DataInput in) throws IOException { - byte eraValue = in.readByte(); - return JapaneseEra.of(eraValue); - } - -} --- /dev/null 2013-01-18 16:17:08.886776012 -0800 +++ new/src/share/classes/java/time/chrono/JapaneseEra.java 2013-02-08 10:48:18.000000000 -0800 @@ -0,0 +1,334 @@ +/* + * 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.chrono; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.io.InvalidObjectException; +import java.io.ObjectStreamException; +import java.io.Serializable; +import java.time.DateTimeException; +import java.time.LocalDate; +import java.util.Arrays; + +import sun.util.calendar.CalendarDate; + +/** + * An era in the Japanese Imperial calendar system. + *
+ * This class defines the valid eras for the Japanese chronology. + * Only Meiji (1868-09-08 - 1912-07-29) and later eras are supported. + * Japan introduced the Gregorian calendar since Meiji 6. The dates + * between Meiji 1 - 5 are not historically correct. + * The older eras are recognized as Seireki (Western calendar) era, + * and the year of era of Seireki is proleptic Gregorian year. + * (The Julian to Gregorian transition is not supported.) + * + *
+ * The {@link #SHOWA} era that contains 1970-01-01 (ISO calendar system) has the value 1 + * Later era is numbered 2 ({@link #HEISEI}). Earlier eras are numbered 0 ({@link #TAISHO}), + * -1 ({@link #MEIJI}), only Meiji and later eras are supported. The prior to Meiji, + * {@link #SEIREKI} is used. + * + * @param japaneseEra the era to represent + * @return the {@code JapaneseEra} singleton, never null + * @throws DateTimeException if {@code japaneseEra} is invalid + */ + public static JapaneseEra of(int japaneseEra) { + if (japaneseEra != SEIREKI.eraValue && + (japaneseEra < MEIJI.eraValue || japaneseEra > HEISEI.eraValue)) { + throw new DateTimeException("japaneseEra is invalid"); + } + return KNOWN_ERAS[ordinal(japaneseEra)]; + } + + /** + * Returns an array of JapaneseEras. + * @return an array of JapaneseEras + */ + static JapaneseEra[] values() { + return Arrays.copyOf(KNOWN_ERAS, KNOWN_ERAS.length); + } + + //----------------------------------------------------------------------- + /** + * Obtains an instance of {@code JapaneseEra} from a date. + * + * @param date the date, not null + * @return the Era singleton, never null + */ + static JapaneseEra from(LocalDate date) { + for (int i = KNOWN_ERAS.length - 1; i > 0; i--) { + JapaneseEra era = KNOWN_ERAS[i]; + if (date.compareTo(era.since) >= 0) { + return era; + } + } + return SEIREKI; + } + + static JapaneseEra toJapaneseEra(sun.util.calendar.Era privateEra) { + for (int i = ERA_CONFIG.length - 1; i > 0; i--) { + if (ERA_CONFIG[i].equals(privateEra)) { + return KNOWN_ERAS[i]; + } + } + return SEIREKI; + } + + static sun.util.calendar.Era privateEraFrom(LocalDate isoDate) { + for (int i = KNOWN_ERAS.length - 1; i > 0; i--) { + JapaneseEra era = KNOWN_ERAS[i]; + if (isoDate.compareTo(era.since) >= 0) { + return ERA_CONFIG[i]; + } + } + return null; + } + + /** + * Returns the index into the arrays from the Era value. + * the eraValue is a valid Era number, -999, -1..2. + * @param eravalue the era value to convert to the index + * @return the index of the current Era + */ + private static int ordinal(int eravalue) { + return (eravalue == SEIREKI.eraValue) ? 0 : eravalue + ERA_OFFSET; + } + + //----------------------------------------------------------------------- + /** + * Returns the numeric value of this {@code JapaneseEra}. + *
+ * The {@link #SHOWA} era that contains 1970-01-01 (ISO calendar system) has the value 1. + * Later eras are numbered from 2 ({@link #HEISEI}). + * Earlier eras are numbered 0 ({@link #TAISHO}), -1 ({@link #MEIJI}), and -999 ({@link #SEIREKI}). + * + * @return the era value + */ + @Override + public int getValue() { + return eraValue; + } + + @Override + public JapaneseChronology getChronology() { + return JapaneseChronology.INSTANCE; + } + + //----------------------------------------------------------------------- + String getAbbreviation() { + int index = ordinal(getValue()); + if (index == 0) { + return ""; + } + return ERA_CONFIG[index].getAbbreviation(); + } + + String getName() { + int index = ordinal(getValue()); + if (index == 0) { + return "Seireki"; + } + return ERA_CONFIG[index].getName(); + } + + @Override + public String toString() { + return getName(); + } + + //----------------------------------------------------------------------- + private Object writeReplace() { + return new Ser(Ser.JAPANESE_ERA_TYPE, this); + } + + void writeExternal(DataOutput out) throws IOException { + out.writeByte(this.getValue()); + } + + static JapaneseEra readExternal(DataInput in) throws IOException { + byte eraValue = in.readByte(); + return JapaneseEra.of(eraValue); + } + +}