FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TimeZone.java (getAvailableIDs): Activated commented out code dependent on compiler and library changes.

Browse source 
* java/util/TimeZone.java (getAvailableIDs): Activated commented
	out code dependent on compiler and library changes.

From-SVN: r37994
This commit is contained in:
Warren Levy 2000-12-04 10:24:38 +00:00 • committed by Warren Levy
parent 21a160075e
commit 9de488f698
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

@ -1,3 +1,8 @@
2000-12-04 Warren Levy <warrenl@redhat.com>
* java/util/TimeZone.java (getAvailableIDs): Activated commented
out code dependent on compiler and library changes.
2000-12-04 Warren Levy <warrenl@redhat.com> 2000-12-04 Warren Levy <warrenl@redhat.com>
* java/io/FilePermission.java: Made class final per spec. * java/io/FilePermission.java: Made class final per spec.

10
libjava/java/util/TimeZone.java
View file

@ -646,15 +646,11 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600); Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600);
timezones.put("Australia/Melbourne", tz); timezones.put("Australia/Melbourne", tz);
timezones.put("Australia/Sydney", tz); timezones.put("Australia/Sydney", tz);
/******************************************************************
* FIXME: XXX: Not yet available in libgcj. Need new jdk 1.2
* SimpleTimeZone constructor.
tz = new SimpleTimeZone tz = new SimpleTimeZone
(10500 * 3600, "Australia/Lord_Howe", (10500 * 3600, "Australia/Lord_Howe",
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600, Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600,
Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600, 500 * 3600); Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600, 500 * 3600);
timezones.put("Australia/Lord_Howe", tz); timezones.put("Australia/Lord_Howe", tz);
******************************************************************/
tz = new SimpleTimeZone tz = new SimpleTimeZone
(11000 * 3600, "Asia/Magadan", (11000 * 3600, "Asia/Magadan",
Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600, Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
@ -1012,8 +1008,6 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
* offset. For example <code>{"Phoenix", "Denver"}</code>, since both have * offset. For example <code>{"Phoenix", "Denver"}</code>, since both have
* GMT-07:00, but differ in daylight savings behaviour. * GMT-07:00, but differ in daylight savings behaviour.
*/ */
/******************************************************************
* FIXME: XXX: Not yet available in libgcj. Need jdk 1.2 Iterator and Map.
public static String[] getAvailableIDs(int rawOffset) public static String[] getAvailableIDs(int rawOffset)
{ {
int count = 0; int count = 0;
@ -1038,20 +1032,16 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
} }
return ids; return ids;
} }
******************************************************************/
/** /**
* Gets all available IDs. * Gets all available IDs.
* @return An array of all supported IDs. * @return An array of all supported IDs.
*/ */
/******************************************************************
* FIXME: XXX: Not yet available in libgcj. Need jdk 1.2 java.util.Map.
public static String[] getAvailableIDs() public static String[] getAvailableIDs()
{ {
return (String[]) return (String[])
timezones.keySet().toArray(new String[timezones.size()]); timezones.keySet().toArray(new String[timezones.size()]);
} }
******************************************************************/
/** /**
* Returns the time zone under which the host is running. This * Returns the time zone under which the host is running. This