diff options
| author | Warren Levy <warrenl@redhat.com> | 2001-01-09 07:07:51 +0000 |
|---|---|---|
| committer | Warren Levy <warrenl@gcc.gnu.org> | 2001-01-09 07:07:51 +0000 |
| commit | 3824a4860080dbc3b140e1eb7fa2b4efed115b81 (patch) | |
| tree | 59c853c9c93930e645e808160cee16a1368a3fc2 /libjava/java/text | |
| parent | 61db460830bf37e7803f95472cead5cc3ba87da3 (diff) | |
| download | gcc-3824a4860080dbc3b140e1eb7fa2b4efed115b81.zip gcc-3824a4860080dbc3b140e1eb7fa2b4efed115b81.tar.gz gcc-3824a4860080dbc3b140e1eb7fa2b4efed115b81.tar.bz2 | |
re PR libgcj/1411 (natTimeZone.cc should be removed)
Fix for PR libgcj/1411:
* Makefile.am: Removed java/util/natTimeZone.cc.
* Makefile.in: Rebuilt.
* gnu/gcj/text/LocaleData_en_US.java (zoneStringsDefault): Added
missing localized timezone names.
* java/lang/System.java (getDefaultTimeZoneId): New private method.
* java/lang/natSystem.cc (getSystemTimeZone): New private method.
(init_properties): Set user.timezone property.
* java/text/DateFormatSymbols.java (zoneStringsDefault): Added
default timezone names; removed non-standard ones. Use standard
ID names per JCL.
* java/util/Date.java (toGMTString): Removed zoneGMT variable.
(UTC): Ditto.
* java/util/TimeZone.java: Add standard ID names per JCL; removed
non-standard ones.
(getDefaultTimeZoneId): Removed.
(zoneGMT): Removed.
(getDefaultTimeZoneId): Removed.
* java/util/natTimeZone.cc: Removed.
From-SVN: r38816
Diffstat (limited to 'libjava/java/text')
| -rw-r--r-- | libjava/java/text/DateFormatSymbols.java | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/libjava/java/text/DateFormatSymbols.java b/libjava/java/text/DateFormatSymbols.java index efe1d89..252f9fa 100644 --- a/libjava/java/text/DateFormatSymbols.java +++ b/libjava/java/text/DateFormatSymbols.java @@ -81,24 +81,18 @@ public class DateFormatSymbols extends Object /**/ "Eastern Standard Time", "EST", "Indianapolis" }, { "PRT", "Atlantic Standard Time", "AST", /**/ "Atlantic Daylight Time", "ADT", "Halifax" }, + { "CNT", "Newfoundland Standard Time", "NST", + /**/ "Newfoundland Daylight Time", "NDT", "St. Johns" }, + { "ECT", "Central European Standard Time", "CET", + /**/ "Central European Daylight Time", "CEST", "Paris" }, + { "CTT", "China Standard Time", "CST", + /**/ "China Standard Time", "CST", "Shanghai" }, + { "JST", "Japan Standard Time", "JST", + /**/ "Japan Standard Time", "JST", "Tokyo" }, { "HST", "Hawaii Standard Time", "HST", - /**/ "Hawaii Daylight Time", "HDT", "Honolulu" }, - { "AST", "Alaska Standard Time", "AST", - /**/ "Alaska Daylight Time", "ADT", "Anchorage" }, - { "PST8PDT", "Pacific Standard Time", "PST", - /******/ "Pacific Daylight Time", "PDT", "San Francisco" }, - { "MST7MDT", "Mountain Standard Time", "MST", - /******/ "Mountain Daylight Time", "MDT", "Denver" }, - { "CST6CDT", "Central Standard Time", "CST", - /******/ "Central Daylight Time", "CDT", "Chicago" }, - { "EST5EDT", "Eastern Standard Time", "EST", - /******/ "Eastern Daylight Time", "EDT", "Boston" }, - { "AST4ADT", "Atlantic Standard Time", "AST", - /******/ "Atlantic Daylight Time", "ADT", "Halifax" }, - { "HST10HDT", "Hawaii Standard Time", "HST", - /*******/ "Hawaii Daylight Time", "HDT", "Honolulu" }, - { "AST9ADT", "Alaska Standard Time", "AKST", - /******/ "Alaska Daylight Time", "AKDT", "Anchorage" } + /**/ "Hawaii Standard Time", "HST", "Honolulu" }, + { "AST", "Alaska Standard Time", "AKST", + /**/ "Alaska Daylight Time", "AKDT", "Anchorage" } }; // These are each arrays with a value for SHORT, MEDIUM, LONG, FULL, |