diff --git a/.hgtags b/.hgtags index 79733ebea92a9d155ff0e45289b5c6362001d11f..83aac46927344daecdabb1074e614f80f469844d 100644 --- a/.hgtags +++ b/.hgtags @@ -60,3 +60,7 @@ e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77 9027c6b9d7e2c9ca04a1add691b5b50d0f22b1aa jdk7-b83 7cb9388bb1a16365fa5118c5efa38b1cd58be40d jdk7-b84 b396584a3e64988839cca21ea1f7fbdcc9248783 jdk7-b85 +eae6e9ab26064d9ba0e7665dd646a1fd2506fcc1 jdk7-b86 +2cafbbe9825e911a6ca6c17d9a18eb1f0bf0873c jdk7-b87 +b3c69282f6d3c90ec21056cd1ab70dc0c895b069 jdk7-b88 +4a6abb7e224cc8d9a583c23c5782e4668739a119 jdk7-b89 diff --git a/make/sun/javazic/tzdata/VERSION b/make/sun/javazic/tzdata/VERSION index 07595249769539f2a351c3222ea7f25baaf90d06..5575f59019b6fb5070647119590d6918a55de43b 100644 --- a/make/sun/javazic/tzdata/VERSION +++ b/make/sun/javazic/tzdata/VERSION @@ -21,4 +21,4 @@ # CA 95054 USA or visit www.sun.com if you need additional information or # have any questions. # -tzdata2010b +tzdata2010g diff --git a/make/sun/javazic/tzdata/antarctica b/make/sun/javazic/tzdata/antarctica index bd5cd134765b0be9ed625982c06c6f9140fa88af..4192486fa4223e00c1265a56e55482b92e47b11d 100644 --- a/make/sun/javazic/tzdata/antarctica +++ b/make/sun/javazic/tzdata/antarctica @@ -79,6 +79,33 @@ Rule ChileAQ 1999 only - Apr 4 3:00u 0 - Rule ChileAQ 1999 max - Oct Sun>=9 4:00u 1:00 S Rule ChileAQ 2000 max - Mar Sun>=9 3:00u 0 - +# These rules are stolen from the `australasia' file. +Rule AusAQ 1917 only - Jan 1 0:01 1:00 - +Rule AusAQ 1917 only - Mar 25 2:00 0 - +Rule AusAQ 1942 only - Jan 1 2:00 1:00 - +Rule AusAQ 1942 only - Mar 29 2:00 0 - +Rule AusAQ 1942 only - Sep 27 2:00 1:00 - +Rule AusAQ 1943 1944 - Mar lastSun 2:00 0 - +Rule AusAQ 1943 only - Oct 3 2:00 1:00 - +Rule ATAQ 1967 only - Oct Sun>=1 2:00s 1:00 - +Rule ATAQ 1968 only - Mar lastSun 2:00s 0 - +Rule ATAQ 1968 1985 - Oct lastSun 2:00s 1:00 - +Rule ATAQ 1969 1971 - Mar Sun>=8 2:00s 0 - +Rule ATAQ 1972 only - Feb lastSun 2:00s 0 - +Rule ATAQ 1973 1981 - Mar Sun>=1 2:00s 0 - +Rule ATAQ 1982 1983 - Mar lastSun 2:00s 0 - +Rule ATAQ 1984 1986 - Mar Sun>=1 2:00s 0 - +Rule ATAQ 1986 only - Oct Sun>=15 2:00s 1:00 - +Rule ATAQ 1987 1990 - Mar Sun>=15 2:00s 0 - +Rule ATAQ 1987 only - Oct Sun>=22 2:00s 1:00 - +Rule ATAQ 1988 1990 - Oct lastSun 2:00s 1:00 - +Rule ATAQ 1991 1999 - Oct Sun>=1 2:00s 1:00 - +Rule ATAQ 1991 2005 - Mar lastSun 2:00s 0 - +Rule ATAQ 2000 only - Aug lastSun 2:00s 1:00 - +Rule ATAQ 2001 max - Oct Sun>=1 2:00s 1:00 - +Rule ATAQ 2006 only - Apr Sun>=1 2:00s 0 - +Rule ATAQ 2007 only - Mar lastSun 2:00s 0 - +Rule ATAQ 2008 max - Apr Sun>=1 2:00s 0 - # Argentina - year-round bases # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 @@ -120,20 +147,52 @@ Rule ChileAQ 2000 max - Mar Sun>=9 3:00u 0 - # http://www.timeanddate.com/news/time/antarctica-new-times.html # +# From Steffen Thorsen (2010-03-10): +# We got these changes from the Australian Antarctic Division: +# - Macquarie Island will stay on UTC+11 for winter and therefore not +# switch back from daylight savings time when other parts of Australia do +# on 4 April. +# +# - Casey station reverted to its normal time of UTC+8 on 5 March 2010. +# The change to UTC+11 is being considered as a regular summer thing but +# has not been decided yet. +# +# - Davis station will revert to its normal time of UTC+7 at 10 March 2010 +# 20:00 UTC. +# +# - Mawson station stays on UTC+5. +# +# In addition to the Rule changes for Casey/Davis, it means that Macquarie +# will no longer be like Hobart and will have to have its own Zone created. +# +# Background: +# +# http://www.timeanddate.com/news/time/antartica-time-changes-2010.html +# + # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Antarctica/Casey 0 - zzz 1969 8:00 - WST 2009 Oct 18 2:00 # Western (Aus) Standard Time - 11:00 - CAST # Casey Time + 11:00 - CAST 2010 Mar 5 2:00 + # Casey Time + 8:00 - WST Zone Antarctica/Davis 0 - zzz 1957 Jan 13 7:00 - DAVT 1964 Nov # Davis Time 0 - zzz 1969 Feb 7:00 - DAVT 2009 Oct 18 2:00 - 5:00 - DAVT + 5:00 - DAVT 2010 Mar 10 20:00u + 7:00 - DAVT Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 6:00 - MAWT 2009 Oct 18 2:00 # Mawson Time 5:00 - MAWT +Zone Antarctica/Macquarie 0 - zzz 1911 + 10:00 - EST 1916 Oct 1 2:00 + 10:00 1:00 EST 1917 Feb + 10:00 AusAQ EST 1967 + 10:00 ATAQ EST 2010 Apr 4 3:00 + 11:00 - MIST # Macquarie Island Time # References: # # Casey Weather (1998-02-26) diff --git a/make/sun/javazic/tzdata/asia b/make/sun/javazic/tzdata/asia index a8e6746fb302f19ea37e9c401eac9cdafb163ebf..54051000939bc64a00a187e97d5b847856771bb9 100644 --- a/make/sun/javazic/tzdata/asia +++ b/make/sun/javazic/tzdata/asia @@ -236,22 +236,20 @@ Zone Asia/Bahrain 3:22:20 - LMT 1920 # Al Manamah # 2010 midnight. The decision came at a cabinet meeting at the Prime # Minister's Office last night..." -# From Danvin Ruangchan (2009-12-24): -# ...the news mentions DST will be turned off again 7 months after March -# 31st on Oct 31, 2010. - -# From Arthur David Olson (2009-12-26): -# Indeed, "The government will advance again the Banglasdesh Standard -# Time by one one hour on March 31 next year by enforcing the Daylight -# Saving Time (DST) for seven months. It will continue till October 31 -# until further notice." I take that last sentence as the -# establishment of a rule. +# From Alexander Krivenyshev (2010-03-22): +# According to Bangladesh newspaper "The Daily Star," +# Cabinet cancels Daylight Saving Time +# +# http://www.thedailystar.net/newDesign/latest_news.php?nid=22817 +# +# or +# +# http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html +# # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Dhaka 2009 only - Jun 19 23:00 1:00 S -Rule Dhaka 2010 only - Jan 1 0:00 0 - -Rule Dhaka 2010 max - Mar 31 23:00 1:00 S -Rule Dhaka 2010 max - Nov 1 0:00 0 - +Rule Dhaka 2009 only - Dec 31 23:59 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Dhaka 6:01:40 - LMT 1890 @@ -2131,6 +2129,32 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # http://www.worldtimezone.com/dst_news/dst_news_gazastrip02.html # +# From Alexander Krivenyshev (2010-03-19): +# According to Voice of Palestine DST will last for 191 days, from March +# 26, 2010 till "the last Sunday before the tenth day of Tishri +# (October), each year" (October 03, 2010?) +# +# +# http://palvoice.org/forums/showthread.php?t=245697 +# +# (in Arabic) +# or +# +# http://www.worldtimezone.com/dst_news/dst_news_westbank03.html +# + +# From Steffen Thorsen (2010-03-24): +# ...Ma'an News Agency reports that Hamas cabinet has decided it will +# start one day later, at 12:01am. Not sure if they really mean 12:01am or +# noon though: +# +# +# http://www.maannews.net/eng/ViewDetails.aspx?ID=271178 +# +# (Ma'an News Agency) +# "At 12:01am Friday, clocks in Israel and the West Bank will change to +# 1:01am, while Gaza clocks will change at 12:01am Saturday morning." + # The rules for Egypt are stolen from the `africa' file. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S @@ -2148,7 +2172,8 @@ Rule Palestine 2006 2008 - Apr 1 0:00 1:00 S Rule Palestine 2006 only - Sep 22 0:00 0 - Rule Palestine 2007 only - Sep Thu>=8 2:00 0 - Rule Palestine 2008 only - Aug lastFri 2:00 0 - -Rule Palestine 2009 max - Mar lastFri 0:00 1:00 S +Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S +Rule Palestine 2010 max - Mar lastSat 0:01 1:00 S Rule Palestine 2009 max - Sep Fri>=1 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -2440,9 +2465,18 @@ Rule Syria 2007 only - Nov Fri>=1 0:00 0 - # Thursday of the month or the start of the last Friday of the month or # something else. For now, use the start of the last Friday. +# From Steffen Thorsen (2010-03-17): +# The "Syrian News Station" reported on 2010-03-16 that the Council of +# Ministers has decided that Syria will start DST on midnight Thursday +# 2010-04-01: (midnight between Thursday and Friday): +# +# http://sns.sy/sns/?path=news/read/11421 (Arabic) +# + Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S Rule Syria 2008 only - Nov 1 0:00 0 - -Rule Syria 2009 max - Mar lastFri 0:00 1:00 S +Rule Syria 2009 only - Mar lastFri 0:00 1:00 S +Rule Syria 2010 max - Apr Fri>=1 0:00 1:00 S Rule Syria 2009 max - Oct lastFri 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] diff --git a/make/sun/javazic/tzdata/australasia b/make/sun/javazic/tzdata/australasia index 940d4e16614065b8761fb3eafae135a0f09c2580..9165c4aedecf16b4bb0922903fbc19ad531d315c 100644 --- a/make/sun/javazic/tzdata/australasia +++ b/make/sun/javazic/tzdata/australasia @@ -289,11 +289,30 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # # http://www.fiji.gov.fj/publish/page_16198.shtml # + +# From Steffen Thorsen (2010-03-03): +# The Cabinet in Fiji has decided to end DST about a month early, on +# 2010-03-28 at 03:00. +# The plan is to observe DST again, from 2010-10-24 to sometime in March +# 2011 (last Sunday a good guess?). +# +# Official source: +# +# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=1096:3310-cabinet-approves-change-in-daylight-savings-dates&catid=49:cabinet-releases&Itemid=166 +# +# +# A bit more background info here: +# +# http://www.timeanddate.com/news/time/fiji-dst-ends-march-2010.html +# + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S -Rule Fiji 2010 only - Apr 25 3:00 0 - +Rule Fiji 2010 only - Mar lastSun 3:00 0 - +Rule Fiji 2010 only - Oct 24 2:00 1:00 S +Rule Fiji 2011 only - Mar lastSun 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva 12:00 Fiji FJ%sT # Fiji Time @@ -471,70 +490,30 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1879 Jul 5 # Samoa -# From Alexander Krivenyshev (2008-12-06): -# The Samoa government (Western Samoa) may implement DST on the first Sunday of -# October 2009 (October 4, 2009) until the last Sunday of March 2010 (March 28, -# 2010). -# -# "Selected Committee reports to Cabinet on Daylight Saving Time", -# Government of Samoa: -# -# http://www.govt.ws/pr_article.cfm?pr_id=560 -# -# or -# -# http://www.worldtimezone.com/dst_news/dst_news_samoa01.html -# - -# From Steffen Thorsen (2009-08-27): -# Samoa's parliament passed the Daylight Saving Bill 2009, and will start -# daylight saving time on the first Sunday of October 2009 and end on the -# last Sunday of March 2010. We hope that the full text will be published -# soon, but we believe that the bill is only valid for 2009-2010. Samoa's -# Daylight Saving Act 2009 will be enforced as soon as the Head of State -# executes a proclamation publicizing this Act. +# From Steffen Thorsen (2009-10-16): +# We have been in contact with the government of Samoa again, and received +# the following info: +# +# "Cabinet has now approved Daylight Saving to be effected next year +# commencing from the last Sunday of September 2010 and conclude first +# Sunday of April 2011." # -# Some background information here, which will be updated once we have -# more details: +# Background info: # # http://www.timeanddate.com/news/time/samoa-dst-plan-2009.html # - -# From Alexander Krivenyshev (2009-10-03): -# First, my deepest condolences to people of Samoa islands and all families and -# loved ones around the world who lost their lives in the earthquake and tsunami. -# -# Considering the recent devastation on Samoa by earthquake and tsunami and that -# many government offices/ ministers are closed- not sure if "Daylight Saving -# Bill 2009" will be implemented in next few days- on October 4, 2009. -# -# Here is reply from Consulate-General of Samoa in New Zealand -# --------------------------- -# Consul General -# consulgeneral@samoaconsulate.org.nz # -# Talofa Alexander, -# -# Thank you for your sympathy for our country but at this time we have not -# been informed about the Daylight Savings Time Change. Most Ministries in -# Apia are closed or relocating due to weather concerns. -# -# When we do find out if they are still proceeding with the time change we -# will advise you soonest. -# -# Kind Regards, -# Lana -# for: Consul General - -# From Steffen Thorsen (2009-10-05): -# We have called a hotel in Samoa and asked about local time there - they -# are still on standard time. +# Samoa's Daylight Saving Time Act 2009 is available here, but does not +# contain any dates: +# +# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf +# Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time - -11:00 - WST 2009 Oct 4 - -11:00 1:00 WSDT 2010 Mar 28 + -11:00 - WST 2010 Sep 26 + -11:00 1:00 WSDT 2011 Apr 3 -11:00 - WST # Solomon Is diff --git a/make/sun/javazic/tzdata/europe b/make/sun/javazic/tzdata/europe index 9235c7e169713d3f5f6c8f22945a8a48d0d157b9..6404369bf61baa5b80543bf9d212f40e33b1dfbb 100644 --- a/make/sun/javazic/tzdata/europe +++ b/make/sun/javazic/tzdata/europe @@ -2063,7 +2063,9 @@ Zone Europe/Samara 3:20:36 - LMT 1919 Jul 1 2:00 3:00 Russia KUY%sT 1991 Mar 31 2:00s 2:00 Russia KUY%sT 1991 Sep 29 2:00s 3:00 - KUYT 1991 Oct 20 3:00 - 4:00 Russia SAM%sT # Samara Time + 4:00 Russia SAM%sT 2010 Mar 28 2:00s # Samara Time + 3:00 Russia SAM%sT + # # From Oscar van Vlijmen (2001-08-25): [This region consists of] # Respublika Bashkortostan, Komi-Permyatskij avtonomnyj okrug, @@ -2216,7 +2218,8 @@ Zone Asia/Kamchatka 10:34:36 - LMT 1922 Nov 10 11:00 - PETT 1930 Jun 21 # P-K Time 12:00 Russia PET%sT 1991 Mar 31 2:00s 11:00 Russia PET%sT 1992 Jan 19 2:00s - 12:00 Russia PET%sT + 12:00 Russia PET%sT 2010 Mar 28 2:00s + 11:00 Russia PET%sT # # Chukotskij avtonomnyj okrug Zone Asia/Anadyr 11:49:56 - LMT 1924 May 2 @@ -2224,7 +2227,8 @@ Zone Asia/Anadyr 11:49:56 - LMT 1924 May 2 13:00 Russia ANA%sT 1982 Apr 1 0:00s 12:00 Russia ANA%sT 1991 Mar 31 2:00s 11:00 Russia ANA%sT 1992 Jan 19 2:00s - 12:00 Russia ANA%sT + 12:00 Russia ANA%sT 2010 Mar 28 2:00s + 11:00 Russia ANA%sT # Serbia # Zone NAME GMTOFF RULES FORMAT [UNTIL] diff --git a/make/sun/javazic/tzdata/southamerica b/make/sun/javazic/tzdata/southamerica index 693fec6342321a1b76c0704e1d65e6bceea6358e..76f1acaf005d6534f73290e624e03a2219dcbaa3 100644 --- a/make/sun/javazic/tzdata/southamerica +++ b/make/sun/javazic/tzdata/southamerica @@ -1143,6 +1143,18 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914 # http://www.shoa.cl/noticias/2008/04hora/hora.htm # . +# From Angel Chiang (2010-03-04): +# Subject: DST in Chile exceptionally extended to 3 April due to earthquake +# +# http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098 +# +# (in Spanish, last paragraph). +# +# This is breaking news. There should be more information available later. + +# From Arthur Daivd Olson (2010-03-06): +# Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Chile 1927 1932 - Sep 1 0:00 1:00 S Rule Chile 1928 1932 - Apr 1 0:00 0 - @@ -1177,7 +1189,9 @@ Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - # N.B.: the end of March 29 in Chile is March 30 in Universal time, # which is used below in specifying the transition. Rule Chile 2008 only - Mar 30 3:00u 0 - -Rule Chile 2009 max - Mar Sun>=9 3:00u 0 - +Rule Chile 2009 only - Mar Sun>=9 3:00u 0 - +Rule Chile 2010 only - Apr 4 3:00u 0 - +Rule Chile 2011 max - Mar Sun>=9 3:00u 0 - # IATA SSIM anomalies: (1992-02) says 1992-03-14; # (1996-09) says 1998-03-08. Ignore these. # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1386,8 +1400,24 @@ Rule Para 2002 2003 - Sep Sun>=1 0:00 1:00 S # Decree 1,867 (2004-03-05) # From Carlos Raul Perasso via Jesper Norgaard Welen (2006-10-13) # -Rule Para 2004 max - Oct Sun>=15 0:00 1:00 S -Rule Para 2005 max - Mar Sun>=8 0:00 0 - +Rule Para 2004 2009 - Oct Sun>=15 0:00 1:00 S +Rule Para 2005 2009 - Mar Sun>=8 0:00 0 - +# From Carlos Raul Perasso (2010-02-18): +# By decree number 3958 issued yesterday ( +# +# http://www.presidencia.gov.py/v1/wp-content/uploads/2010/02/decreto3958.pdf +# +# ) +# Paraguay changes its DST schedule, postponing the March rule to April and +# modifying the October date. The decree reads: +# ... +# Art. 1. It is hereby established that from the second Sunday of the month of +# April of this year (2010), the official time is to be set back 60 minutes, +# and that on the first Sunday of the month of October, it is to be set +# forward 60 minutes, in all the territory of the Paraguayan Republic. +# ... +Rule Para 2010 max - Oct Sun>=1 0:00 1:00 S +Rule Para 2010 max - Apr Sun>=8 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Asuncion -3:50:40 - LMT 1890 diff --git a/make/sun/javazic/tzdata/zone.tab b/make/sun/javazic/tzdata/zone.tab index e4bc3450c767b22b27aca4feda0701266b3abbf0..abbdbaa8e70e53144d7dc4859cfbd02efd1730df 100644 --- a/make/sun/javazic/tzdata/zone.tab +++ b/make/sun/javazic/tzdata/zone.tab @@ -66,6 +66,7 @@ AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula AQ -7824+10654 Antarctica/Vostok Vostok Station, S Magnetic Pole AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I +AQ -5430+15857 Antarctica/Macquarie Macquarie Island Station, Macquarie Island 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) @@ -351,7 +352,7 @@ RS +4450+02030 Europe/Belgrade RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad RU +5545+03735 Europe/Moscow Moscow+00 - west Russia RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea -RU +5312+05009 Europe/Samara Moscow+01 - Samara, Udmurtia +RU +5312+05009 Europe/Samara Moscow - Samara, Udmurtia 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 @@ -362,8 +363,8 @@ RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island RU +5934+15048 Asia/Magadan Moscow+08 - Magadan -RU +5301+15839 Asia/Kamchatka Moscow+09 - Kamchatka -RU +6445+17729 Asia/Anadyr Moscow+10 - Bering Sea +RU +5301+15839 Asia/Kamchatka Moscow+08 - Kamchatka +RU +6445+17729 Asia/Anadyr Moscow+08 - Bering Sea RW -0157+03004 Africa/Kigali SA +2438+04643 Asia/Riyadh SB -0932+16012 Pacific/Guadalcanal diff --git a/make/tools/src/build/tools/javazic/RuleDay.java b/make/tools/src/build/tools/javazic/RuleDay.java index f9629b77d882220242b07182f539a5a7f1205e0d..88e7062578fccac1bc4fef7c7116c36d961820b1 100644 --- a/make/tools/src/build/tools/javazic/RuleDay.java +++ b/make/tools/src/build/tools/javazic/RuleDay.java @@ -139,7 +139,7 @@ class RuleDay { if (isLast()) { return -1; } - return getDay(); + return isEarlier() ? -getDay() : getDay(); } /** @@ -147,13 +147,10 @@ class RuleDay { * @return the SimpleTimeZone day-of-week rule value */ int getDayOfWeekForSimpleTimeZoneInt() { - if (!isLater() && !isEarlier() && !isLast()) { - return 0; - } - if (isLater()) { + if (isEarlier() || isLater()) { return -getDayOfWeekNum(); } - return getDayOfWeekNum(); + return isLast() ? getDayOfWeekNum() : 0; } /** diff --git a/src/share/classes/java/beans/Expression.java b/src/share/classes/java/beans/Expression.java index 35761cae63b36b771890f04131f26d9911fa6a2d..de672aa30ec337e31d00bcfc1364ce83bef3b3d0 100644 --- a/src/share/classes/java/beans/Expression.java +++ b/src/share/classes/java/beans/Expression.java @@ -98,6 +98,29 @@ public class Expression extends Statement { setValue(value); } + /** + * {@inheritDoc} + *

+ * If the invoked method completes normally, + * the value it returns is copied in the {@code value} property. + * Note that the {@code value} property is set to {@code null}, + * if the return type of the underlying method is {@code void}. + * + * @throws NullPointerException if the value of the {@code target} or + * {@code methodName} property is {@code null} + * @throws NoSuchMethodException if a matching method is not found + * @throws SecurityException if a security manager exists and + * it denies the method invocation + * @throws Exception that is thrown by the invoked method + * + * @see java.lang.reflect.Method + * @since 1.7 + */ + @Override + public void execute() throws Exception { + setValue(invoke()); + } + /** * If the value property of this instance is not already set, * this method dynamically finds the method with the specified diff --git a/src/share/classes/java/beans/Statement.java b/src/share/classes/java/beans/Statement.java index a3949642ea8a4cdd47e7deb2d1ad0b164a15e6ab..bfd69eb9be3994842472ecf4027b6d8ceba6c392 100644 --- a/src/share/classes/java/beans/Statement.java +++ b/src/share/classes/java/beans/Statement.java @@ -132,8 +132,8 @@ public class Statement { } /** - * The execute method finds a method whose name is the same - * as the methodName property, and invokes the method on + * The {@code execute} method finds a method whose name is the same + * as the {@code methodName} property, and invokes the method on * the target. * * When the target's class defines many methods with the given name @@ -141,7 +141,7 @@ public class Statement { * the algorithm specified in the Java Language Specification * (15.11). The dynamic class of the target and arguments are used * in place of the compile-time type information and, like the - * java.lang.reflect.Method class itself, conversion between + * {@link java.lang.reflect.Method} class itself, conversion between * primitive values and their associated wrapper classes is handled * internally. *

@@ -152,13 +152,22 @@ public class Statement { *

  • * The reserved method name "new" may be used to call a class's constructor * as if all classes defined static "new" methods. Constructor invocations - * are typically considered Expressions rather than Statements + * are typically considered {@code Expression}s rather than {@code Statement}s * as they return a value. *
  • - * The method names "get" and "set" defined in the java.util.List + * The method names "get" and "set" defined in the {@link java.util.List} * interface may also be applied to array instances, mapping to - * the static methods of the same name in the Array class. + * the static methods of the same name in the {@code Array} class. * + * + * @throws NullPointerException if the value of the {@code target} or + * {@code methodName} property is {@code null} + * @throws NoSuchMethodException if a matching method is not found + * @throws SecurityException if a security manager exists and + * it denies the method invocation + * @throws Exception that is thrown by the invoked method + * + * @see java.lang.reflect.Method */ public void execute() throws Exception { invoke(); diff --git a/src/share/classes/javax/swing/JSplitPane.java b/src/share/classes/javax/swing/JSplitPane.java index f3baff66492b2d23590f6067b118e72403023dce..9700b260f2c723d7d420af2087f0222b2c288e1c 100644 --- a/src/share/classes/javax/swing/JSplitPane.java +++ b/src/share/classes/javax/swing/JSplitPane.java @@ -246,8 +246,7 @@ public class JSplitPane extends JComponent implements Accessible * layout, using two buttons for the components. */ public JSplitPane() { - this(JSplitPane.HORIZONTAL_SPLIT, - UIManager.getBoolean("SplitPane.continuousLayout"), + this(JSplitPane.HORIZONTAL_SPLIT, false, new JButton(UIManager.getString("SplitPane.leftButtonText")), new JButton(UIManager.getString("SplitPane.rightButtonText"))); } @@ -264,8 +263,7 @@ public class JSplitPane extends JComponent implements Accessible */ @ConstructorProperties({"orientation"}) public JSplitPane(int newOrientation) { - this(newOrientation, - UIManager.getBoolean("SplitPane.continuousLayout")); + this(newOrientation, false); } @@ -309,9 +307,7 @@ public class JSplitPane extends JComponent implements Accessible public JSplitPane(int newOrientation, Component newLeftComponent, Component newRightComponent){ - this(newOrientation, - UIManager.getBoolean("SplitPane.continuousLayout"), - newLeftComponent, newRightComponent); + this(newOrientation, false, newLeftComponent, newRightComponent); } diff --git a/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java b/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java index 0a035fc4636e2082dc012d68fc8434d8fccc9ccb..7d564eeccb54e9cb822862236545e068e4419ef0 100644 --- a/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java +++ b/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java @@ -762,7 +762,9 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory { * component's background color to be painted. *
  • * Installs the default caret and highlighter into the - * associated component. + * associated component. These properties are only set if their + * current value is either {@code null} or an instance of + * {@link UIResource}. *
  • * Attaches to the editor and model. If there is no * model, a default one is created. diff --git a/src/share/classes/javax/swing/plaf/nimbus/skin.laf b/src/share/classes/javax/swing/plaf/nimbus/skin.laf index 15532781cf22f2360d81511a71a5842048f366c9..93839159356718ab442cefb3ab5301560c3f0ef9 100644 --- a/src/share/classes/javax/swing/plaf/nimbus/skin.laf +++ b/src/share/classes/javax/swing/plaf/nimbus/skin.laf @@ -21276,7 +21276,6 @@ - diff --git a/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java b/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java index 1db09641cc9a07a6ee06d15cc9b1e7b7f3ff6851..d3dafcc489051aea062787b4ee70f1538e370607 100644 --- a/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java +++ b/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java @@ -648,6 +648,14 @@ public class SynthLookAndFeel extends BasicLookAndFeel { table.put("ColorChooser.swatchesDefaultRecentColor", Color.RED); table.put("ColorChooser.swatchesSwatchSize", new Dimension(10, 10)); + // These need to be defined for ImageView. + table.put("html.pendingImage", SwingUtilities2.makeIcon(getClass(), + BasicLookAndFeel.class, + "icons/image-delayed.png")); + table.put("html.missingImage", SwingUtilities2.makeIcon(getClass(), + BasicLookAndFeel.class, + "icons/image-failed.png")); + // These are needed for PopupMenu. table.put("PopupMenu.selectedWindowInputMapBindings", new Object[] { "ESCAPE", "cancel", diff --git a/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java b/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java index 387f1ddce53377f9e2174abc3ccf580ab751d4b8..039abfed9f0df8f1669dff2c49cc6d2047e35c08 100644 --- a/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java +++ b/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java @@ -489,23 +489,6 @@ public class SynthTabbedPaneUI extends BasicTabbedPaneUI } - /** - * @inheritDoc - */ - @Override - protected void paintTabArea(Graphics g, int tabPlacement, - int selectedIndex) { - // This can be invoked from ScrollabeTabPanel - Insets insets = tabPane.getInsets(); - int x = insets.left; - int y = insets.top; - int width = tabPane.getWidth() - insets.left - insets.right; - int height = tabPane.getHeight() - insets.top - insets.bottom; - - paintTabArea(tabAreaContext, g, tabPlacement, selectedIndex, - new Rectangle(x, y, width, height)); - } - private void paintTabArea(SynthContext ss, Graphics g, int tabPlacement, int selectedIndex, Rectangle tabAreaBounds) { diff --git a/src/share/classes/sun/util/resources/TimeZoneNames.java b/src/share/classes/sun/util/resources/TimeZoneNames.java index a347db8ccc1530969446bb9f4e20bbe2f1db688c..74ccc66449b6fbf12c379cf0912087d21f5180aa 100644 --- a/src/share/classes/sun/util/resources/TimeZoneNames.java +++ b/src/share/classes/sun/util/resources/TimeZoneNames.java @@ -446,12 +446,13 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { {"America/Winnipeg", CST}, {"America/Yakutat", AKST}, {"America/Yellowknife", MST}, - {"Antarctica/Casey", new String[] {"Casey Time", "CAST", - "Casey Summer Time", "CAST"}}, + {"Antarctica/Casey", WST_AUS}, {"Antarctica/Davis", new String[] {"Davis Time", "DAVT", "Davis Summer Time", "DAVST"}}, {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Time", "DDUT", "Dumont-d'Urville Summer Time", "DDUST"}}, + {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", + "Macquarie Island Summer Time", "MIST"}}, {"Antarctica/Mawson", new String[] {"Mawson Time", "MAWT", "Mawson Summer Time", "MAWST"}}, {"Antarctica/McMurdo", NZST}, diff --git a/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties b/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties index d11f2ec2817bef1ce8d7f0f3b333c7471b8f9639..4798221293195132147dc11b0514fc5b2175858d 100644 --- a/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties +++ b/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties @@ -26,134 +26,310 @@ # Version -# Uses Fedora Core 6 fonts and file paths. +# Uses Fedora 9 fonts and file paths. version=1 # Component Font Mappings -dialog.plain.latin-1=DejaVu LGC Sans +dialog.plain.latin-1=DejaVu Sans dialog.plain.japanese-x0208=Sazanami Gothic dialog.plain.korean=Baekmuk Gulim dialog.plain.chinese-big5=AR PL ShanHeiSun Uni dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni - -dialog.bold.latin-1=DejaVu LGC Sans Bold +dialog.plain.bengali=Lohit Bengali +dialog.plain.gujarati=Lohit Gujarati +dialog.plain.hindi=Lohit Hindi +dialog.plain.malayalam=Lohit Malayalam +dialog.plain.oriya=Lohit Oriya +dialog.plain.punjabi=Lohit Punjabi +dialog.plain.tamil=Lohit Tamil +dialog.plain.telugu=Lohit Telugu +dialog.plain.sinhala=LKLUG + +dialog.bold.latin-1=DejaVu Sans Bold dialog.bold.japanese-x0208=Sazanami Gothic dialog.bold.korean=Baekmuk Gulim dialog.bold.chinese-big5=AR PL ShanHeiSun Uni dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni - -dialog.italic.latin-1=DejaVu LGC Sans Oblique +dialog.bold.bengali=Lohit Bengali +dialog.bold.gujarati=Lohit Gujarati +dialog.bold.hindi=Lohit Hindi +dialog.bold.malayalam=Lohit Malayalam +dialog.bold.oriya=Lohit Oriya +dialog.bold.punjabi=Lohit Punjabi +dialog.bold.tamil=Lohit Tamil +dialog.bold.telugu=Lohit Telugu +dialog.bold.sinhala=LKLUG + +dialog.italic.latin-1=DejaVu Sans Oblique dialog.italic.japanese-x0208=Sazanami Gothic dialog.italic.korean=Baekmuk Gulim dialog.italic.chinese-big5=AR PL ShanHeiSun Uni dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni - -dialog.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique +dialog.italic.bengali=Lohit Bengali +dialog.italic.gujarati=Lohit Gujarati +dialog.italic.hindi=Lohit Hindi +dialog.italic.malayalam=Lohit Malayalam +dialog.italic.oriya=Lohit Oriya +dialog.italic.punjabi=Lohit Punjabi +dialog.italic.tamil=Lohit Tamil +dialog.italic.telugu=Lohit Telugu +dialog.italic.sinhala=LKLUG + +dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique dialog.bolditalic.japanese-x0208=Sazanami Gothic dialog.bolditalic.korean=Baekmuk Gulim dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni - - -sansserif.plain.latin-1=DejaVu LGC Sans +dialog.bolditalic.bengali=Lohit Bengali +dialog.bolditalic.gujarati=Lohit Gujarati +dialog.bolditalic.hindi=Lohit Hindi +dialog.bolditalic.malayalam=Lohit Malayalam +dialog.bolditalic.oriya=Lohit Oriya +dialog.bolditalic.punjabi=Lohit Punjabi +dialog.bolditalic.tamil=Lohit Tamil +dialog.bolditalic.telugu=Lohit Telugu +dialog.bolditalic.sinhala=LKLUG + +sansserif.plain.latin-1=DejaVu Sans sansserif.plain.japanese-x0208=Sazanami Gothic sansserif.plain.korean=Baekmuk Gulim sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni - -sansserif.bold.latin-1=DejaVu LGC Sans Bold +sansserif.plain.bengali=Lohit Bengali +sansserif.plain.gujarati=Lohit Gujarati +sansserif.plain.hindi=Lohit Hindi +sansserif.plain.malayalam=Lohit Malayalam +sansserif.plain.oriya=Lohit Oriya +sansserif.plain.punjabi=Lohit Punjabi +sansserif.plain.tamil=Lohit Tamil +sansserif.plain.telugu=Lohit Telugu +sansserif.plain.sinhala=LKLUG + +sansserif.bold.latin-1=DejaVu Sans Bold sansserif.bold.japanese-x0208=Sazanami Gothic sansserif.bold.korean=Baekmuk Gulim sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni - -sansserif.italic.latin-1=DejaVu LGC Sans Oblique +sansserif.bold.bengali=Lohit Bengali +sansserif.bold.gujarati=Lohit Gujarati +sansserif.bold.hindi=Lohit Hindi +sansserif.bold.malayalam=Lohit Malayalam +sansserif.bold.oriya=Lohit Oriya +sansserif.bold.punjabi=Lohit Punjabi +sansserif.bold.tamil=Lohit Tamil +sansserif.bold.telugu=Lohit Telugu +sansserif.bold.sinhala=LKLUG + +sansserif.italic.latin-1=DejaVu Sans Oblique sansserif.italic.japanese-x0208=Sazanami Gothic sansserif.italic.korean=Baekmuk Gulim sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni - -sansserif.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique +sansserif.italic.bengali=Lohit Bengali +sansserif.italic.gujarati=Lohit Gujarati +sansserif.italic.hindi=Lohit Hindi +sansserif.italic.malayalam=Lohit Malayalam +sansserif.italic.oriya=Lohit Oriya +sansserif.italic.punjabi=Lohit Punjabi +sansserif.italic.tamil=Lohit Tamil +sansserif.italic.telugu=Lohit Telugu +sansserif.italic.sinhala=LKLUG + +sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique sansserif.bolditalic.japanese-x0208=Sazanami Gothic sansserif.bolditalic.korean=Baekmuk Gulim sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni - - -serif.plain.latin-1=DejaVu LGC Serif +sansserif.bolditalic.bengali=Lohit Bengali +sansserif.bolditalic.gujarati=Lohit Gujarati +sansserif.bolditalic.hindi=Lohit Hindi +sansserif.bolditalic.malayalam=Lohit Malayalam +sansserif.bolditalic.oriya=Lohit Oriya +sansserif.bolditalic.punjabi=Lohit Punjabi +sansserif.bolditalic.tamil=Lohit Tamil +sansserif.bolditalic.telugu=Lohit Telugu +sansserif.bolditalic.sinhala=LKLUG + +serif.plain.latin-1=DejaVu Serif serif.plain.japanese-x0208=Sazanami Mincho serif.plain.korean=Baekmuk Batang serif.plain.chinese-big5=AR PL ZenKai Uni serif.plain.chinese-gb18030=AR PL ZenKai Uni - -serif.bold.latin-1=DejaVu LGC Serif Bold +serif.plain.bengali=Lohit Bengali +serif.plain.gujarati=Lohit Gujarati +serif.plain.hindi=Lohit Hindi +serif.plain.malayalam=Lohit Malayalam +serif.plain.oriya=Lohit Oriya +serif.plain.punjabi=Lohit Punjabi +serif.plain.tamil=Lohit Tamil +serif.plain.telugu=Lohit Telugu +serif.plain.sinhala=LKLUG + +serif.bold.latin-1=DejaVu Serif Bold serif.bold.japanese-x0208=Sazanami Mincho serif.bold.korean=Baekmuk Batang serif.bold.chinese-big5=AR PL ZenKai Uni serif.bold.chinese-gb18030=AR PL ZenKai Uni - -serif.italic.latin-1=DejaVu LGC Serif Oblique +serif.bold.bengali=Lohit Bengali +serif.bold.gujarati=Lohit Gujarati +serif.bold.hindi=Lohit Hindi +serif.bold.malayalam=Lohit Malayalam +serif.bold.oriya=Lohit Oriya +serif.bold.punjabi=Lohit Punjabi +serif.bold.tamil=Lohit Tamil +serif.bold.telugu=Lohit Telugu +serif.bold.sinhala=LKLUG + +serif.italic.latin-1=DejaVu Serif Oblique serif.italic.japanese-x0208=Sazanami Mincho serif.italic.korean=Baekmuk Batang serif.italic.chinese-big5=AR PL ZenKai Uni serif.italic.chinese-gb18030=AR PL ZenKai Uni - -serif.bolditalic.latin-1=DejaVu LGC Serif Bold Oblique +serif.italic.bengali=Lohit Bengali +serif.italic.gujarati=Lohit Gujarati +serif.italic.hindi=Lohit Hindi +serif.italic.malayalam=Lohit Malayalam +serif.italic.oriya=Lohit Oriya +serif.italic.punjabi=Lohit Punjabi +serif.italic.tamil=Lohit Tamil +serif.italic.telugu=Lohit Telugu +serif.italic.sinhala=LKLUG + +serif.bolditalic.latin-1=DejaVu Serif Bold Oblique serif.bolditalic.japanese-x0208=Sazanami Mincho serif.bolditalic.korean=Baekmuk Batang serif.bolditalic.chinese-big5=AR PL ZenKai Uni serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni - - -monospaced.plain.latin-1=DejaVu LGC Sans Mono +serif.bolditalic.bengali=Lohit Bengali +serif.bolditalic.gujarati=Lohit Gujarati +serif.bolditalic.hindi=Lohit Hindi +serif.bolditalic.malayalam=Lohit Malayalam +serif.bolditalic.oriya=Lohit Oriya +serif.bolditalic.punjabi=Lohit Punjabi +serif.bolditalic.tamil=Lohit Tamil +serif.bolditalic.telugu=Lohit Telugu +serif.bolditalic.sinhala=LKLUG + +monospaced.plain.latin-1=DejaVu Sans Mono monospaced.plain.japanese-x0208=Sazanami Gothic monospaced.plain.korean=Baekmuk Gulim monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni - -monospaced.bold.latin-1=DejaVu LGC Sans Mono Bold +monospaced.plain.bengali=Lohit Bengali +monospaced.plain.gujarati=Lohit Gujarati +monospaced.plain.hindi=Lohit Hindi +monospaced.plain.malayalam=Lohit Malayalam +monospaced.plain.oriya=Lohit Oriya +monospaced.plain.punjabi=Lohit Punjabi +monospaced.plain.tamil=Lohit Tamil +monospaced.plain.telugu=Lohit Telugu +monospaced.plain.sinhala=LKLUG + +monospaced.bold.latin-1=DejaVu Sans Mono Bold monospaced.bold.japanese-x0208=Sazanami Gothic monospaced.bold.korean=Baekmuk Gulim monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni - -monospaced.italic.latin-1=DejaVu LGC Sans Mono Oblique +monospaced.bold.bengali=Lohit Bengali +monospaced.bold.gujarati=Lohit Gujarati +monospaced.bold.hindi=Lohit Hindi +monospaced.bold.malayalam=Lohit Malayalam +monospaced.bold.oriya=Lohit Oriya +monospaced.bold.punjabi=Lohit Punjabi +monospaced.bold.tamil=Lohit Tamil +monospaced.bold.telugu=Lohit Telugu +monospaced.bold.sinhala=LKLUG + +monospaced.italic.latin-1=DejaVu Sans Mono Oblique monospaced.italic.japanese-x0208=Sazanami Gothic monospaced.italic.korean=Baekmuk Gulim monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni - -monospaced.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique +monospaced.italic.bengali=Lohit Bengali +monospaced.italic.gujarati=Lohit Gujarati +monospaced.italic.hindi=Lohit Hindi +monospaced.italic.malayalam=Lohit Malayalam +monospaced.italic.oriya=Lohit Oriya +monospaced.italic.punjabi=Lohit Punjabi +monospaced.italic.tamil=Lohit Tamil +monospaced.italic.telugu=Lohit Telugu +monospaced.italic.sinhala=LKLUG + +monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique monospaced.bolditalic.japanese-x0208=Sazanami Gothic monospaced.bolditalic.korean=Baekmuk Gulim monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni - - -dialoginput.plain.latin-1=DejaVu LGC Sans Mono +monospaced.bolditalic.bengali=Lohit Bengali +monospaced.bolditalic.gujarati=Lohit Gujarati +monospaced.bolditalic.hindi=Lohit Hindi +monospaced.bolditalic.malayalam=Lohit Malayalam +monospaced.bolditalic.oriya=Lohit Oriya +monospaced.bolditalic.punjabi=Lohit Punjabi +monospaced.bolditalic.tamil=Lohit Tamil +monospaced.bolditalic.telugu=Lohit Telugu +monospaced.bolditalic.sinhala=LKLUG + +dialoginput.plain.latin-1=DejaVu Sans Mono dialoginput.plain.japanese-x0208=Sazanami Gothic dialoginput.plain.korean=Baekmuk Gulim dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni - -dialoginput.bold.latin-1=DejaVu LGC Sans Mono Bold +dialoginput.plain.bengali=Lohit Bengali +dialoginput.plain.gujarati=Lohit Gujarati +dialoginput.plain.hindi=Lohit Hindi +dialoginput.plain.malayalam=Lohit Malayalam +dialoginput.plain.oriya=Lohit Oriya +dialoginput.plain.punjabi=Lohit Punjabi +dialoginput.plain.tamil=Lohit Tamil +dialoginput.plain.telugu=Lohit Telugu +dialoginput.plain.sinhala=LKLUG + +dialoginput.bold.latin-1=DejaVu Sans Mono Bold dialoginput.bold.japanese-x0208=Sazanami Gothic dialoginput.bold.korean=Baekmuk Gulim dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni - -dialoginput.italic.latin-1=DejaVu LGC Sans Mono Oblique +dialoginput.bold.bengali=Lohit Bengali +dialoginput.bold.gujarati=Lohit Gujarati +dialoginput.bold.hindi=Lohit Hindi +dialoginput.bold.malayalam=Lohit Malayalam +dialoginput.bold.oriya=Lohit Oriya +dialoginput.bold.punjabi=Lohit Punjabi +dialoginput.bold.tamil=Lohit Tamil +dialoginput.bold.telugu=Lohit Telugu +dialoginput.bold.sinhala=LKLUG + +dialoginput.italic.latin-1=DejaVu Sans Mono Oblique dialoginput.italic.japanese-x0208=Sazanami Gothic dialoginput.italic.korean=Baekmuk Gulim dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni - -dialoginput.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique +dialoginput.italic.bengali=Lohit Bengali +dialoginput.italic.gujarati=Lohit Gujarati +dialoginput.italic.hindi=Lohit Hindi +dialoginput.italic.malayalam=Lohit Malayalam +dialoginput.italic.oriya=Lohit Oriya +dialoginput.italic.punjabi=Lohit Punjabi +dialoginput.italic.tamil=Lohit Tamil +dialoginput.italic.telugu=Lohit Telugu +dialoginput.italic.sinhala=LKLUG + +dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique dialoginput.bolditalic.japanese-x0208=Sazanami Gothic dialoginput.bolditalic.korean=Baekmuk Gulim dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni +dialoginput.bolditalic.bengali=Lohit Bengali +dialoginput.bolditalic.gujarati=Lohit Gujarati +dialoginput.bolditalic.hindi=Lohit Hindi +dialoginput.bolditalic.malayalam=Lohit Malayalam +dialoginput.bolditalic.oriya=Lohit Oriya +dialoginput.bolditalic.punjabi=Lohit Punjabi +dialoginput.bolditalic.tamil=Lohit Tamil +dialoginput.bolditalic.telugu=Lohit Telugu +dialoginput.bolditalic.sinhala=LKLUG # Search Sequences @@ -162,28 +338,40 @@ sequence.allfonts.Big5=chinese-big5,latin-1 sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1 sequence.allfonts.EUC-KR=korean,latin-1 sequence.allfonts.GB18030=chinese-gb18030,latin-1 -sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean +sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala # Font File Names -filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans.ttf -filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Bold.ttf -filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Oblique.ttf -filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf - -filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono.ttf -filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf -filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf -filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf - -filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif.ttf -filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Bold.ttf -filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf -filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf - -filename.Sazanami_Gothic=/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf -filename.Sazanami_Mincho=/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf -filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/chinese/TrueType/uming.ttf -filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf -filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf -filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf +filename.DejaVu_Sans=/usr/share/fonts/dejavu/DejaVuSans.ttf +filename.DejaVu_Sans_Bold=/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf +filename.DejaVu_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf +filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf + +filename.DejaVu_Sans_Mono=/usr/share/fonts/dejavu/DejaVuSansMono.ttf +filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf +filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf +filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf + +filename.DejaVu_Serif=/usr/share/fonts/dejavu/DejaVuSerif.ttf +filename.DejaVu_Serif_Bold=/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf +filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf +filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf + +filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf +filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf +filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkunifonts-uming/uming.ttc +filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttc +filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf +filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf + +filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/lohit_bn.ttf +filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/lohit_gu.ttf +filename.Lohit_Hindi=/usr/share/fonts/lohit-hindi/lohit_hi.ttf +filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/lohit_kn.ttf +filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf +filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/lohit_or.ttf +filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/lohit_pa.ttf +filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/lohit_ta.ttf +filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf +filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf + diff --git a/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties b/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties index 64b0db3c14cec7d98dc9643d174ad4ec11125dac..80d16adbba399662383e510d2fe2f315c9122fd9 100644 --- a/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties +++ b/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties @@ -26,106 +26,253 @@ # Version -# Uses Ubuntu 6.10 (Edgy) fonts and file paths. +# Uses Ubuntu 8.04 (hardy), Debian 6.0 (Squeeze) (and more recent releases) fonts and file paths. version=1 # Component Font Mappings -dialog.plain.latin-1=DejaVu Sans -dialog.plain.japanese-x0208=Kochi Gothic -dialog.plain.korean=Baekmuk Dotum +# Chinese fonts +allfonts.umingcn=AR PL UMing CN +#allfonts.umingcn.motif=AR PL UMing CN +allfonts.uminghk=AR PL UMing HK +#allfonts.uminghk.motif=AR PL UMing HK +allfonts.umingtw=AR PL UMing TW +#allfonts.umingtw.motif=AR PL UMing TW +allfonts.wqy-zenhei=WenQuanYi Zen Hei +#allfonts.wqy-zenhei.motif=WenQuanYi Zen Hei +allfonts.shanheisun=AR PL ShanHeiSun Uni +#allfonts.shanheisun.motif=AR PL ShanHeiSun Uni + +# Indic scripts +allfonts.bengali=Lohit Bengali +allfonts.gujarati=Lohit Gujarati +allfonts.hindi=Lohit Hindi +#allfonts.malayalam=Lohit Malayalam +allfonts.oriya=Lohit Oriya +allfonts.punjabi=Lohit Punjabi +allfonts.tamil=Lohit Tamil +allfonts.telugu=Lohit Telugu +allfonts.sinhala=LKLUG -dialog.bold.latin-1=DejaVu Sans Bold -dialog.bold.japanese-x0208=Kochi Gothic -dialog.bold.korean=Baekmuk Dotum -dialog.italic.latin-1=DejaVu Sans Oblique -dialog.italic.japanese-x0208=Kochi Gothic -dialog.italic.korean=Baekmuk Dotum +serif.plain.latin-1=DejaVu Serif +#serif.plain.latin-1.motif=LuxiSerif-Regular +serif.plain.japanese-kochi=Kochi Mincho +serif.plain.japanese-sazanami=Sazanami Mincho +serif.plain.japanese-vlgothic=Sazanami Mincho +serif.plain.korean-baekmuk=Baekmuk Batang +#serif.plain.korean-baekmuk.motif=Baekmuk Batang +serif.plain.korean-un=UnBatang +#serif.plain.korean-un.motif=UnBatang -dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique -dialog.bolditalic.japanese-x0208=Kochi Gothic -dialog.bolditalic.korean=Baekmuk Dotum +serif.bold.latin-1=DejaVu Serif Bold +#serif.bold.latin-1.motif=LuxiSerif-Bold +serif.bold.japanese-kochi=Kochi Mincho +serif.bold.japanese-sazanami=Sazanami Mincho +serif.bold.japanese-vlgothic=Sazanami Mincho +serif.bold.korean-baekmuk=Baekmuk Batang +#serif.bold.korean-baekmuk.motif=Baekmuk Batang +serif.bold.korean-un=UnBatang Bold +#serif.bold.korean-un.motif=UnBatang Bold + +serif.italic.latin-1=DejaVu Serif Oblique +#serif.italic.latin-1.motif=LuxiSerif-Oblique +serif.italic.japanese-kochi=Kochi Mincho +serif.italic.japanese-sazanami=Sazanami Mincho +serif.italic.japanese-vlgothic=Sazanami Mincho +serif.italic.korean-baekmuk=Baekmuk Batang +#serif.italic.korean-baekmuk.motif=Baekmuk Batang +serif.italic.korean-un=UnBatang +#serif.italic.korean-un.motif=UnBatang +serif.bolditalic.latin-1=DejaVu Serif Bold Oblique +#serif.bolditalic.latin-1.motif=LuxiSerif-BoldOblique +serif.bolditalic.japanese-kochi=Kochi Mincho +serif.bolditalic.japanese-sazanami=Sazanami Mincho +serif.bolditalic.japanese-vlgothic=Sazanami Mincho +serif.bolditalic.korean-baekmuk=Baekmuk Batang +#serif.bolditalic.korean-baekmuk.motif=Baekmuk Batang +serif.bolditalic.korean-un=UnBatang Bold +#serif.bolditalic.korean-un.motif=UnBatang Bold sansserif.plain.latin-1=DejaVu Sans -sansserif.plain.japanese-x0208=Kochi Gothic -sansserif.plain.korean=Baekmuk Dotum +#sansserif.plain.latin-1.motif=LuxiSans-Regular +sansserif.plain.japanese-kochi=Kochi Gothic +sansserif.plain.japanese-sazanami=Sazanami Gothic +sansserif.plain.japanese-vlgothic=VL PGothic +sansserif.plain.korean-baekmuk=Baekmuk Gulim +#sansserif.plain.korean-baekmuk.motif=Baekmuk Gulim +sansserif.plain.korean-un=UnDotum +#sansserif.plain.korean-un.motif=UnDotum sansserif.bold.latin-1=DejaVu Sans Bold -sansserif.bold.japanese-x0208=Kochi Gothic -sansserif.bold.korean=Baekmuk Dotum +#sansserif.bold.latin-1.motif=LuxiSans-Bold +sansserif.bold.japanese-kochi=Kochi Gothic +sansserif.bold.japanese-sazanami=Sazanami Gothic +sansserif.bold.japanese-vlgothic=VL PGothic +sansserif.bold.korean-baekmuk=Baekmuk Gulim +#sansserif.bold.korean-baekmuk.motif=Baekmuk Gulim +sansserif.bold.korean-un=UnDotum Bold +#sansserif.bold.korean-un.motif=UnDotum Bold sansserif.italic.latin-1=DejaVu Sans Oblique -sansserif.italic.japanese-x0208=Kochi Gothic -sansserif.italic.korean=Baekmuk Dotum +#sansserif.italic.latin-1.motif=LuxiSans-Oblique +sansserif.italic.japanese-kochi=Kochi Gothic +sansserif.italic.japanese-sazanami=Sazanami Gothic +sansserif.italic.japanese-vlgothic=VL PGothic +sansserif.italic.korean-baekmuk=Baekmuk Gulim +#sansserif.italic.korean-baekmuk.motif=Baekmuk Gulim +sansserif.italic.korean-un=UnDotum +#sansserif.italic.korean-un.motif=UnDotum sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique -sansserif.bolditalic.japanese-x0208=Kochi Gothic -sansserif.bolditalic.korean=Baekmuk Dotum - - -serif.plain.latin-1=DejaVu Serif -serif.plain.japanese-x0208=Kochi Mincho -serif.plain.korean=Baekmuk Batang - -serif.bold.latin-1=DejaVu Serif Bold -serif.bold.japanese-x0208=Kochi Mincho -serif.bold.korean=Baekmuk Batang - -serif.italic.latin-1=DejaVu Serif Oblique -serif.italic.japanese-x0208=Kochi Mincho -serif.italic.korean=Baekmuk Batang - -serif.bolditalic.latin-1=DejaVu Serif Bold Oblique -serif.bolditalic.japanese-x0208=Kochi Mincho -serif.bolditalic.korean=Baekmuk Batang - +#sansserif.bolditalic.latin-1.motif=LuxiSans-BoldOblique +sansserif.bolditalic.japanese-kochi=Kochi Gothic +sansserif.bolditalic.japanese-sazanami=Sazanami Gothic +sansserif.bolditalic.japanese-vlgothic=VL PGothic +sansserif.bolditalic.korean-baekmuk=Baekmuk Gulim +#sansserif.bolditalic.korean-baekmuk.motif=Baekmuk Gulim +sansserif.bolditalic.korean-un=UnDotum Bold +#sansserif.bolditalic.korean-un.motif=UnDotum Bold monospaced.plain.latin-1=DejaVu Sans Mono -monospaced.plain.japanese-x0208=Kochi Gothic -monospaced.plain.korean=Baekmuk Dotum +#monospaced.plain.latin-1.motif=LuxiMono-Regular +monospaced.plain.japanese-kochi=Kochi Gothic +monospaced.plain.japanese-sazanami=Sazanami Gothic +monospaced.plain.japanese-vlgothic=VL Gothic +monospaced.plain.korean-baekmuk=Baekmuk Gulim +#monospaced.plain.korean-baekmuk.motif=Baekmuk Gulim +monospaced.plain.korean-un=UnDotum +#monospaced.plain.korean-un.motif=UnDotum monospaced.bold.latin-1=DejaVu Sans Mono Bold -monospaced.bold.japanese-x0208=Kochi Gothic -monospaced.bold.korean=Baekmuk Dotum +#monospaced.bold.latin-1.motif=LuxiMono-Bold +monospaced.bold.japanese-kochi=Kochi Gothic +monospaced.bold.japanese-sazanami=Sazanami Gothic +monospaced.bold.japanese-vlgothic=VL Gothic +monospaced.bold.korean-baekmuk=Baekmuk Gulim +#monospaced.bold.korean-baekmuk.motif=Baekmuk Gulim +monospaced.bold.korean-un=UnDotum Bold +#monospaced.bold.korean-un.motif=UnDotum Bold monospaced.italic.latin-1=DejaVu Sans Mono Oblique -monospaced.italic.japanese-x0208=Kochi Gothic -monospaced.italic.korean=Baekmuk Dotum +#monospaced.italic.latin-1.motif=LuxiMono-Oblique +monospaced.italic.japanese-kochi=Kochi Gothic +monospaced.italic.japanese-sazanami=Sazanami Gothic +monospaced.italic.japanese-vlgothic=VL Gothic +monospaced.italic.korean-baekmuk=Baekmuk Gulim +#monospaced.italic.korean-baekmuk.motif=Baekmuk Gulim +monospaced.italic.korean-un=UnDotum +#monospaced.italic.korean-un.motif=UnDotum monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique -monospaced.bolditalic.japanese-x0208=Kochi Gothic -monospaced.bolditalic.korean=Baekmuk Dotum +#monospaced.bolditalic.latin-1.motif=LuxiMono-BoldOblique +monospaced.bolditalic.japanese-kochi=Kochi Gothic +monospaced.bolditalic.japanese-sazanami=Sazanami Gothic +monospaced.bolditalic.japanese-vlgothic=VL Gothic +monospaced.bolditalic.korean-baekmuk=Baekmuk Gulim +#monospaced.bolditalic.korean-baekmuk.motif=Baekmuk Gulim +monospaced.bolditalic.korean-un=UnDotum Bold +#monospaced.bolditalic.korean-un.motif=UnDotum Bold + +dialog.plain.latin-1=DejaVu Sans +#dialog.plain.latin-1.motif=LuxiSans-Regular +dialog.plain.japanese-kochi=Kochi Gothic +dialog.plain.japanese-sazanami=Sazanami Gothic +dialog.plain.japanese-vlgothic=VL PGothic +dialog.plain.korean-baekmuk=Baekmuk Gulim +#dialog.plain.korean-baekmuk.motif=Baekmuk Gulim +dialog.plain.korean-un=UnDotum +#dialog.plain.korean-un.motif=UnDotum +dialog.bold.latin-1=DejaVu Sans Bold +#dialog.bold.latin-1.motif=LuxiSans-Bold +dialog.bold.japanese-kochi=Kochi Gothic +dialog.bold.japanese-sazanami=Sazanami Gothic +dialog.bold.japanese-vlgothic=VL PGothic +dialog.bold.korean-baekmuk=Baekmuk Gulim +#dialog.bold.korean-baekmuk.motif=Baekmuk Gulim +dialog.bold.korean-un=UnDotum Bold +#dialog.bold.korean-un.motif=UnDotum Bold + +dialog.italic.latin-1=DejaVu Sans Oblique +#dialog.italic.latin-1.motif=LuxiSans-Oblique +dialog.italic.japanese-kochi=Kochi Gothic +dialog.italic.japanese-sazanami=Sazanami Gothic +dialog.italic.japanese-vlgothic=VL PGothic +dialog.italic.korean-baekmuk=Baekmuk Gulim +#dialog.italic.korean-baekmuk.motif=Baekmuk Gulim +dialog.italic.korean-un=UnDotum +#dialog.italic.korean-un.motif=UnDotum + +dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique +#dialog.bolditalic.latin-1.motif=LuxiSans-BoldOblique +dialog.bolditalic.japanese-kochi=Kochi Gothic +dialog.bolditalic.japanese-sazanami=Sazanami Gothic +dialog.bolditalic.japanese-vlgothic=VL PGothic +dialog.bolditalic.korean-baekmuk=Baekmuk Gulim +#dialog.bolditalic.korean-baekmuk.motif=Baekmuk Gulim +dialog.bolditalic.korean-un=UnDotum Bold +#dialog.bolditalic.korean-un.motif=UnDotum Bold dialoginput.plain.latin-1=DejaVu Sans Mono -dialoginput.plain.japanese-x0208=Kochi Gothic -dialoginput.plain.korean=Baekmuk Dotum +#dialoginput.plain.latin-1.motif=LuxiMono-Regular +dialoginput.plain.japanese-kochi=Kochi Gothic +dialoginput.plain.japanese-sazanami=Sazanami Gothic +dialoginput.plain.japanese-vlgothic=VL Gothic +dialoginput.plain.korean-baekmuk=Baekmuk Gulim +#dialoginput.plain.korean-baekmuk.motif=Baekmuk Gulim +dialoginput.plain.korean-un=UnDotum +#dialoginput.plain.korean-un.motif=UnDotum dialoginput.bold.latin-1=DejaVu Sans Mono Bold -dialoginput.bold.japanese-x0208=Kochi Gothic -dialoginput.bold.korean=Baekmuk Dotum +#dialoginput.bold.latin-1.motif=LuxiMono-Bold +dialoginput.bold.japanese-kochi=Kochi Gothic +dialoginput.bold.japanese-sazanami=Sazanami Gothic +dialoginput.bold.japanese-vlgothic=VL Gothic +dialoginput.bold.korean-baekmuk=Baekmuk Gulim +#dialoginput.bold.korean-baekmuk.motif=Baekmuk Gulim +dialoginput.bold.korean-un=UnDotum Bold +#dialoginput.bold.korean-un.motif=UnDotum Bold dialoginput.italic.latin-1=DejaVu Sans Mono Oblique -dialoginput.italic.japanese-x0208=Kochi Gothic -dialoginput.italic.korean=Baekmuk Dotum +#dialoginput.italic.latin-1.motif=LuxiMono-Oblique +dialoginput.italic.japanese-kochi=Kochi Gothic +dialoginput.italic.japanese-sazanami=Sazanami Gothic +dialoginput.italic.japanese-vlgothic=VL Gothic +dialoginput.italic.korean-baekmuk=Baekmuk Gulim +#dialoginput.italic.korean-baekmuk.motif=Baekmuk Gulim +dialoginput.italic.korean-un=UnDotum +#dialoginput.italic.korean-un.motif=UnDotum dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique -dialoginput.bolditalic.japanese-x0208=Kochi Gothic -dialoginput.bolditalic.korean=Baekmuk Dotum - -allfonts.chinese-big5=AR PL ZenKai Uni -allfonts.chinese-gb18030=AR PL ZenKai Uni +#dialoginput.bolditalic.latin-1.motif=LuxiMono-BoldOblique +dialoginput.bolditalic.japanese-kochi=Kochi Gothic +dialoginput.bolditalic.japanese-sazanami=Sazanami Gothic +dialoginput.bolditalic.japanese-vlgothic=VL Gothic +dialoginput.bolditalic.korean-baekmuk=Baekmuk Gulim +#dialoginput.bolditalic.korean-baekmuk.motif=Baekmuk Gulim +dialoginput.bolditalic.korean-un=UnDotum Bold +#dialoginput.bolditalic.korean-un.motif=UnDotum Bold # Search Sequences sequence.allfonts=latin-1 -sequence.allfonts.Big5=chinese-big5,latin-1 -sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1 -sequence.allfonts.EUC-KR=korean,latin-1 -sequence.allfonts.GB18030=chinese-gb18030,latin-1 -sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean +sequence.allfonts.GB18030=latin-1,umingcn,shanheisun,wqy-zenhei +sequence.allfonts.GB2312=latin-1,umingcn,shanheisun,wqy-zenhei +sequence.allfonts.GBK=latin-1,umingcn,shanheisun,wqy-zenhei +sequence.allfonts.x-euc-jp-linux=latin-1,japanese-vlgothic,japanese-sazanami,japanese-kochi +sequence.allfonts.EUC-KR=latin-1,korean-un,korean-baekmuk +sequence.allfonts.Big5=latin-1,umingtw,shanheisun,wqy-zenhei +sequence.allfonts.Big5-HKSCS=latin-1,uminghk,shanheisun,wqy-zenhei +#sequence.fallback=uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-kochi,japanese-sazanami,korean-un,korean-baekmuk,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala +sequence.fallback=uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-sazanami,japanese-kochi,korean-un,korean-baekmuk,bengali,gujarati,hindi,oriya,punjabi,tamil,telugu + +# Exclusion Ranges + +exclusion.japanese-kochi=0390-03d6,2200-22ef,2701-27be +exclusion.japanese-sazanami=0390-03d6,2200-22ef,2701-27be +exclusion.japanese-vlgothic=0390-03d6,2200-22ef,2701-27be # Font File Names @@ -144,8 +291,58 @@ filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf -filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf -filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf -filename.AR_PL_ZenKai_Uni=/usr/share/fonts//truetype/arphic/ukai.ttf -filename.Baekmuk_Dotum=/usr/share/fonts/truetype/baekmuk/dotum.ttf +filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc +filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc +filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc +filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf + +filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf +filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf +filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf +filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf +filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf +filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf +filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf +filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf +filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf +filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf +filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf +filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf + +filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf +filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf +filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf +filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf +#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf +filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf +filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf +filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf +filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf +filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf + +filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf +filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf +filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf +filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf +filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf +filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf +filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf +filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf +filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf +filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf +filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf +filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf + +# AWT X11 font paths +awtfontpath.latin-1=/usr/share/fonts/X11/Type1 +awtfontpath.umingcn=/usr/share/fonts/truetype/arphic +awtfontpath.uminghk=/usr/share/fonts/truetype/arphic +awtfontpath.umingtw=/usr/share/fonts/truetype/arphic +awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic +awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy +awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi +awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami +awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic +awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk +awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts diff --git a/src/windows/native/sun/windows/awt_Component.cpp b/src/windows/native/sun/windows/awt_Component.cpp index d98f241a145927f65344bbdb0f81eef9437f9908..0557c6d7ea7063dc28948c2734331b9d717a7fb0 100644 --- a/src/windows/native/sun/windows/awt_Component.cpp +++ b/src/windows/native/sun/windows/awt_Component.cpp @@ -1,5 +1,5 @@ /* - * Copyright 1996-2009 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1996-2010 Sun Microsystems, Inc. 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 @@ -3707,8 +3707,7 @@ void AwtComponent::SetCompositionWindow(RECT& r) if (hIMC == NULL) { return; } - COMPOSITIONFORM cf = {CFS_POINT, {0, r.bottom}, NULL}; - // Place the composition window right below the client Window + COMPOSITIONFORM cf = {CFS_DEFAULT, {0, 0}, {0, 0, 0, 0}}; ImmSetCompositionWindow(hIMC, &cf); } diff --git a/test/java/beans/Statement/Test6707226.java b/test/java/beans/Statement/Test6707226.java new file mode 100644 index 0000000000000000000000000000000000000000..9701de4081c62c6240563a154f6a30a6d175e4c6 --- /dev/null +++ b/test/java/beans/Statement/Test6707226.java @@ -0,0 +1,45 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + * @test + * @bug 6707226 + * @summary Tests the value updating in Expression + * @author Sergey Malenkov + */ + +import java.beans.Expression; + +public class Test6707226 { + public static void main(String[] args) throws Exception { + Object value = new Object(); + + Expression expression = new Expression(value, Object.class, "new", null); + if (!value.equals(expression.getValue())) + throw new Error("the value is updated unexpectedly"); + + expression.execute(); + if (value.equals(expression.getValue())) + throw new Error("the value is not updated as expected"); + } +} diff --git a/test/javax/swing/plaf/synth/Test6933784.java b/test/javax/swing/plaf/synth/Test6933784.java new file mode 100644 index 0000000000000000000000000000000000000000..ceaa4f7d1b8800fc053d9d1022194a31ec87f94b --- /dev/null +++ b/test/javax/swing/plaf/synth/Test6933784.java @@ -0,0 +1,76 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* @test + @bug 6933784 + @summary NIMBUS: ImageView getNoImageIcon and getLoadingImageIcon returns nulls instead of an icon + @author Pavel Porvatov + @run main Test6933784 +*/ + +import javax.swing.*; +import javax.swing.plaf.nimbus.NimbusLookAndFeel; +import javax.swing.plaf.synth.SynthLookAndFeel; +import javax.swing.text.Element; +import javax.swing.text.html.HTMLDocument; +import javax.swing.text.html.HTMLEditorKit; +import javax.swing.text.html.ImageView; +import java.io.StringReader; + +public class Test6933784 { + public static void main(String[] args) throws Exception { + UIManager.setLookAndFeel(new SynthLookAndFeel()); + + checkImages(); + + UIManager.setLookAndFeel(new NimbusLookAndFeel()); + + checkImages(); + } + + private static void checkImages() throws Exception { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + HTMLEditorKit c = new HTMLEditorKit(); + HTMLDocument doc = new HTMLDocument(); + + try { + c.read(new StringReader("Test"), doc, 0); + } catch (Exception e) { + throw new RuntimeException("The test failed", e); + } + + Element elem = doc.getElement("test"); + ImageView iv = new ImageView(elem); + + if (iv.getLoadingImageIcon() == null) { + throw new RuntimeException("getLoadingImageIcon returns null"); + } + + if (iv.getNoImageIcon() == null) { + throw new RuntimeException("getNoImageIcon returns null"); + } + } + }); + } +}