archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8174268: Declare a public field in JapaneseEra for the era starting May 2019

Browse source 
Reviewed-by: rriggs, chegar
This commit is contained in:
Naoto Sato 2019-04-01 08:21:45 -07:00
parent 2a510a6353
commit 0b2e2ca9bd
7 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/java.base/share/classes/java/util/spi/CalendarNameProvider.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
* 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
@ -114,8 +114,8 @@ import java.util.Map;
* <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" 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>
@ -133,7 +133,11 @@ import java.util.Map;
* </tr>
* <tr>
* <th scope="row" style="font-weight:normal">4</th>
* <td >Heisei</td>
* <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>