Merge

.hgtags

@@ -964,6 +964,7 @@ dc2aeed27f71f87d52a81520773e64a06f8c8978 jdk8u201-b06
 a1845b252425953875de75560822576eddc185a8 jdk8u201-b76
 0a19f694c42c6d8e545743e3df938e80d3d56b87 jdk8u201-b07
 f0611120a4b7deae2219f72c5919712f1662ad9b jdk8u201-b77
+21ffcdd4d850dd240338c211bbeecb79c38e5403 jdk8u201-b08
 9da3ff5cd435240bc4941bc1c2ca170c567e012f jdk8u202-b01
 478a4add975beb90696a4ead5f8fcd9c17fc1a83 jdk8u202-b02
 03719dd7706173821b51f42b20ac3cb040696a56 jdk8u202-b03

src/macosx/native/sun/font/CCharToGlyphMapper.m

 /*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, 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.
+ * 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

src/share/classes/java/time/chrono/HijrahEra.java

@@ -64,13 +64,10 @@ package java.time.chrono;
 import static java.time.temporal.ChronoField.ERA;
 
 import java.time.DateTimeException;
-import java.time.format.DateTimeFormatterBuilder;
-import java.time.format.TextStyle;
 import java.time.temporal.ChronoField;
 import java.time.temporal.TemporalField;
 import java.time.temporal.UnsupportedTemporalTypeException;
 import java.time.temporal.ValueRange;
-import java.util.Locale;
 
 /**
  * An era in the Hijrah calendar system.
@@ -158,18 +155,4 @@ public enum HijrahEra implements Era {
         return Era.super.range(field);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param style {@inheritDoc}
-     * @param locale {@inheritDoc}
-     */
-    @Override
-    public String getDisplayName(TextStyle style, Locale locale) {
-        return new DateTimeFormatterBuilder()
-            .appendText(ERA, style)
-            .toFormatter(locale)
-            .withChronology(HijrahChronology.INSTANCE)
-            .format(HijrahDate.now());
-}
 }

src/share/classes/java/time/chrono/MinguoEra.java

@@ -61,12 +61,7 @@
  */
 package java.time.chrono;
 
-import static java.time.temporal.ChronoField.ERA;
-
 import java.time.DateTimeException;
-import java.time.format.DateTimeFormatterBuilder;
-import java.time.format.TextStyle;
-import java.util.Locale;
 
 /**
  * An era in the Minguo calendar system.
@@ -157,19 +152,4 @@ public enum MinguoEra implements Era {
         return ordinal();
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param style {@inheritDoc}
-     * @param locale {@inheritDoc}
-     */
-    @Override
-    public String getDisplayName(TextStyle style, Locale locale) {
-        return new DateTimeFormatterBuilder()
-            .appendText(ERA, style)
-            .toFormatter(locale)
-            .withChronology(MinguoChronology.INSTANCE)
-            .format(this == ROC ? MinguoDate.of(1, 1, 1) : MinguoDate.of(0, 1, 1));
-}
-
 }

src/share/classes/java/time/chrono/ThaiBuddhistEra.java

@@ -61,12 +61,7 @@
  */
 package java.time.chrono;
 
-import static java.time.temporal.ChronoField.ERA;
-
 import java.time.DateTimeException;
-import java.time.format.DateTimeFormatterBuilder;
-import java.time.format.TextStyle;
-import java.util.Locale;
 
 /**
  * An era in the Thai Buddhist calendar system.
@@ -157,19 +152,4 @@ public enum ThaiBuddhistEra implements Era {
         return ordinal();
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param style {@inheritDoc}
-     * @param locale {@inheritDoc}
-     */
-    @Override
-    public String getDisplayName(TextStyle style, Locale locale) {
-        return new DateTimeFormatterBuilder()
-            .appendText(ERA, style)
-            .toFormatter(locale)
-            .withChronology(ThaiBuddhistChronology.INSTANCE)
-            .format(this == BE ? ThaiBuddhistDate.of(1, 1, 1) : ThaiBuddhistDate.of(0, 1, 1));
-}
-
 }

test/java/time/test/java/time/chrono/TestEraDisplayName.java

@@ -39,7 +39,7 @@ import static org.testng.Assert.assertEquals;
  * chrono implementation.
  * Note: The exact result may depend on locale data provider's implementation.
  *
- * @bug 8171049
+ * @bug 8171049 8215377
  * @run testng/othervm -Djava.locale.providers=CLDR TestEraDisplayName
  */
 @Test
@@ -90,45 +90,6 @@ public class TestEraDisplayName {
             { JapaneseEra.TAISHO,   TextStyle.NARROW,   Locale.JAPAN,   "T" },
             { JapaneseEra.SHOWA,    TextStyle.NARROW,   Locale.JAPAN,   "S" },
             { JapaneseEra.HEISEI,   TextStyle.NARROW,   Locale.JAPAN,   "H" },
-
-            // ThaiBuddhistEra
-            { ThaiBuddhistEra.BEFORE_BE,    TextStyle.FULL, Locale.US,      "BC" },
-            { ThaiBuddhistEra.BE,           TextStyle.FULL, Locale.US,      "B.E." },
-            { ThaiBuddhistEra.BEFORE_BE,    TextStyle.FULL, THAI,           "BC" },
-            { ThaiBuddhistEra.BE,           TextStyle.FULL, THAI,
-                "\u0e1e\u0e38\u0e17\u0e18\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a" },
-            { ThaiBuddhistEra.BEFORE_BE,    TextStyle.SHORT, Locale.US,     "BC" },
-            { ThaiBuddhistEra.BE,           TextStyle.SHORT, Locale.US,     "B.E." },
-            { ThaiBuddhistEra.BEFORE_BE,    TextStyle.SHORT, THAI,
-                "\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19\u0e04\u0e23\u0e34\u0e2a" +
-                "\u0e15\u0e4c\u0e01\u0e32\u0e25\u0e17\u0e35\u0e48" },
-            { ThaiBuddhistEra.BE,           TextStyle.SHORT, THAI,  "\u0e1e.\u0e28." },
-            { ThaiBuddhistEra.BEFORE_BE,    TextStyle.NARROW, Locale.US,    "BC" },
-            { ThaiBuddhistEra.BE,           TextStyle.NARROW, Locale.US,    "B.E." },
-            { ThaiBuddhistEra.BEFORE_BE,    TextStyle.NARROW, THAI,         "BC" },
-            { ThaiBuddhistEra.BE,           TextStyle.NARROW, THAI,         "B.E." },
-
-            // MinguoEra
-            { MinguoEra.BEFORE_ROC, TextStyle.FULL,     Locale.US,      "Before R.O.C." },
-            { MinguoEra.ROC,        TextStyle.FULL,     Locale.US,      "R.O.C." },
-            { MinguoEra.BEFORE_ROC, TextStyle.FULL,     Locale.TAIWAN,  "\u6c11\u570b\u524d" },
-            { MinguoEra.ROC,        TextStyle.FULL,     Locale.TAIWAN,  "\u6c11\u570b" },
-            { MinguoEra.BEFORE_ROC, TextStyle.SHORT,    Locale.US,      "Before R.O.C." },
-            { MinguoEra.ROC,        TextStyle.SHORT,    Locale.US,      "R.O.C." },
-            { MinguoEra.BEFORE_ROC, TextStyle.SHORT,    Locale.TAIWAN,  "\u6c11\u570b\u524d" },
-            { MinguoEra.ROC,        TextStyle.SHORT,    Locale.TAIWAN,  "\u6c11\u570b" },
-            { MinguoEra.BEFORE_ROC, TextStyle.NARROW,   Locale.US,      "0" },
-            { MinguoEra.ROC,        TextStyle.NARROW,   Locale.US,      "1" },
-            { MinguoEra.BEFORE_ROC, TextStyle.NARROW,   Locale.TAIWAN,  "0" },
-            { MinguoEra.ROC,        TextStyle.NARROW,   Locale.TAIWAN,  "1" },
-
-            // HijrahEra
-            { HijrahEra.AH, TextStyle.FULL,     Locale.US,  "AH" },
-            { HijrahEra.AH, TextStyle.FULL,     EGYPT,      "\u0647\u0640" },
-            { HijrahEra.AH, TextStyle.SHORT,    Locale.US,  "AH" },
-            { HijrahEra.AH, TextStyle.SHORT,    EGYPT,      "\u0647\u0640" },
-            { HijrahEra.AH, TextStyle.NARROW,   Locale.US,  "1" },
-            { HijrahEra.AH, TextStyle.NARROW,   EGYPT,      "1" },
         };
     }