OpenJDK / amber / amber
changeset 44368:268fa1f3e670
8177678: Overstatement of universality of Era.getDisplayName() implementation
Reviewed-by: naoto
| author | darcy |
|---|---|
| date | Mon, 27 Mar 2017 18:38:58 -0700 |
| parents | a81c9c6619fb |
| children | b5c4e28a7521 |
| files | jdk/src/java.base/share/classes/java/time/chrono/Era.java jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java |
| diffstat | 2 files changed, 7 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/java.base/share/classes/java/time/chrono/Era.java Mon Mar 27 15:12:01 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/time/chrono/Era.java Mon Mar 27 18:38:58 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -310,8 +310,8 @@ * The parameters control the style of the returned text and the locale. * <p> * If no textual mapping is found then the {@link #getValue() numeric value} is returned. - * <p> - * This default implementation is suitable for all implementations. + * + * @apiNote This default implementation is suitable for most implementations. * * @param style the style of the text required, not null * @param locale the locale to use, not null
--- a/jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java Mon Mar 27 15:12:01 2017 -0700 +++ b/jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java Mon Mar 27 18:38:58 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -240,19 +240,10 @@ } /** - * Gets the textual representation of this era. - * <p> - * This returns the textual name used to identify the era, - * suitable for presentation to the user. - * The parameters control the style of the returned text and the locale. - * <p> - * If no textual mapping is found then the {@link #getValue() numeric value} - * is returned. + * {@inheritDoc} * - * @param style the style of the text required, not null - * @param locale the locale to use, not null - * @return the text value of the era, not null - * @since 9 + * @param style {@inheritDoc} + * @param locale {@inheritDoc} */ @Override public String getDisplayName(TextStyle style, Locale locale) {