src/java.base/share/classes/java/time/format/ZoneName.java

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 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) 2013, 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.  Oracle designates this
*** 409,419 ****
          "Atlantic/Faeroe", "Europe_Western", "Atlantic/Canary",
          "America/North_Dakota/Center", "America_Central", "America/Chicago",
          "Pacific/Wake", "Wake", "Pacific/Wake",
          "Pacific/Pago_Pago", "Samoa", "Pacific/Apia",
          "America/Moncton", "Atlantic", "America/Halifax",
!         "Africa/Sao_Tome", "GMT", "Atlantic/Reykjavik",
          "America/Glace_Bay", "Atlantic", "America/Halifax",
          "Asia/Jakarta", "Indonesia_Western", "Asia/Jakarta",
          "Africa/Asmera", "Africa_Eastern", "Africa/Nairobi",
          "Europe/Lisbon", "Europe_Western", "Atlantic/Canary",
          "America/Dawson", "America_Pacific", "America/Los_Angeles",
--- 409,419 ----
          "Atlantic/Faeroe", "Europe_Western", "Atlantic/Canary",
          "America/North_Dakota/Center", "America_Central", "America/Chicago",
          "Pacific/Wake", "Wake", "Pacific/Wake",
          "Pacific/Pago_Pago", "Samoa", "Pacific/Apia",
          "America/Moncton", "Atlantic", "America/Halifax",
!         "Africa/Sao_Tome", "Africa_Western", "Africa/Lagos",
          "America/Glace_Bay", "Atlantic", "America/Halifax",
          "Asia/Jakarta", "Indonesia_Western", "Asia/Jakarta",
          "Africa/Asmera", "Africa_Eastern", "Africa/Nairobi",
          "Europe/Lisbon", "Europe_Western", "Atlantic/Canary",
          "America/Dawson", "America_Pacific", "America/Los_Angeles",
*** 492,502 ****
          "Asia/Irkutsk", "Irkutsk", "Asia/Irkutsk",
          "Asia/Katmandu", "Nepal", "Asia/Katmandu",
          "America/Kralendijk", "Atlantic", "America/Halifax",
      };
      private static final String[] mzoneMap = new String[] {
-         "GMT", "ST", "Africa/Sao_Tome",
          "GMT", "ML", "Africa/Bamako",
          "GMT", "IE", "Europe/Dublin",
          "GMT", "SN", "Africa/Dakar",
          "GMT", "GH", "Africa/Accra",
          "GMT", "CI", "Africa/Abidjan",
--- 492,501 ----
*** 507,516 ****
--- 506,516 ----
          "GMT", "GN", "Africa/Conakry",
          "GMT", "SH", "Atlantic/St_Helena",
          "GMT", "GB", "Europe/London",
          "GMT", "LR", "Africa/Monrovia",
          "GMT", "TG", "Africa/Lome",
+         "Africa_Western", "ST", "Africa/Sao_Tome",
          "Africa_Western", "CF", "Africa/Bangui",
          "Africa_Western", "NE", "Africa/Niamey",
          "Africa_Western", "CM", "Africa/Douala",
          "Africa_Western", "CD", "Africa/Kinshasa",
          "Africa_Western", "CG", "Africa/Brazzaville",