# HG changeset patch # User Frank Benoit # Date 1241256444 -7200 # Node ID 88652073d1c2c58129097e2d96cab92b28df3095 # Parent 6373fd739945c9d818cd1f5ce9e7c7ba1a11a820 More work on icu diff -r 6373fd739945 -r 88652073d1c2 com.ibm.icu/src/com/ibm/icu/text/DateFormat.d --- a/com.ibm.icu/src/com/ibm/icu/text/DateFormat.d Sat May 02 11:27:08 2009 +0200 +++ b/com.ibm.icu/src/com/ibm/icu/text/DateFormat.d Sat May 02 11:27:24 2009 +0200 @@ -5,15 +5,53 @@ import java.util.Date; import com.ibm.icu.mangoicu.UDateFormat; +import com.ibm.icu.mangoicu.ULocale; +import com.ibm.icu.mangoicu.UTimeZone; public class DateFormat { - public static const int LONG = UDateFormat.Style.Long; - public static const int FULL = UDateFormat.Style.Full; - public static const int SHORT = UDateFormat.Style.Short; + public static const int LONG = UDateFormat.Style.Long; + public static const int FULL = UDateFormat.Style.Full; + public static const int SHORT = UDateFormat.Style.Short; public static const int MEDIUM = UDateFormat.Style.Medium; + private UDateFormat ufmt; + private this( UDateFormat.Style time ){ + ufmt = new UDateFormat( time, time, ULocale.Default, UTimeZone.Default, null ); + } + private this( UDateFormat ufmt ){ + this.ufmt = ufmt; + } + + public static DateFormat getTimeInstance() { + // FIXME + return new DateFormat( UDateFormat.Style.Long ); + } + + public static DateFormat getTimeInstance(int s) { + // FIXME + return new DateFormat( UDateFormat.Style.Long ); + implMissing(__FILE__, __LINE__); + return null; + } + public static DateFormat getDateInstance() { + // FIXME + return new DateFormat( UDateFormat.Style.Long ); + implMissing(__FILE__, __LINE__); + return null; + } + + public static DateFormat getDateTimeInstance(int l, int m) { + // FIXME + return new DateFormat( UDateFormat.Style.Long ); + implMissing(__FILE__, __LINE__); + return null; + } + + public static DateFormat getDateInstance(int dateFormat) { + // FIXME + return new DateFormat( UDateFormat.Style.Long ); implMissing(__FILE__, __LINE__); return null; } @@ -23,22 +61,7 @@ return null; } - public static DateFormat getTimeInstance() { - implMissing(__FILE__, __LINE__); - return null; - } - - public static DateFormat getDateTimeInstance(int l, int m) { - implMissing(__FILE__, __LINE__); - return null; - } - - public static DateFormat getTimeInstance(int s) { - implMissing(__FILE__, __LINE__); - return null; - } - - public static DateFormat getDateInstance(int dateFormat) { + public String format(Long long2) { implMissing(__FILE__, __LINE__); return null; } @@ -48,11 +71,6 @@ return null; } - public String format(Long long2) { - implMissing(__FILE__, __LINE__); - return null; - } - } diff -r 6373fd739945 -r 88652073d1c2 com.ibm.icu/src/com/ibm/icu/text/SimpleDateFormat.d --- a/com.ibm.icu/src/com/ibm/icu/text/SimpleDateFormat.d Sat May 02 11:27:08 2009 +0200 +++ b/com.ibm.icu/src/com/ibm/icu/text/SimpleDateFormat.d Sat May 02 11:27:24 2009 +0200 @@ -2,11 +2,20 @@ module com.ibm.icu.text.SimpleDateFormat; import com.ibm.icu.text.DateFormat; +import com.ibm.icu.mangoicu.UDateFormat; +import com.ibm.icu.mangoicu.ULocale; +import com.ibm.icu.mangoicu.UTimeZone; + import java.lang.all; public class SimpleDateFormat : DateFormat { public this(String string) { implMissing(__FILE__, __LINE__); + super( new UDateFormat( + UDateFormat.Style.Default, + UDateFormat.Style.Default, + ULocale.Default, + UTimeZone.Default, null )); } }