[Jython-checkins] CVS: jython/org/python/modules time.java,2.16,2.17

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/modules
In directory usw-pr-cvs1:/tmp/cvs-serv18599

Modified Files:
	time.java 
Log Message:
[ #450938 ] time module requires JDK 1.4

Use reflection to call tz.getDisplayName() and tz.getDSTSavings() when
running on a java2 platform.  



Index: time.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/time.java,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -d -r2.16 -r2.17
*** time.java	2001/08/05 10:01:50	2.16
--- time.java	2001/08/15 16:45:37	2.17
***************
*** 25,28 ****
--- 25,29 ----
  import java.text.DateFormatSymbols;
  import java.text.DateFormat;
+ import java.lang.reflect.*;
  import java.util.*;
  
***************
*** 103,142 ****
          TimeZone tz = TimeZone.getDefault();
  
!         /* XXXAPI 1.2 START
!         try {
!             tzname = new PyTuple(
!                 new PyObject[] {
!                     new PyString(tz.getDisplayName(false, TimeZone.SHORT)),
!                     new PyString(tz.getDisplayName(true, TimeZone.SHORT))
!                 });
!         }
!         catch (NoSuchMethodError e) {}
!         XXXAPI 1.2 END */
  
-         // getDisplayName() is only available in Java 1.2.  This is the
-         // next best thing, but it isn't really correct, or what the Python
-         // time module spec wants, but it does work for Java 1.1
-         if (tzname == null) {
-             tzname = new PyTuple(
-                 new PyObject[] {
-                     new PyString(tz.getID()),
-                     new PyString(tz.getID())
-                 });
-         }
          daylight = tz.useDaylightTime() ? 1 : 0;
- 
          timezone = -tz.getRawOffset() / 1000;
!         if (tz instanceof SimpleTimeZone) {
!             /* XXXAPI 1.2 START
!             try {
!                 SimpleTimeZone stz = (SimpleTimeZone)tz;
!                 altzone = timezone - stz.getDSTSavings() / 1000;
!             }
!             catch (NoSuchMethodError e) {}
!             XXXAPI 1.2 END */
!         }
!         if (altzone == -1)
!                 // best we can do for Java 1.1.  This is wrong though.
!                 altzone = timezone;
      }
  
--- 104,116 ----
          TimeZone tz = TimeZone.getDefault();
  
!         tzname = new PyTuple(
!             new PyObject[] {
!                 new PyString(getDisplayName(tz, false, 0)),
!                 new PyString(getDisplayName(tz, true, 0))
!             });
  
          daylight = tz.useDaylightTime() ? 1 : 0;
          timezone = -tz.getRawOffset() / 1000;
!         altzone = timezone - getDSTSavings(tz) / 1000;
      }
  
***************
*** 237,241 ****
          if (dst == 0 || dst == 1) {
              cal.set(Calendar.DST_OFFSET,
!                     dst * cal.getTimeZone().getDSTSavings());
          }
          return (double)cal.getTime().getTime()/1000.0;
--- 211,215 ----
          if (dst == 0 || dst == 1) {
              cal.set(Calendar.DST_OFFSET,
!                     dst * getDSTSavings(cal.getTimeZone()));
          }
          return (double)cal.getTime().getTime()/1000.0;
***************
*** 572,593 ****
                  if (cal == null)
                      cal = _tupletocal(tup);
!                 {
!                     boolean use_getid = true;
!                     /* XXXAPI 1.2 START
!                     try {
!                         s = s + cal.getTimeZone().getDisplayName(
!                             // in daylight savings time?  true if == 1 -1
!                             // means the information was not available;
!                             // treat this as if not in dst
!                             item(tup, 8) > 0,
!                             TimeZone.SHORT);
!                         use_getid = false;
!                     }
!                     catch (NoSuchMethodError e) {}
!                     XXXAPI 1.2 END */
!                     if (use_getid)
!                         // See note in classDictInit() above
!                         s = s + cal.getTimeZone().getID();
!                 }
                  break;
              case '%':
--- 546,554 ----
                  if (cal == null)
                      cal = _tupletocal(tup);
!                 s = s + getDisplayName(cal.getTimeZone(),
!                         // in daylight savings time?  true if == 1 -1
!                         // means the information was not available;
!                         // treat this as if not in dst
!                         item(tup, 8) > 0, 0);
                  break;
              case '%':
***************
*** 617,619 ****
--- 578,603 ----
      }
  
+     private static String getDisplayName(TimeZone tz, boolean dst, int style) {
+         String version = System.getProperty("java.version");
+         if (version.compareTo("1.2") >= 0) {
+             try {
+                 Method m = tz.getClass().getMethod("getDisplayName",
+                             new Class[] { Boolean.TYPE, Integer.TYPE });
+                 return (String) m.invoke(tz, new Object[] {
+                             new Boolean(dst), new Integer(style) });
+             } catch (Exception exc) { }
+         }
+         return tz.getID();
+     }
+             
+     private static int getDSTSavings(TimeZone tz) {
+         String version = System.getProperty("java.version");
+         if (version.compareTo("1.2") >= 0) {
+             try {
+                 Method m = tz.getClass().getMethod("getDSTSavings", null);
+                 return ((Integer) m.invoke(tz, null)).intValue();
+              } catch (Exception exc) { }
+         }
+         return 0;
+     }
  }