Commit 9de488f6 by Warren Levy Committed by Warren Levy

TimeZone.java (getAvailableIDs): Activated commented out code dependent on…

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

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

From-SVN: r37994
parent 21a16007
2000-12-04 Warren Levy <warrenl@redhat.com> 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>
* java/io/FilePermission.java: Made class final per spec. * java/io/FilePermission.java: Made class final per spec.
* java/text/DecimalFormatSymbols.java (setCurrencySymbol): Changed * java/text/DecimalFormatSymbols.java (setCurrencySymbol): Changed
method name to match spec (fixed typo). method name to match spec (fixed typo).
......
...@@ -646,15 +646,11 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable ...@@ -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 ...@@ -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 ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment