[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: timezone fixes

Kaffe CVS cvs-commits at kaffe.org
Sat Jun 11 04:24:40 PDT 2005


PatchSet 6621 
Date: 2005/06/11 11:18:43
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: timezone fixes

Members: 
	ChangeLog:1.4147->1.4148 
	libraries/javalib/java/util/TimeZone.java:INITIAL->1.25 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4147 kaffe/ChangeLog:1.4148
--- kaffe/ChangeLog:1.4147	Sat Jun 11 00:04:23 2005
+++ kaffe/ChangeLog	Sat Jun 11 11:18:43 2005
@@ -1,3 +1,12 @@
+2005-06-11  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
+	2005-06-01  Sven de Marothy  <sven at physto.se>
+
+	* java/util/TimeZone (getDefaultTimeZone): Reimplemented.
+	(parseTime, getDateParams): New private methods.
+
 2005-06-10  Dalibor Topic  <robilad at kaffe.org>
 
 	Resynced with GNU Classpath.
===================================================================
Checking out kaffe/libraries/javalib/java/util/TimeZone.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/java/util/TimeZone.java,v
VERS: 1.25
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/java/util/TimeZone.java	Sat Jun 11 11:24:39 2005
@@ -0,0 +1,1523 @@
+/* java.util.TimeZone
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.util;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.text.DateFormatSymbols;
+
+/**
+ * This class represents a time zone offset and handles daylight savings.
+ * 
+ * You can get the default time zone with <code>getDefault</code>.
+ * This represents the time zone where program is running.
+ *
+ * Another way to create a time zone is <code>getTimeZone</code>, where
+ * you can give an identifier as parameter.  For instance, the identifier
+ * of the Central European Time zone is "CET".
+ *
+ * With the <code>getAvailableIDs</code> method, you can get all the
+ * supported time zone identifiers.
+ *
+ * @see Calendar
+ * @see SimpleTimeZone
+ * @author Jochen Hoenicke
+ */
+public abstract class TimeZone implements java.io.Serializable, Cloneable
+{
+
+  /**
+   * Constant used to indicate that a short timezone abbreviation should
+   * be returned, such as "EST"
+   */
+  public static final int SHORT = 0;
+
+  /**
+   * Constant used to indicate that a long timezone name should be
+   * returned, such as "Eastern Standard Time".
+   */
+  public static final int LONG = 1;
+
+  /**
+   * The time zone identifier, e.g. PST.
+   */
+  private String ID;
+
+  /**
+   * The default time zone, as returned by getDefault.
+   */
+  private static TimeZone defaultZone0;
+
+  /**
+   * Tries to get the default TimeZone for this system if not already
+   * set.  It will call <code>getDefaultTimeZone(String)</code> with
+   * the result of <code>System.getProperty("user.timezone")</code>.
+   * If that fails it calls <code>VMTimeZone.getDefaultTimeZoneId()</code>.
+   * If that also fails GMT is returned.
+   */
+  private static synchronized TimeZone defaultZone()
+  {
+    /* Look up default timezone */
+    if (defaultZone0 == null) 
+      {
+	defaultZone0 = (TimeZone) AccessController.doPrivileged
+	  (new PrivilegedAction()
+	    {
+	      public Object run()
+	      {
+		TimeZone zone = null;
+		
+		// Prefer System property user.timezone.
+		String tzid = System.getProperty("user.timezone");
+		if (tzid != null && !tzid.equals(""))
+		  zone = getDefaultTimeZone(tzid);
+		
+		// Try platfom specific way.
+		if (zone == null)
+		  zone = VMTimeZone.getDefaultTimeZoneId();
+		
+		// Fall back on GMT.
+		if (zone == null)
+		  zone = (TimeZone) timezones().get("GMT");
+		
+		return zone;
+	      }
+	    });
+      }
+    
+    return defaultZone0; 
+  }
+  
+  private static final long serialVersionUID = 3581463369166924961L;
+
+  /**
+   * HashMap for timezones by ID.  
+   */
+  private static HashMap timezones0;
+  /* initialize this static field lazily to overhead if
+   * it is not needed: 
+   */
+  // Package-private to avoid a trampoline.
+  static synchronized HashMap timezones()
+  {
+    if (timezones0 == null) 
+      {
+	HashMap timezones = new HashMap();
+	timezones0 = timezones;
+
+	TimeZone tz;
+	// Automatically generated by scripts/timezones.pl
+	// XXX - Should we read this data from a file?
+	tz = new SimpleTimeZone(-11000 * 3600, "MIT");
+	timezones0.put("MIT", tz);
+	timezones0.put("Pacific/Apia", tz);
+	timezones0.put("Pacific/Midway", tz);
+	timezones0.put("Pacific/Niue", tz);
+	timezones0.put("Pacific/Pago_Pago", tz);
+	tz = new SimpleTimeZone
+	  (-10000 * 3600, "America/Adak",
+	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("America/Adak", tz);
+	tz = new SimpleTimeZone(-10000 * 3600, "HST");
+	timezones0.put("HST", tz);
+	timezones0.put("Pacific/Fakaofo", tz);
+	timezones0.put("Pacific/Honolulu", tz);
+	timezones0.put("Pacific/Johnston", tz);
+	timezones0.put("Pacific/Rarotonga", tz);
+	timezones0.put("Pacific/Tahiti", tz);
+	tz = new SimpleTimeZone(-9500 * 3600, "Pacific/Marquesas");
+	timezones0.put("Pacific/Marquesas", tz);
+	tz = new SimpleTimeZone
+	  (-9000 * 3600, "AST",
+	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("AST", tz);
+	timezones0.put("America/Anchorage", tz);
+	timezones0.put("America/Juneau", tz);
+	timezones0.put("America/Nome", tz);
+	timezones0.put("America/Yakutat", tz);
+	tz = new SimpleTimeZone(-9000 * 3600, "Pacific/Gambier");
+	timezones0.put("Pacific/Gambier", tz);
+	tz = new SimpleTimeZone
+	  (-8000 * 3600, "PST",
+	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("PST", tz);
+	timezones0.put("PST8PDT", tz);
+	timezones0.put("America/Dawson", tz);
+	timezones0.put("America/Los_Angeles", tz);
+	timezones0.put("America/Tijuana", tz);
+	timezones0.put("America/Vancouver", tz);
+	timezones0.put("America/Whitehorse", tz);
+	timezones0.put("US/Pacific-New", tz);
+	tz = new SimpleTimeZone(-8000 * 3600, "Pacific/Pitcairn");
+	timezones0.put("Pacific/Pitcairn", tz);
+	tz = new SimpleTimeZone
+	  (-7000 * 3600, "MST",
+	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("MST", tz);
+	timezones0.put("MST7MDT", tz);
+	timezones0.put("America/Boise", tz);
+	timezones0.put("America/Chihuahua", tz);
+	timezones0.put("America/Denver", tz);
+	timezones0.put("America/Edmonton", tz);
+	timezones0.put("America/Inuvik", tz);
+	timezones0.put("America/Mazatlan", tz);
+	timezones0.put("America/Shiprock", tz);
+	timezones0.put("America/Yellowknife", tz);
+	tz = new SimpleTimeZone(-7000 * 3600, "MST7");
+	timezones0.put("MST7", tz);
+	timezones0.put("PNT", tz);
+	timezones0.put("America/Dawson_Creek", tz);
+	timezones0.put("America/Hermosillo", tz);
+	timezones0.put("America/Phoenix", tz);
+	tz = new SimpleTimeZone
+	  (-6000 * 3600, "CST",
+	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("CST", tz);
+	timezones0.put("CST6CDT", tz);
+	timezones0.put("America/Cambridge_Bay", tz);
+	timezones0.put("America/Cancun", tz);
+	timezones0.put("America/Chicago", tz);
+	timezones0.put("America/Menominee", tz);
+	timezones0.put("America/Merida", tz);
+	timezones0.put("America/Mexico_City", tz);
+	timezones0.put("America/Monterrey", tz);
+	timezones0.put("America/Rainy_River", tz);
+	timezones0.put("America/Winnipeg", tz);
+	tz = new SimpleTimeZone(-6000 * 3600, "America/Belize");
+	timezones0.put("America/Belize", tz);
+	timezones0.put("America/Costa_Rica", tz);
+	timezones0.put("America/El_Salvador", tz);
+	timezones0.put("America/Guatemala", tz);
+	timezones0.put("America/Managua", tz);
+	timezones0.put("America/Regina", tz);
+	timezones0.put("America/Swift_Current", tz);
+	timezones0.put("America/Tegucigalpa", tz);
+	timezones0.put("Pacific/Galapagos", tz);
+	tz = new SimpleTimeZone
+	  (-6000 * 3600, "Pacific/Easter",
+	   Calendar.OCTOBER, 9, -Calendar.SUNDAY, 0 * 3600,
+	   Calendar.MARCH, 9, -Calendar.SUNDAY, 0 * 3600);
+	timezones0.put("Pacific/Easter", tz);
+	tz = new SimpleTimeZone
+	  (-5000 * 3600, "America/Grand_Turk",
+	   Calendar.APRIL, 1, Calendar.SUNDAY, 0 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
+	timezones0.put("America/Grand_Turk", tz);
+	timezones0.put("America/Havana", tz);
+	tz = new SimpleTimeZone(-5000 * 3600, "EST5");
+	timezones0.put("EST5", tz);
+	timezones0.put("IET", tz);
+	timezones0.put("America/Bogota", tz);
+	timezones0.put("America/Cayman", tz);
+	timezones0.put("America/Eirunepe", tz);
+	timezones0.put("America/Guayaquil", tz);
+	timezones0.put("America/Indiana/Indianapolis", tz);
+	timezones0.put("America/Indiana/Knox", tz);
+	timezones0.put("America/Indiana/Marengo", tz);
+	timezones0.put("America/Indiana/Vevay", tz);
+	timezones0.put("America/Indianapolis", tz);
+	timezones0.put("America/Iqaluit", tz);
+	timezones0.put("America/Jamaica", tz);
+	timezones0.put("America/Lima", tz);
+	timezones0.put("America/Panama", tz);
+	timezones0.put("America/Pangnirtung", tz);
+	timezones0.put("America/Port-au-Prince", tz);
+	timezones0.put("America/Porto_Acre", tz);
+	timezones0.put("America/Rankin_Inlet", tz);
+	tz = new SimpleTimeZone
+	  (-5000 * 3600, "EST",
+	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("EST", tz);
+	timezones0.put("EST5EDT", tz);
+	timezones0.put("America/Detroit", tz);
+	timezones0.put("America/Kentucky/Louisville", tz);
+	timezones0.put("America/Kentucky/Monticello", tz);
+	timezones0.put("America/Louisville", tz);
+	timezones0.put("America/Montreal", tz);
+	timezones0.put("America/Nassau", tz);
+	timezones0.put("America/New_York", tz);
+	timezones0.put("America/Nipigon", tz);
+	timezones0.put("America/Thunder_Bay", tz);
+	tz = new SimpleTimeZone(-4000 * 3600, "PRT");
+	timezones0.put("PRT", tz);
+	timezones0.put("America/Anguilla", tz);
+	timezones0.put("America/Antigua", tz);
+	timezones0.put("America/Aruba", tz);
+	timezones0.put("America/Barbados", tz);
+	timezones0.put("America/Boa_Vista", tz);
+	timezones0.put("America/Caracas", tz);
+	timezones0.put("America/Curacao", tz);
+	timezones0.put("America/Dominica", tz);
+	timezones0.put("America/Grenada", tz);
+	timezones0.put("America/Guadeloupe", tz);
+	timezones0.put("America/Guyana", tz);
+	timezones0.put("America/La_Paz", tz);
+	timezones0.put("America/Manaus", tz);
+	timezones0.put("America/Martinique", tz);
+	timezones0.put("America/Montserrat", tz);
+	timezones0.put("America/Port_of_Spain", tz);
+	timezones0.put("America/Porto_Velho", tz);
+	timezones0.put("America/Puerto_Rico", tz);
+	timezones0.put("America/Santo_Domingo", tz);
+	timezones0.put("America/St_Kitts", tz);
+	timezones0.put("America/St_Lucia", tz);
+	timezones0.put("America/St_Thomas", tz);
+	timezones0.put("America/St_Vincent", tz);
+	timezones0.put("America/Tortola", tz);
+	tz = new SimpleTimeZone
+	  (-4000 * 3600, "America/Asuncion",
+	   Calendar.OCTOBER, 1, Calendar.SUNDAY, 0 * 3600,
+	   Calendar.FEBRUARY, -1, Calendar.SUNDAY, 0 * 3600);
+	timezones0.put("America/Asuncion", tz);
+	tz = new SimpleTimeZone
+	  (-4000 * 3600, "America/Cuiaba",
+	   Calendar.OCTOBER, 2, Calendar.SUNDAY, 0 * 3600,
+	   Calendar.FEBRUARY, 3, Calendar.SUNDAY, 0 * 3600);
+	timezones0.put("America/Cuiaba", tz);
+	tz = new SimpleTimeZone
+	  (-4000 * 3600, "America/Goose_Bay",
+	   Calendar.APRIL, 1, Calendar.SUNDAY, 60000,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 60000);
+	timezones0.put("America/Goose_Bay", tz);
+	tz = new SimpleTimeZone
+	  (-4000 * 3600, "America/Glace_Bay",
+	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("America/Glace_Bay", tz);
+	timezones0.put("America/Halifax", tz);
+	timezones0.put("America/Thule", tz);
+	timezones0.put("Atlantic/Bermuda", tz);
+	tz = new SimpleTimeZone
+	  (-4000 * 3600, "America/Santiago",
+	   Calendar.OCTOBER, 9, -Calendar.SUNDAY, 0 * 3600,
+	   Calendar.MARCH, 9, -Calendar.SUNDAY, 0 * 3600);
+	timezones0.put("America/Santiago", tz);
+	timezones0.put("Antarctica/Palmer", tz);
+	tz = new SimpleTimeZone
+	  (-4000 * 3600, "Atlantic/Stanley",
+	   Calendar.SEPTEMBER, 2, Calendar.SUNDAY, 0 * 3600,
+	   Calendar.APRIL, 16, -Calendar.SUNDAY, 0 * 3600);
+	timezones0.put("Atlantic/Stanley", tz);
+	tz = new SimpleTimeZone
+	  (-3500 * 3600, "CNT",
+	   Calendar.APRIL, 1, Calendar.SUNDAY, 60000,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 60000);
+	timezones0.put("CNT", tz);
+	timezones0.put("America/St_Johns", tz);
+	tz = new SimpleTimeZone
+	  (-3000 * 3600, "America/Araguaina",
+	   Calendar.OCTOBER, 2, Calendar.SUNDAY, 0 * 3600,
+	   Calendar.FEBRUARY, 3, Calendar.SUNDAY, 0 * 3600);
+	timezones0.put("America/Araguaina", tz);
+	timezones0.put("America/Sao_Paulo", tz);
+	tz = new SimpleTimeZone(-3000 * 3600, "AGT");
+	timezones0.put("AGT", tz);
+	timezones0.put("America/Belem", tz);
+	timezones0.put("America/Buenos_Aires", tz);
+	timezones0.put("America/Catamarca", tz);
+	timezones0.put("America/Cayenne", tz);
+	timezones0.put("America/Cordoba", tz);
+	timezones0.put("America/Fortaleza", tz);
+	timezones0.put("America/Jujuy", tz);
+	timezones0.put("America/Maceio", tz);
+	timezones0.put("America/Mendoza", tz);
+	timezones0.put("America/Montevideo", tz);
+	timezones0.put("America/Paramaribo", tz);
+	timezones0.put("America/Recife", tz);
+	timezones0.put("America/Rosario", tz);
+	tz = new SimpleTimeZone
+	  (-3000 * 3600, "America/Godthab",
+	   Calendar.MARCH, 30, -Calendar.SATURDAY, 22000 * 3600,
+	   Calendar.OCTOBER, 30, -Calendar.SATURDAY, 22000 * 3600);
+	timezones0.put("America/Godthab", tz);
+	tz = new SimpleTimeZone
+	  (-3000 * 3600, "America/Miquelon",
+	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("America/Miquelon", tz);
+	tz = new SimpleTimeZone(-2000 * 3600, "America/Noronha");
+	timezones0.put("America/Noronha", tz);
+	timezones0.put("Atlantic/South_Georgia", tz);
+	tz = new SimpleTimeZone
+	  (-1000 * 3600, "America/Scoresbysund",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 0 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
+	timezones0.put("America/Scoresbysund", tz);
+	timezones0.put("Atlantic/Azores", tz);
+	tz = new SimpleTimeZone(-1000 * 3600, "Atlantic/Cape_Verde");
+	timezones0.put("Atlantic/Cape_Verde", tz);
+	timezones0.put("Atlantic/Jan_Mayen", tz);
+	tz = new SimpleTimeZone(0 * 3600, "GMT");
+	timezones0.put("GMT", tz);
+	timezones0.put("UTC", tz);
+	timezones0.put("Africa/Abidjan", tz);
+	timezones0.put("Africa/Accra", tz);
+	timezones0.put("Africa/Bamako", tz);
+	timezones0.put("Africa/Banjul", tz);
+	timezones0.put("Africa/Bissau", tz);
+	timezones0.put("Africa/Casablanca", tz);
+	timezones0.put("Africa/Conakry", tz);
+	timezones0.put("Africa/Dakar", tz);
+	timezones0.put("Africa/El_Aaiun", tz);
+	timezones0.put("Africa/Freetown", tz);
+	timezones0.put("Africa/Lome", tz);
+	timezones0.put("Africa/Monrovia", tz);
+	timezones0.put("Africa/Nouakchott", tz);
+	timezones0.put("Africa/Ouagadougou", tz);
+	timezones0.put("Africa/Sao_Tome", tz);
+	timezones0.put("Africa/Timbuktu", tz);
+	timezones0.put("Atlantic/Reykjavik", tz);
+	timezones0.put("Atlantic/St_Helena", tz);
+	timezones0.put("Europe/Belfast", tz);
+	timezones0.put("Europe/Dublin", tz);
+	timezones0.put("Europe/London", tz);
+	tz = new SimpleTimeZone
+	  (0 * 3600, "WET",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 1000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 1000 * 3600);
+	timezones0.put("WET", tz);
+	timezones0.put("Atlantic/Canary", tz);
+	timezones0.put("Atlantic/Faeroe", tz);
+	timezones0.put("Atlantic/Madeira", tz);
+	timezones0.put("Europe/Lisbon", tz);
+	tz = new SimpleTimeZone(1000 * 3600, "Africa/Algiers");
+	timezones0.put("Africa/Algiers", tz);
+	timezones0.put("Africa/Bangui", tz);
+	timezones0.put("Africa/Brazzaville", tz);
+	timezones0.put("Africa/Douala", tz);
+	timezones0.put("Africa/Kinshasa", tz);
+	timezones0.put("Africa/Lagos", tz);
+	timezones0.put("Africa/Libreville", tz);
+	timezones0.put("Africa/Luanda", tz);
+	timezones0.put("Africa/Malabo", tz);
+	timezones0.put("Africa/Ndjamena", tz);
+	timezones0.put("Africa/Niamey", tz);
+	timezones0.put("Africa/Porto-Novo", tz);
+	timezones0.put("Africa/Tunis", tz);
+	tz = new SimpleTimeZone
+	  (1000 * 3600, "Africa/Windhoek",
+	   Calendar.SEPTEMBER, 1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("Africa/Windhoek", tz);
+	tz = new SimpleTimeZone
+	  (1000 * 3600, "CET",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("CET", tz);
+	timezones0.put("CEST", tz);
+	timezones0.put("ECT", tz);
+	timezones0.put("MET", tz);
+	timezones0.put("Africa/Ceuta", tz);
+	timezones0.put("Arctic/Longyearbyen", tz);
+	timezones0.put("Europe/Amsterdam", tz);
+	timezones0.put("Europe/Andorra", tz);
+	timezones0.put("Europe/Belgrade", tz);
+	timezones0.put("Europe/Berlin", tz);
+	timezones0.put("Europe/Bratislava", tz);
+	timezones0.put("Europe/Brussels", tz);
+	timezones0.put("Europe/Budapest", tz);
+	timezones0.put("Europe/Copenhagen", tz);
+	timezones0.put("Europe/Gibraltar", tz);
+	timezones0.put("Europe/Ljubljana", tz);
+	timezones0.put("Europe/Luxembourg", tz);
+	timezones0.put("Europe/Madrid", tz);
+	timezones0.put("Europe/Malta", tz);
+	timezones0.put("Europe/Monaco", tz);
+	timezones0.put("Europe/Oslo", tz);
+	timezones0.put("Europe/Paris", tz);
+	timezones0.put("Europe/Prague", tz);
+	timezones0.put("Europe/Rome", tz);
+	timezones0.put("Europe/San_Marino", tz);
+	timezones0.put("Europe/Sarajevo", tz);
+	timezones0.put("Europe/Skopje", tz);
+	timezones0.put("Europe/Stockholm", tz);
+	timezones0.put("Europe/Tirane", tz);
+	timezones0.put("Europe/Vaduz", tz);
+	timezones0.put("Europe/Vatican", tz);
+	timezones0.put("Europe/Vienna", tz);
+	timezones0.put("Europe/Warsaw", tz);
+	timezones0.put("Europe/Zagreb", tz);
+	timezones0.put("Europe/Zurich", tz);
+	tz = new SimpleTimeZone
+	  (2000 * 3600, "ART",
+	   Calendar.APRIL, -1, Calendar.FRIDAY, 0 * 3600,
+	   Calendar.SEPTEMBER, -1, Calendar.THURSDAY, 23000 * 3600);
+	timezones0.put("ART", tz);
+	timezones0.put("Africa/Cairo", tz);
+	tz = new SimpleTimeZone(2000 * 3600, "CAT");
+	timezones0.put("CAT", tz);
+	timezones0.put("Africa/Blantyre", tz);
+	timezones0.put("Africa/Bujumbura", tz);
+	timezones0.put("Africa/Gaborone", tz);
+	timezones0.put("Africa/Harare", tz);
+	timezones0.put("Africa/Johannesburg", tz);
+	timezones0.put("Africa/Kigali", tz);
+	timezones0.put("Africa/Lubumbashi", tz);
+	timezones0.put("Africa/Lusaka", tz);
+	timezones0.put("Africa/Maputo", tz);
+	timezones0.put("Africa/Maseru", tz);
+	timezones0.put("Africa/Mbabane", tz);
+	timezones0.put("Africa/Tripoli", tz);
+	timezones0.put("Europe/Riga", tz);
+	timezones0.put("Europe/Tallinn", tz);
+	timezones0.put("Europe/Vilnius", tz);
+	tz = new SimpleTimeZone
+	  (2000 * 3600, "Asia/Amman",
+	   Calendar.MARCH, -1, Calendar.THURSDAY, 0 * 3600,
+	   Calendar.SEPTEMBER, -1, Calendar.THURSDAY, 0 * 3600);
+	timezones0.put("Asia/Amman", tz);
+	tz = new SimpleTimeZone
+	  (2000 * 3600, "Asia/Beirut",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 0 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
+	timezones0.put("Asia/Beirut", tz);
+	tz = new SimpleTimeZone
+	  (2000 * 3600, "Asia/Damascus",
+	   Calendar.APRIL, 1, 0, 0 * 3600,
+	   Calendar.OCTOBER, 1, 0, 0 * 3600);
+	timezones0.put("Asia/Damascus", tz);
+	tz = new SimpleTimeZone
+	  (2000 * 3600, "Asia/Gaza",
+	   Calendar.APRIL, 3, Calendar.FRIDAY, 0 * 3600,
+	   Calendar.OCTOBER, 3, Calendar.FRIDAY, 0 * 3600);
+	timezones0.put("Asia/Gaza", tz);
+	tz = new SimpleTimeZone
+	  (2000 * 3600, "Asia/Jerusalem",
+	   Calendar.APRIL, 1, 0, 1000 * 3600,
+	   Calendar.OCTOBER, 1, 0, 1000 * 3600);
+	timezones0.put("Asia/Jerusalem", tz);
+	tz = new SimpleTimeZone
+	  (2000 * 3600, "EET",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 3000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
+	timezones0.put("EET", tz);
+	timezones0.put("Asia/Istanbul", tz);
+	timezones0.put("Asia/Nicosia", tz);
+	timezones0.put("Europe/Athens", tz);
+	timezones0.put("Europe/Bucharest", tz);
+	timezones0.put("Europe/Chisinau", tz);
+	timezones0.put("Europe/Helsinki", tz);
+	timezones0.put("Europe/Istanbul", tz);
+	timezones0.put("Europe/Kiev", tz);
+	timezones0.put("Europe/Nicosia", tz);
+	timezones0.put("Europe/Simferopol", tz);
+	timezones0.put("Europe/Sofia", tz);
+	timezones0.put("Europe/Uzhgorod", tz);
+	timezones0.put("Europe/Zaporozhye", tz);
+	tz = new SimpleTimeZone
+	  (2000 * 3600, "Europe/Kaliningrad",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("Europe/Kaliningrad", tz);
+	timezones0.put("Europe/Minsk", tz);
+	tz = new SimpleTimeZone
+	  (3000 * 3600, "Asia/Baghdad",
+	   Calendar.APRIL, 1, 0, 3000 * 3600,
+	   Calendar.OCTOBER, 1, 0, 3000 * 3600);
+	timezones0.put("Asia/Baghdad", tz);
+	tz = new SimpleTimeZone
+	  (3000 * 3600, "Europe/Moscow",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("Europe/Moscow", tz);
+	timezones0.put("Europe/Tiraspol", tz);
+	tz = new SimpleTimeZone(3000 * 3600, "EAT");
+	timezones0.put("EAT", tz);
+	timezones0.put("Africa/Addis_Ababa", tz);
+	timezones0.put("Africa/Asmera", tz);
+	timezones0.put("Africa/Dar_es_Salaam", tz);
+	timezones0.put("Africa/Djibouti", tz);
+	timezones0.put("Africa/Kampala", tz);
+	timezones0.put("Africa/Khartoum", tz);
+	timezones0.put("Africa/Mogadishu", tz);
+	timezones0.put("Africa/Nairobi", tz);
+	timezones0.put("Antarctica/Syowa", tz);
+	timezones0.put("Asia/Aden", tz);
+	timezones0.put("Asia/Bahrain", tz);
+	timezones0.put("Asia/Kuwait", tz);
+	timezones0.put("Asia/Qatar", tz);
+	timezones0.put("Asia/Riyadh", tz);
+	timezones0.put("Indian/Antananarivo", tz);
+	timezones0.put("Indian/Comoro", tz);
+	timezones0.put("Indian/Mayotte", tz);
+	tz = new SimpleTimeZone(3500 * 3600, "Asia/Tehran");
+	timezones0.put("Asia/Tehran", tz);
+	tz = new SimpleTimeZone
+	  (4000 * 3600, "Asia/Baku",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 1000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 1000 * 3600);
+	timezones0.put("Asia/Baku", tz);
+	tz = new SimpleTimeZone
+	  (4000 * 3600, "Asia/Aqtau",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 0 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
+	timezones0.put("Asia/Aqtau", tz);
+	timezones0.put("Asia/Tbilisi", tz);
+	tz = new SimpleTimeZone
+	  (4000 * 3600, "Asia/Yerevan",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("Asia/Yerevan", tz);
+	timezones0.put("Europe/Samara", tz);
+	tz = new SimpleTimeZone(4000 * 3600, "NET");
+	timezones0.put("NET", tz);
+	timezones0.put("Asia/Dubai", tz);
+	timezones0.put("Asia/Muscat", tz);
+	timezones0.put("Indian/Mahe", tz);
+	timezones0.put("Indian/Mauritius", tz);
+	timezones0.put("Indian/Reunion", tz);
+	tz = new SimpleTimeZone(4500 * 3600, "Asia/Kabul");
+	timezones0.put("Asia/Kabul", tz);
+	tz = new SimpleTimeZone
+	  (5000 * 3600, "Asia/Aqtobe",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 0 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
+	timezones0.put("Asia/Aqtobe", tz);
+	tz = new SimpleTimeZone
+	  (5000 * 3600, "Asia/Bishkek",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2500 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2500 * 3600);
+	timezones0.put("Asia/Bishkek", tz);
+	tz = new SimpleTimeZone
+	  (5000 * 3600, "Asia/Yekaterinburg",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("Asia/Yekaterinburg", tz);
+	tz = new SimpleTimeZone(5000 * 3600, "PLT");
+	timezones0.put("PLT", tz);
+	timezones0.put("Asia/Ashgabat", tz);
+	timezones0.put("Asia/Dushanbe", tz);
+	timezones0.put("Asia/Karachi", tz);
+	timezones0.put("Asia/Samarkand", tz);
+	timezones0.put("Asia/Tashkent", tz);
+	timezones0.put("Indian/Chagos", tz);
+	timezones0.put("Indian/Kerguelen", tz);
+	timezones0.put("Indian/Maldives", tz);
+	tz = new SimpleTimeZone(5500 * 3600, "IST");
+	timezones0.put("IST", tz);
+	timezones0.put("Asia/Calcutta", tz);
+	tz = new SimpleTimeZone(5750 * 3600, "Asia/Katmandu");
+	timezones0.put("Asia/Katmandu", tz);
+	tz = new SimpleTimeZone(6000 * 3600, "BST");
+	timezones0.put("BST", tz);
+	timezones0.put("Antarctica/Mawson", tz);
+	timezones0.put("Asia/Colombo", tz);
+	timezones0.put("Asia/Dhaka", tz);
+	timezones0.put("Asia/Thimphu", tz);
+	tz = new SimpleTimeZone
+	  (6000 * 3600, "Asia/Almaty",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 0 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
+	timezones0.put("Asia/Almaty", tz);
+	tz = new SimpleTimeZone
+	  (6000 * 3600, "Asia/Novosibirsk",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("Asia/Novosibirsk", tz);
+	timezones0.put("Asia/Omsk", tz);
+	tz = new SimpleTimeZone(6500 * 3600, "Asia/Rangoon");
+	timezones0.put("Asia/Rangoon", tz);
+	timezones0.put("Indian/Cocos", tz);
+	tz = new SimpleTimeZone(7000 * 3600, "VST");
+	timezones0.put("VST", tz);
+	timezones0.put("Antarctica/Davis", tz);
+	timezones0.put("Asia/Bangkok", tz);
+	timezones0.put("Asia/Hovd", tz);
+	timezones0.put("Asia/Jakarta", tz);
+	timezones0.put("Asia/Phnom_Penh", tz);
+	timezones0.put("Asia/Saigon", tz);
+	timezones0.put("Asia/Vientiane", tz);
+	timezones0.put("Indian/Christmas", tz);
+	tz = new SimpleTimeZone
+	  (7000 * 3600, "Asia/Krasnoyarsk",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("Asia/Krasnoyarsk", tz);
+	tz = new SimpleTimeZone(8000 * 3600, "CTT");
+	timezones0.put("CTT", tz);
+	timezones0.put("Antarctica/Casey", tz);
+	timezones0.put("Asia/Brunei", tz);
+	timezones0.put("Asia/Chungking", tz);
+	timezones0.put("Asia/Harbin", tz);
+	timezones0.put("Asia/Hong_Kong", tz);
+	timezones0.put("Asia/Kashgar", tz);
+	timezones0.put("Asia/Kuala_Lumpur", tz);
+	timezones0.put("Asia/Kuching", tz);
+	timezones0.put("Asia/Macao", tz);
+	timezones0.put("Asia/Manila", tz);
+	timezones0.put("Asia/Shanghai", tz);
+	timezones0.put("Asia/Singapore", tz);
+	timezones0.put("Asia/Taipei", tz);
+	timezones0.put("Asia/Ujung_Pandang", tz);
+	timezones0.put("Asia/Ulaanbaatar", tz);
+	timezones0.put("Asia/Urumqi", tz);
+	timezones0.put("Australia/Perth", tz);
+	tz = new SimpleTimeZone
+	  (8000 * 3600, "Asia/Irkutsk",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("Asia/Irkutsk", tz);
+	tz = new SimpleTimeZone(9000 * 3600, "JST");
+	timezones0.put("JST", tz);
+	timezones0.put("Asia/Dili", tz);
+	timezones0.put("Asia/Jayapura", tz);
+	timezones0.put("Asia/Pyongyang", tz);
+	timezones0.put("Asia/Seoul", tz);
+	timezones0.put("Asia/Tokyo", tz);
+	timezones0.put("Pacific/Palau", tz);
+	tz = new SimpleTimeZone
+	  (9000 * 3600, "Asia/Yakutsk",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("Asia/Yakutsk", tz);
+	tz = new SimpleTimeZone
+	  (9500 * 3600, "Australia/Adelaide",
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("Australia/Adelaide", tz);
+	timezones0.put("Australia/Broken_Hill", tz);
+	tz = new SimpleTimeZone(9500 * 3600, "ACT");
+	timezones0.put("ACT", tz);
+	timezones0.put("Australia/Darwin", tz);
+	tz = new SimpleTimeZone(10000 * 3600, "Antarctica/DumontDUrville");
+	timezones0.put("Antarctica/DumontDUrville", tz);
+	timezones0.put("Australia/Brisbane", tz);
+	timezones0.put("Australia/Lindeman", tz);
+	timezones0.put("Pacific/Guam", tz);
+	timezones0.put("Pacific/Port_Moresby", tz);
+	timezones0.put("Pacific/Saipan", tz);
+	timezones0.put("Pacific/Truk", tz);
+	timezones0.put("Pacific/Yap", tz);
+	tz = new SimpleTimeZone
+	  (10000 * 3600, "Asia/Vladivostok",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("Asia/Vladivostok", tz);
+	tz = new SimpleTimeZone
+	  (10000 * 3600, "Australia/Hobart",
+	   Calendar.OCTOBER, 1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("Australia/Hobart", tz);
+	tz = new SimpleTimeZone
+	  (10000 * 3600, "AET",
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("AET", tz);
+	timezones0.put("Australia/Melbourne", tz);
+	timezones0.put("Australia/Sydney", tz);
+	tz = new SimpleTimeZone
+	  (10500 * 3600, "Australia/Lord_Howe",
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600, 500 * 3600);
+	timezones0.put("Australia/Lord_Howe", tz);
+	tz = new SimpleTimeZone
+	  (11000 * 3600, "Asia/Magadan",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("Asia/Magadan", tz);
+	tz = new SimpleTimeZone(11000 * 3600, "SST");
+	timezones0.put("SST", tz);
+	timezones0.put("Pacific/Efate", tz);
+	timezones0.put("Pacific/Guadalcanal", tz);
+	timezones0.put("Pacific/Kosrae", tz);
+	timezones0.put("Pacific/Noumea", tz);
+	timezones0.put("Pacific/Ponape", tz);
+	tz = new SimpleTimeZone(11500 * 3600, "Pacific/Norfolk");
+	timezones0.put("Pacific/Norfolk", tz);
+	tz = new SimpleTimeZone
+	  (12000 * 3600, "NST",
+	   Calendar.OCTOBER, 1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.MARCH, 3, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("NST", tz);
+	timezones0.put("Antarctica/McMurdo", tz);
+	timezones0.put("Antarctica/South_Pole", tz);
+	timezones0.put("Pacific/Auckland", tz);
+	tz = new SimpleTimeZone
+	  (12000 * 3600, "Asia/Anadyr",
+	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+	timezones0.put("Asia/Anadyr", tz);
+	timezones0.put("Asia/Kamchatka", tz);
+	tz = new SimpleTimeZone(12000 * 3600, "Pacific/Fiji");
+	timezones0.put("Pacific/Fiji", tz);
+	timezones0.put("Pacific/Funafuti", tz);
+	timezones0.put("Pacific/Kwajalein", tz);
+	timezones0.put("Pacific/Majuro", tz);
+	timezones0.put("Pacific/Nauru", tz);
+	timezones0.put("Pacific/Tarawa", tz);
+	timezones0.put("Pacific/Wake", tz);
+	timezones0.put("Pacific/Wallis", tz);
+	tz = new SimpleTimeZone
+	  (12750 * 3600, "Pacific/Chatham",
+	   Calendar.OCTOBER, 1, Calendar.SUNDAY, 2750 * 3600,
+	   Calendar.MARCH, 3, Calendar.SUNDAY, 2750 * 3600);
+	timezones0.put("Pacific/Chatham", tz);
+	tz = new SimpleTimeZone(13000 * 3600, "Pacific/Enderbury");
+	timezones0.put("Pacific/Enderbury", tz);
+	timezones0.put("Pacific/Tongatapu", tz);
+	tz = new SimpleTimeZone(14000 * 3600, "Pacific/Kiritimati");
+	timezones0.put("Pacific/Kiritimati", tz);
+      }
+    return timezones0;
+  }
+
+  /**
+   * Maps a time zone name (with optional GMT offset and daylight time
+   * zone name) to one of the known time zones.  This method called
+   * with the result of <code>System.getProperty("user.timezone")</code>
+   * or <code>getDefaultTimeZoneId()</code>.  Note that giving one of
+   * the standard tz data names from ftp://elsie.nci.nih.gov/pub/ is
+   * preferred.  
+   * The time zone name can be given as follows:
+   * <code>(standard zone name)[(GMT offset)[(DST zone name)[DST offset]]]
+   * </code>
+   * <p>
+   * If only a (standard zone name) is given (no numbers in the
+   * String) then it gets mapped directly to the TimeZone with that
+   * name, if that fails null is returned.
+   * <p>
+   * Alternately, a POSIX-style TZ string can be given, defining the time zone:
+   * <code>std offset dst offset,date/time,date/time</code>
+   * See the glibc manual, or the man page for <code>tzset</code> for details
+   * of this format.
+   * <p>
+   * A GMT offset is the offset to add to the local time to get GMT.
+   * If a (GMT offset) is included (either in seconds or hours) then
+   * an attempt is made to find a TimeZone name matching both the name
+   * and the offset (that doesn't observe daylight time, if the
+   * timezone observes daylight time then you must include a daylight
+   * time zone name after the offset), if that fails then a TimeZone
+   * with the given GMT offset is returned (whether or not the
+   * TimeZone observes daylight time is ignored), if that also fails
+   * the GMT TimeZone is returned.
+   * <p>
+   * If the String ends with (GMT offset)(daylight time zone name)
+   * then an attempt is made to find a TimeZone with the given name and
+   * GMT offset that also observes (the daylight time zone name is not
+   * currently used in any other way), if that fails a TimeZone with
+   * the given GMT offset that observes daylight time is returned, if
+   * that also fails the GMT TimeZone is returned.
+   * <p>
+   * Examples: In Chicago, the time zone id could be "CST6CDT", but
+   * the preferred name would be "America/Chicago".  In Indianapolis
+   * (which does not have Daylight Savings Time) the string could be
+   * "EST5", but the preferred name would be "America/Indianapolis".
+   * The standard time zone name for The Netherlands is "Europe/Amsterdam",
+   * but can also be given as "CET-1CEST".
+   */
+  static TimeZone getDefaultTimeZone(String sysTimeZoneId)
+  {
+    String stdName = null;
+    String dstName;
+    int stdOffs;
+    int dstOffs;
+    try
+      {
+	int idLength = sysTimeZoneId.length();
+
+	int index = 0;
+	int prevIndex;
+	char c;
+
+	// get std
+	do
+	  c = sysTimeZoneId.charAt(index++);
+	while (c != '+' && c != '-' && c != ',' && c != ':'
+	       && ! Character.isDigit(c) && c != '\0' && index < idLength);
+
+	if (index >= idLength)
+	  return (TimeZone)timezones().get(sysTimeZoneId);
+
+	stdName = sysTimeZoneId.substring(0, --index);
+	prevIndex = index;
+
+	// get the std offset
+	do
+	  c = sysTimeZoneId.charAt(index++);
+	while ((c == '-' || c == '+' || c == ':' || Character.isDigit(c))
+	       && index < idLength);
+	if (index < idLength)
+	  index--;
+
+	{ // convert the dst string to a millis number
+	    String offset = sysTimeZoneId.substring(prevIndex, index);
+	    prevIndex = index;
+
+	    if (offset.charAt(0) == '+' || offset.charAt(0) == '-')
+	      stdOffs = parseTime(offset.substring(1));
+	    else
+	      stdOffs = parseTime(offset);
+
+	    if (offset.charAt(0) == '-')
+	      stdOffs = -stdOffs;
+
+	    // TZ timezone offsets are positive when WEST of the meridian.
+	    stdOffs = -stdOffs;
+	}
+
+	// Done yet? (Format: std offset)
+	if (index >= idLength)
+	  {
+	    // Do we have an existing timezone with that name and offset?
+	    TimeZone tz = (TimeZone) timezones().get(stdName);
+	    if (tz != null)
+	      if (tz.getRawOffset() == stdOffs)
+		return tz;
+
+	    // Custom then.
+	    return new SimpleTimeZone(stdOffs, stdName);
+	  }
+
+	// get dst
+	do
+	  c = sysTimeZoneId.charAt(index++);
+	while (c != '+' && c != '-' && c != ',' && c != ':'
+	       && ! Character.isDigit(c) && c != '\0' && index < idLength);
+
+	// Done yet? (Format: std offset dst)
+	if (index >= idLength)
+	  {
+	    // Do we have an existing timezone with that name and offset 
+	    // which has DST?
+	    TimeZone tz = (TimeZone) timezones().get(stdName);
+	    if (tz != null)
+	      if (tz.getRawOffset() == stdOffs && tz.useDaylightTime())
+		return tz;
+
+	    // Custom then.
+	    return new SimpleTimeZone(stdOffs, stdName);
+	  }
+
+	// get the dst offset
+	dstName = sysTimeZoneId.substring(prevIndex, --index);
+	prevIndex = index;
+	do
+	  c = sysTimeZoneId.charAt(index++);
+	while ((c == '-' || c == '+' || c == ':' || Character.isDigit(c))
+	       && index < idLength);
+	if (index < idLength)
+	  index--;
+
+	{ // convert the dst string to a millis number
+	    String offset = sysTimeZoneId.substring(prevIndex, index);
+	    prevIndex = index;
+
+	    if (offset.charAt(0) == '+' || offset.charAt(0) == '-')
+	      dstOffs = parseTime(offset.substring(1));
+	    else
+	      dstOffs = parseTime(offset);
+
+	    if (offset.charAt(0) == '-')
+	      dstOffs = -dstOffs;
+
+	    // TZ timezone offsets are positive when WEST of the meridian.
+	    dstOffs = -dstOffs;
+	}
+
+	// Done yet? (Format: std offset dst offset)
+	// FIXME: We don't support DST without a rule given. Should we?
+	if (index >= idLength)
+	  {

*** Patch too long, truncated ***




More information about the kaffe mailing list