Mercurial > hg > release > icedtea7-forest-2.5 > jdk

changeset 7587:5607f5a99784 icedtea-2.5pre07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u60-b30
author andrew
date Wed, 04 Jun 2014 15:54:23 +0100
parents 15e860e2ce20 (current diff) 33c1eee28403 (diff)
children 9fa3542b3afb
files .hgtags test/java/awt/Toolkit/ToolkitPropertyTest/NoAppContextTest.java
diffstat 21 files changed, 104 insertions(+), 241 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jun 04 15:41:31 2014 +0100
+++ b/.hgtags	Wed Jun 04 15:54:23 2014 +0100
@@ -439,3 +439,8 @@
 2cef4a93bcb881190a1d828dfae1574c535bb19a icedtea-2.5pre04
 575b3a2fa6c940036a9ab6b554bcfe76f5151add icedtea-2.5pre06
 6cb22bfdd98bd5b97eadaad926b52e8582f63077 icedtea-2.5pre05
+41547583c3a035c3924ffedfa8704e58d69e5c50 jdk7u60-b16
+e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b18
+e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b17
+7190843ddaf4f3ad158c3071be0f4ca42a5802dc jdk7u60-b19
+8dc56d0f3e860658619eaa57d10fb1a4182d71cd jdk7u60-b30
--- a/make/sun/javazic/tzdata/VERSION	Wed Jun 04 15:41:31 2014 +0100
+++ b/make/sun/javazic/tzdata/VERSION	Wed Jun 04 15:54:23 2014 +0100
@@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2014a
+tzdata2014b
--- a/make/sun/javazic/tzdata/africa	Wed Jun 04 15:41:31 2014 +0100
+++ b/make/sun/javazic/tzdata/africa	Wed Jun 04 15:54:23 2014 +0100
@@ -891,7 +891,10 @@
 # Another source (specifying the time for start and end in the decree):
 # http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
 
-# From Paul Eggert (2013-10-03):
+# From Sebastien Willemijns (2014-03-18):
+# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp
+
+# From Paul Eggert (2014-03-19):
 # To estimate what the Moroccan government will do in future years,
 # transition dates for 2014 through 2038 were determined by running
 # the following program under GNU Emacs 24.3:
--- a/make/sun/javazic/tzdata/antarctica	Wed Jun 04 15:41:31 2014 +0100
+++ b/make/sun/javazic/tzdata/antarctica	Wed Jun 04 15:54:23 2014 +0100
@@ -253,24 +253,41 @@
 # year-round base
 # Scott Base, Ross Island, since 1957-01.
 # See Pacific/Auckland.
-#
-# These rules for New Zealand are stolen from the 'australasia' file.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	NZAQ	1974	only	-	Nov	 3	2:00s	1:00	D
-Rule	NZAQ	1975	1988	-	Oct	lastSun	2:00s	1:00	D
-Rule	NZAQ	1989	only	-	Oct	 8	2:00s	1:00	D
-Rule	NZAQ	1990	2006	-	Oct	Sun>=1	2:00s	1:00	D
-Rule	NZAQ	1975	only	-	Feb	23	2:00s	0	S
-Rule	NZAQ	1976	1989	-	Mar	Sun>=1	2:00s	0	S
-Rule	NZAQ	1990	2007	-	Mar	Sun>=15	2:00s	0	S
-Rule	NZAQ	2007	max	-	Sep	lastSun	2:00s	1:00	D
-Rule	NZAQ	2008	max	-	Apr	Sun>=1	2:00s	0	S
 
 # Norway - territories
 # Bouvet (never inhabited)
 #
 # claims
 # Peter I Island (never inhabited)
+#
+# year-round base
+# Troll, Queen Maud Land, -720041+0023206, since 2005-02-12
+#
+# From Paul-Inge Flakstad (2014-03-10):
+# I recently had a long dialog about this with the developer of timegenie.com.
+# In the absence of specific dates, he decided to choose some likely ones:
+#   GMT +1 - From March 1 to the last Sunday in March
+#   GMT +2 - From the last Sunday in March until the last Sunday in October
+#   GMT +1 - From the last Sunday in October until November 7
+#   GMT +0 - From November 7 until March 1
+# The dates for switching to and from UTC+0 will probably not be absolutely
+# correct, but they should be quite close to the actual dates.
+#
+# From Paul Eggert (2014-03-21):
+# The CET-switching Troll rules require zic from tzcode 2014b or later, so as
+# suggested by Bengt-Inge Larsson comment them out for now, and approximate
+# with only UTC and CEST.  Uncomment them when 2014b is more prevalent.
+#
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+#Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	CET
+Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	CEST
+#Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	CET
+#Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	UTC
+# Remove the following line when uncommenting the above '#Rule' lines.
+Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	UTC
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Antarctica/Troll	0	-	zzz	2005 Feb 12
+     			0:00	Troll	%s
 
 # Poland - year-round base
 # Arctowski, King George Island, -620945-0582745, since 1977
--- a/make/sun/javazic/tzdata/australasia	Wed Jun 04 15:41:31 2014 +0100
+++ b/make/sun/javazic/tzdata/australasia	Wed Jun 04 15:54:23 2014 +0100
@@ -786,14 +786,29 @@
 
 # Johnston
 #
-# From Paul Eggert (2013-09-03):
+# From Paul Eggert (2014-03-11):
+# Sometimes Johnston kept Hawaii time, and sometimes it was an hour behind.
+# Details are uncertain.  We have no data for Johnston after 1970, so
+# treat it like Hawaii for now.
+#
 # In his memoirs of June 6th to October 4, 1945
 # <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes,
 # "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM
 # Johnston time, 1:30 AM Kwajalein time."  This was in June 1945, and
 # confirms that Johnston kept the same time as Honolulu in summer 1945.
-# We have no better information, so for now, assume this has been true
-# indefinitely into the past.
+#
+# From Lyle McElhaney (2014-03-11):
+# [W]hen JI was being used for that [atomic bomb] testing, the time being used
+# was not Hawaiian time but rather the same time being used on the ships,
+# which had a GMT offset of -11 hours.  This apparently applied to at least the
+# time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last
+# Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin,
+# "The United States High-Altitude Test Experience: A Review Emphasizing the
+# Impact on the Environment", Los Alamos LA-6405, Oct 1976
+# <http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf>.
+# See the table on page 4 where he lists GMT and local times for the tests; a
+# footnote for the JI tests reads that local time is "JI time = Hawaii Time
+# Minus One Hour".
 #
 # See 'northamerica' for Pacific/Johnston.
 
--- a/make/sun/javazic/tzdata/europe	Wed Jun 04 15:41:31 2014 +0100
+++ b/make/sun/javazic/tzdata/europe	Wed Jun 04 15:54:23 2014 +0100
@@ -2986,7 +2986,11 @@
 # Assume it happened in March by not changing the clocks.
 			3:00	Russia	MSK/MSD	1997
 			3:00	-	MSK	1997 Mar lastSun 1:00u
-			2:00	EU	EE%sT
+# From Alexander Krivenyshev (2014-03-17):
+# time change at 2:00 (2am) on March 30, 2014
+# http://vz.ru/news/2014/3/17/677464.html
+			2:00	EU	EE%sT	2014 Mar 30 2:00
+			4:00	-	MSK
 
 # Vatican City
 # See Europe/Rome.
--- a/make/sun/javazic/tzdata/leapseconds	Wed Jun 04 15:41:31 2014 +0100
+++ b/make/sun/javazic/tzdata/leapseconds	Wed Jun 04 15:54:23 2014 +0100
@@ -20,7 +20,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-
+#
 # Allowance for leapseconds added to each timezone file.
 
 # This file is in the public domain.
--- a/make/sun/javazic/tzdata/zone.tab	Wed Jun 04 15:41:31 2014 +0100
+++ b/make/sun/javazic/tzdata/zone.tab	Wed Jun 04 15:54:23 2014 +0100
@@ -74,6 +74,7 @@
 AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
 AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Terre Adelie
 AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
 AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
 AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
@@ -366,6 +367,7 @@
 RU	+5545+03735	Europe/Moscow	Moscow+00 - west Russia
 RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
 RU	+5312+05009	Europe/Samara	Moscow+00 - Samara, Udmurtia
+RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
 RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
 RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
 RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
@@ -421,7 +423,6 @@
 UA	+5026+03031	Europe/Kiev	most locations
 UA	+4837+02218	Europe/Uzhgorod	Ruthenia
 UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
-UA	+4457+03406	Europe/Simferopol	central Crimea
 UG	+0019+03225	Africa/Kampala
 UM	+1645-16931	Pacific/Johnston	Johnston Atoll
 UM	+2813-17722	Pacific/Midway	Midway Islands
--- a/src/share/classes/sun/util/resources/TimeZoneNames.java	Wed Jun 04 15:41:31 2014 +0100
+++ b/src/share/classes/sun/util/resources/TimeZoneNames.java	Wed Jun 04 15:54:23 2014 +0100
@@ -477,6 +477,8 @@
             {"Antarctica/South_Pole", NZST},
             {"Antarctica/Syowa", new String[] {"Syowa Time", "SYOT",
                                                "Syowa Summer Time", "SYOST"}},
+            {"Antarctica/Troll", new String[] {"Coordinated Universal Time", "UTC",
+                                               "Central European Summer Time", "CEST"}},
             {"Antarctica/Vostok", new String[] {"Vostok Time", "VOST",
                                                 "Vostok Summer Time", "VOSST"}},
             {"Arctic/Longyearbyen", CET},
@@ -707,7 +709,7 @@
                                             "Samara Summer Time", "SAMST"}},
             {"Europe/San_Marino", CET},
             {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", EET},
+            {"Europe/Simferopol", MSK},
             {"Europe/Skopje", CET},
             {"Europe/Sofia", EET},
             {"Europe/Stockholm", CET},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_de.java	Wed Jun 04 15:41:31 2014 +0100
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_de.java	Wed Jun 04 15:54:23 2014 +0100
@@ -477,6 +477,8 @@
             {"Antarctica/South_Pole", NZST},
             {"Antarctica/Syowa", new String[] {"Syowa Zeit", "SYOT",
                                                "Syowa Sommerzeit", "SYOST"}},
+            {"Antarctica/Troll", new String[] {"Koordinierte Universalzeit", "UTC",
+                                               "Mitteleurop\u00e4ische Sommerzeit", "MESZ"}},
             {"Antarctica/Vostok", new String[] {"Vostok Zeit", "VOST",
                                                 "Vostok Sommerzeit", "VOSST"}},
             {"Arctic/Longyearbyen", CET},
@@ -707,7 +709,7 @@
                                             "Samarische Sommerzeit", "SAMST"}},
             {"Europe/San_Marino", CET},
             {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", EET},
+            {"Europe/Simferopol", MSK},
             {"Europe/Skopje", CET},
             {"Europe/Sofia", EET},
             {"Europe/Stockholm", CET},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_es.java	Wed Jun 04 15:41:31 2014 +0100
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_es.java	Wed Jun 04 15:54:23 2014 +0100
@@ -477,6 +477,8 @@
             {"Antarctica/South_Pole", NZST},
             {"Antarctica/Syowa", new String[] {"Hora de Syowa", "SYOT",
                                                "Hora de verano de Syowa", "SYOST"}},
+            {"Antarctica/Troll", new String[] {"Hora Universal Coordinada", "UTC",
+                                               "Hora de verano de Europa Central", "CEST"}},
             {"Antarctica/Vostok", new String[] {"Hora de Vostok", "VOST",
                                                 "Hora de verano de Vostok", "VOSST"}},
             {"Arctic/Longyearbyen", CET},
@@ -707,7 +709,7 @@
                                             "Hora de verano de Samara", "SAMST"}},
             {"Europe/San_Marino", CET},
             {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", EET},
+            {"Europe/Simferopol", MSK},
             {"Europe/Skopje", CET},
             {"Europe/Sofia", EET},
             {"Europe/Stockholm", CET},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_fr.java	Wed Jun 04 15:41:31 2014 +0100
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_fr.java	Wed Jun 04 15:54:23 2014 +0100
@@ -477,6 +477,8 @@
             {"Antarctica/South_Pole", NZST},
             {"Antarctica/Syowa", new String[] {"Heure de Syowa", "SYOT",
                                                "Heure d'\u00e9t\u00e9 de Syowa", "SYOST"}},
+            {"Antarctica/Troll", new String[] {"Temps universel coordonn\u00e9", "UTC",
+                                               "Heure d'\u00e9t\u00e9 d'Europe centrale", "CEST"}},
             {"Antarctica/Vostok", new String[] {"Heure de Vostok", "VOST",
                                                 "Heure d'\u00e9t\u00e9 de Vostok", "VOSST"}},
             {"Arctic/Longyearbyen", CET},
@@ -707,7 +709,7 @@
                                             "Heure d'\u00e9t\u00e9 de Samara", "SAMST"}},
             {"Europe/San_Marino", CET},
             {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", EET},
+            {"Europe/Simferopol", MSK},
             {"Europe/Skopje", CET},
             {"Europe/Sofia", EET},
             {"Europe/Stockholm", CET},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_it.java	Wed Jun 04 15:41:31 2014 +0100
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_it.java	Wed Jun 04 15:54:23 2014 +0100
@@ -477,6 +477,8 @@
             {"Antarctica/South_Pole", NZST},
             {"Antarctica/Syowa", new String[] {"Ora di Syowa", "SYOT",
                                                "Ora estiva di Syowa", "SYOST"}},
+            {"Antarctica/Troll", new String[] {"Tempo universale coordinato", "UTC",
+                                               "Ora estiva dell'Europa centrale", "CEST"}},
             {"Antarctica/Vostok", new String[] {"Ora di Vostok", "VOST",
                                                 "Ora estiva di Vostok", "VOSST"}},
             {"Arctic/Longyearbyen", CET},
@@ -707,7 +709,7 @@
                                             "Ora estiva di Samara", "SAMST"}},
             {"Europe/San_Marino", CET},
             {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", EET},
+            {"Europe/Simferopol", MSK},
             {"Europe/Skopje", CET},
             {"Europe/Sofia", EET},
             {"Europe/Stockholm", CET},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_ja.java	Wed Jun 04 15:41:31 2014 +0100
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_ja.java	Wed Jun 04 15:54:23 2014 +0100
@@ -477,6 +477,8 @@
             {"Antarctica/South_Pole", NZST},
             {"Antarctica/Syowa", new String[] {"\u662d\u548c\u57fa\u5730\u6642\u9593", "SYOT",
                                                "\u662d\u548c\u57fa\u5730\u590f\u6642\u9593", "SYOST"}},
+            {"Antarctica/Troll", new String[] {"\u5354\u5b9a\u4e16\u754c\u6642", "UTC",
+                                               "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "CEST"}},
             {"Antarctica/Vostok", new String[] {"\u30dc\u30b9\u30c8\u30fc\u30af\u57fa\u5730\u6642\u9593", "VOST",
                                                 "\u30dc\u30b9\u30c8\u30fc\u30af\u57fa\u5730\u590f\u6642\u9593", "VOSST"}},
             {"Arctic/Longyearbyen", CET},
@@ -707,7 +709,7 @@
                                             "\u30b5\u30de\u30e9\u590f\u6642\u9593", "SAMST"}},
             {"Europe/San_Marino", CET},
             {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", EET},
+            {"Europe/Simferopol", MSK},
             {"Europe/Skopje", CET},
             {"Europe/Sofia", EET},
             {"Europe/Stockholm", CET},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_ko.java	Wed Jun 04 15:41:31 2014 +0100
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_ko.java	Wed Jun 04 15:54:23 2014 +0100
@@ -477,6 +477,8 @@
             {"Antarctica/South_Pole", NZST},
             {"Antarctica/Syowa", new String[] {"Syowa \uc2dc\uac04", "SYOT",
                                                "Syowa \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SYOST"}},
+            {"Antarctica/Troll", new String[] {"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC",
+                                               "\uc911\uc559 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CEST"}},
             {"Antarctica/Vostok", new String[] {"Vostok \uc2dc\uac04", "VOST",
                                                 "Vostok \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VOSST"}},
             {"Arctic/Longyearbyen", CET},
@@ -707,7 +709,7 @@
                                             "\uc0ac\ub9c8\ub77c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAMST"}},
             {"Europe/San_Marino", CET},
             {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", EET},
+            {"Europe/Simferopol", MSK},
             {"Europe/Skopje", CET},
             {"Europe/Sofia", EET},
             {"Europe/Stockholm", CET},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java	Wed Jun 04 15:41:31 2014 +0100
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java	Wed Jun 04 15:54:23 2014 +0100
@@ -477,6 +477,8 @@
             {"Antarctica/South_Pole", NZST},
             {"Antarctica/Syowa", new String[] {"Fuso hor\u00e1rio de Syowa", "SYOT",
                                                "Fuso hor\u00e1rio de ver\u00e3o de Syowa", "SYOST"}},
+            {"Antarctica/Troll", new String[] {"Tempo universal coordenado", "UTC",
+                                               "Fuso hor\u00e1rio de ver\u00e3o da Europa Central", "CEST"}},
             {"Antarctica/Vostok", new String[] {"Fuso hor\u00e1rio de Vostok", "VOST",
                                                 "Fuso hor\u00e1rio de ver\u00e3o de Vostok", "VOSST"}},
             {"Arctic/Longyearbyen", CET},
@@ -707,7 +709,7 @@
                                             "Fuso hor\u00e1rio de ver\u00e3o de Samara", "SAMST"}},
             {"Europe/San_Marino", CET},
             {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", EET},
+            {"Europe/Simferopol", MSK},
             {"Europe/Skopje", CET},
             {"Europe/Sofia", EET},
             {"Europe/Stockholm", CET},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_sv.java	Wed Jun 04 15:41:31 2014 +0100
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_sv.java	Wed Jun 04 15:54:23 2014 +0100
@@ -477,6 +477,8 @@
             {"Antarctica/South_Pole", NZST},
             {"Antarctica/Syowa", new String[] {"Syowa, normaltid", "SYOT",
                                                "Syowa, sommartid", "SYOST"}},
+            {"Antarctica/Troll", new String[] {"Koordinerad universell tid", "UTC",
+                                               "Centraleuropeisk sommartid", "CEST"}},
             {"Antarctica/Vostok", new String[] {"Vostok, normaltid", "VOST",
                                                 "Vostok, sommartid", "VOSST"}},
             {"Arctic/Longyearbyen", CET},
@@ -707,7 +709,7 @@
                                             "Samara, sommartid", "SAMST"}},
             {"Europe/San_Marino", CET},
             {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", EET},
+            {"Europe/Simferopol", MSK},
             {"Europe/Skopje", CET},
             {"Europe/Sofia", EET},
             {"Europe/Stockholm", CET},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java	Wed Jun 04 15:41:31 2014 +0100
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java	Wed Jun 04 15:54:23 2014 +0100
@@ -477,6 +477,8 @@
             {"Antarctica/South_Pole", NZST},
             {"Antarctica/Syowa", new String[] {"Syowa \u65f6\u95f4", "SYOT",
                                                "Syowa \u590f\u4ee4\u65f6", "SYOST"}},
+            {"Antarctica/Troll", new String[] {"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC",
+                                               "\u4e2d\u6b27\u590f\u4ee4\u65f6", "CEST"}},
             {"Antarctica/Vostok", new String[] {"\u83ab\u65af\u6258\u514b\u65f6\u95f4", "VOST",
                                                 "\u83ab\u65af\u6258\u514b\u590f\u4ee4\u65f6", "VOSST"}},
             {"Arctic/Longyearbyen", CET},
@@ -707,7 +709,7 @@
                                             "\u6c99\u9a6c\u62c9\u590f\u4ee4\u65f6", "SAMST"}},
             {"Europe/San_Marino", CET},
             {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", EET},
+            {"Europe/Simferopol", MSK},
             {"Europe/Skopje", CET},
             {"Europe/Sofia", EET},
             {"Europe/Stockholm", CET},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java	Wed Jun 04 15:41:31 2014 +0100
+++ b/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java	Wed Jun 04 15:54:23 2014 +0100
@@ -477,6 +477,8 @@
             {"Antarctica/South_Pole", NZST},
             {"Antarctica/Syowa", new String[] {"\u5915\u6b50\u74e6 (Syowa) \u6642\u9593", "SYOT",
                                                "\u5915\u6b50\u74e6 (Syowa) \u590f\u4ee4\u6642\u9593", "SYOST"}},
+            {"Antarctica/Troll", new String[] {"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC",
+                                               "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "CEST"}},
             {"Antarctica/Vostok", new String[] {"\u4f5b\u65af\u6258 (Vostok) \u6642\u9593", "VOST",
                                                 "\u4f5b\u65af\u6258 (Vostok) \u590f\u4ee4\u6642\u9593", "VOSST"}},
             {"Arctic/Longyearbyen", CET},
@@ -708,7 +710,7 @@
                                             "\u6c99\u99ac\u62c9\u590f\u4ee4\u6642\u9593", "SAMST"}},
             {"Europe/San_Marino", CET},
             {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", EET},
+            {"Europe/Simferopol", MSK},
             {"Europe/Skopje", CET},
             {"Europe/Sofia", EET},
             {"Europe/Stockholm", CET},
--- a/src/windows/classes/sun/awt/windows/WToolkit.java	Wed Jun 04 15:41:31 2014 +0100
+++ b/src/windows/classes/sun/awt/windows/WToolkit.java	Wed Jun 04 15:54:23 2014 +0100
@@ -864,18 +864,12 @@
      * Windows doesn't always send WM_SETTINGCHANGE when it should.
      */
     private void windowsSettingChange() {
-        if (AppContext.getAppContext() == null) {
-            // No AppContext, so we can update properties on the current thread,
-            // DesktopPropertyChangeSupport will only post events.
-            updateProperties();
-        } else {
-            EventQueue.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    updateProperties();
-                }
-            });
-        }
+        EventQueue.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                updateProperties();
+            }
+        });
     }
 
     private synchronized void updateProperties() {
--- a/test/java/awt/Toolkit/ToolkitPropertyTest/NoAppContextTest.java	Wed Jun 04 15:41:31 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8032960
- * @summary checks that desktop properties work if Toolkit thread has no AppContext
- * @author Petr Pchelko
- */
-
-import sun.awt.OSInfo;
-import sun.awt.SunToolkit;
-
-import javax.swing.*;
-import java.awt.*;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-public class NoAppContextTest {
-
-    private static final ThreadGroup stubGroup = new ThreadGroup("stub");
-    private static final ThreadGroup awtGroup = new ThreadGroup("AWT");
-    private static final AtomicBoolean propertyChangeFired = new AtomicBoolean(false);
-    private static Frame frame;
-
-    private static final Object LOCK = new Object();
-
-    public static void main(String[] args) throws Exception {
-
-        if (OSInfo.getOSType() != OSInfo.OSType.WINDOWS) {
-            // The test is for Windows platform only
-            return;
-        }
-
-        createStubContext();
-
-        Thread awtThread = new Thread(awtGroup, new Runnable() {
-            @Override
-            public void run() {
-                SunToolkit.createNewAppContext();
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        synchronized (LOCK) {
-                            frame = new Frame();
-                            frame.setBounds(100, 100, 100, 100);
-                            frame.setVisible(true);
-                            Toolkit.getDefaultToolkit().addPropertyChangeListener("win.propNames", new PropertyChangeListener() {
-                                @Override
-                                public void propertyChange(PropertyChangeEvent ev) {
-                                    propertyChangeFired.set(true);
-                                }
-                            });
-                        }
-                    }
-                });
-            }
-        });
-        awtThread.start();
-        awtThread.join();
-        sync();
-
-        final GraphicsDevice device = GraphicsEnvironment.getLocalGraphicsEnvironment()
-                .getDefaultScreenDevice();
-
-        final AtomicReference<DisplayMode> originalRef = new AtomicReference<>();
-        try {
-            final AtomicBoolean isSupported = new AtomicBoolean(true);
-            invokeInAWT(new Runnable() {
-                @Override
-                public void run() {
-                    if (device.isFullScreenSupported()) {
-                        device.setFullScreenWindow(frame);
-                    } else {
-                        isSupported.set(false);
-                    }
-                }
-            });
-            if (!isSupported.get()) {
-                return;
-            }
-            invokeInAWT(new Runnable() {
-                @Override
-                public void run() {
-                    if (device.isDisplayChangeSupported()) {
-                        DisplayMode original = device.getDisplayMode();
-                        originalRef.set(original);
-                        try {
-                            DisplayMode[] modes = device.getDisplayModes();
-                            for (DisplayMode mode : modes) {
-                                if (!mode.equals(original)) {
-                                    device.setDisplayMode(mode);
-                                    break;
-                                }
-                            }
-                        } finally {
-                            device.setDisplayMode(original);
-                        }
-                    } else {
-                        isSupported.set(false);
-                    }
-                }
-            });
-            if (!isSupported.get()) {
-                return;
-            }
-        } finally {
-            invokeInAWT(new Runnable() {
-                @Override
-                public void run() {
-                    device.setDisplayMode(originalRef.get());
-                    frame.dispose();
-                }
-            });
-        }
-
-        if (!propertyChangeFired.get()) {
-            throw new RuntimeException("Failed: PropertyChange did not fire");
-        }
-    }
-
-    private static void invokeInAWT(final Runnable r) throws InterruptedException {
-        Thread awtThread = new Thread(awtGroup, new Runnable() {
-            @Override
-            public void run() {
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        synchronized (LOCK) {
-                            r.run();
-                        }
-                    }
-                });
-            }
-        });
-        awtThread.start();
-        awtThread.join();
-        sync();
-    }
-
-    private static void createStubContext() throws InterruptedException {
-        Thread stub = new Thread(stubGroup, new Runnable() {
-            @Override
-            public void run() {
-                SunToolkit.createNewAppContext();
-            }
-        });
-        stub.start();
-        stub.join();
-    }
-
-    /**
-     * Runs realSync on a thread with an AppContext and waits for it to finish
-     */
-    private static void sync() throws InterruptedException {
-        final AtomicReference<InterruptedException> exc = new AtomicReference<>(null);
-
-        Thread syncThread = new Thread(awtGroup, new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    ((SunToolkit) Toolkit.getDefaultToolkit()).realSync();
-                    Thread.sleep(2000);
-                } catch (InterruptedException e) {
-                    exc.set(e);
-                }
-            }
-        });
-        syncThread.start();
-        syncThread.join();
-        if (exc.get() != null) {
-            throw exc.get();
-        }
-    }
-}
-