< prev index next >
src/java.base/share/classes/java/util/spi/CalendarNameProvider.java
Print this page
rev 54351 : 8174268: Declare a public field in JapaneseEra for the era starting May 2019
Reviewed-by: rriggs
*** 1,7 ****
/*
! * Copyright (c) 2012, 2017, 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
--- 1,7 ----
/*
! * Copyright (c) 2012, 2019, 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
*** 112,123 ****
* <tr>
* <th scope="row" style="font-weight:normal">1</th>
* <td>B.E. (Buddhist Era)</td>
* </tr>
* <tr>
! * <th scope="row" rowspan="6" style="font-weight:normal; text-align:left; vertical-align:top">{@code "japanese"}</th>
! * <th scope="row" rowspan="5" style="font-weight:normal; text-align:left; vertical-align:top">{@link Calendar#ERA}</th>
* <th scope="row" style="font-weight:normal">0</th>
* <td>Seireki (Before Meiji)</td>
* </tr>
* <tr>
* <th scope="row" style="font-weight:normal">1</th>
--- 112,123 ----
* <tr>
* <th scope="row" style="font-weight:normal">1</th>
* <td>B.E. (Buddhist Era)</td>
* </tr>
* <tr>
! * <th scope="row" rowspan="7" style="font-weight:normal; text-align:left; vertical-align:top">{@code "japanese"}</th>
! * <th scope="row" rowspan="6" style="font-weight:normal; text-align:left; vertical-align:top">{@link Calendar#ERA}</th>
* <th scope="row" style="font-weight:normal">0</th>
* <td>Seireki (Before Meiji)</td>
* </tr>
* <tr>
* <th scope="row" style="font-weight:normal">1</th>
*** 131,141 ****
* <th scope="row" style="font-weight:normal">3</th>
* <td>Showa</td>
* </tr>
* <tr>
* <th scope="row" style="font-weight:normal">4</th>
! * <td >Heisei</td>
* </tr>
* <tr>
* <th scope="row" style="font-weight:normal; text-align:left; vertical-align:top">{@link Calendar#YEAR}</th>
* <th scope="row" style="font-weight:normal">1</th>
* <td>the first year in each era. It should be returned when a long
--- 131,145 ----
* <th scope="row" style="font-weight:normal">3</th>
* <td>Showa</td>
* </tr>
* <tr>
* <th scope="row" style="font-weight:normal">4</th>
! * <td>Heisei</td>
! * </tr>
! * <tr>
! * <th scope="row" style="font-weight:normal">5</th>
! * <td>Reiwa</td>
* </tr>
* <tr>
* <th scope="row" style="font-weight:normal; text-align:left; vertical-align:top">{@link Calendar#YEAR}</th>
* <th scope="row" style="font-weight:normal">1</th>
* <td>the first year in each era. It should be returned when a long
< prev index next >