AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-6157 Corrected svn properties for new files. Added conditional compilation comments to build ICU4J on Java 1.3/Foundation 1.0 environment without errors.

Browse Source 
X-SVN-Rev: 24068
This commit is contained in:
Yoshito Umaoka 2008-05-29 14:10:11 +00:00
parent 7e8bdad178
commit 8bcaa88f1e
7 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitattributes vendored
View File

@ -329,11 +329,8 @@ icu4j/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hans_SG.xml -text
icu4j/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hant.xml -text
icu4j/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hant_HK.xml -text
icu4j/src/com/ibm/icu/text/BreakCTDictionary.java -text
icu4j/src/com/ibm/icu/text/DateIntervalFormat.java -text
icu4j/src/com/ibm/icu/text/DateIntervalInfo.java -text
icu4j/src/com/ibm/icu/text/DurationFormat.java -text
icu4j/src/com/ibm/icu/text/ThaiBreakIterator.java -text
icu4j/src/com/ibm/icu/util/DateInterval.java -text
icu4j/src/com/ibm/richtext/textapps/resources/unicode.arabic.red -text
icu4j/src/com/ibm/richtext/textapps/resources/unicode.hebrew.red -text
tools/unicodetools/com/ibm/rbm/docs/images/TitleLogo_transparent.gif -text

2
icu4j/preprocessor.txt
View File

@ -15,6 +15,8 @@ src/com/ibm/icu/math/BigDecimal.java
src/com/ibm/icu/text/Bidi.java
src/com/ibm/icu/text/ChineseDateFormat.java
src/com/ibm/icu/text/DateFormat.java
src/com/ibm/icu/text/DateIntervalFormat.java
src/com/ibm/icu/text/DateIntervalInfo.java
src/com/ibm/icu/text/DateTimePatternGenerator.java
src/com/ibm/icu/text/DecimalFormat.java
src/com/ibm/icu/text/DigitList.java

7
icu4j/src/com/ibm/icu/dev/test/serializable/FormatTests.java
View File

@ -19,8 +19,11 @@ import com.ibm.icu.text.ChineseDateFormatSymbols;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.DateFormatSymbols;
import com.ibm.icu.util.DateInterval;
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
import com.ibm.icu.text.DateIntervalFormat;
import com.ibm.icu.text.DateIntervalInfo;
//#endif
import com.ibm.icu.text.DecimalFormat;
import com.ibm.icu.text.DecimalFormatSymbols;
import com.ibm.icu.text.DurationFormat;
@ -1867,6 +1870,8 @@ public class FormatTests
}
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
public static class DateIntervalFormatHandler implements SerializableTest.Handler
{
@ -1927,6 +1932,8 @@ public class FormatTests
return a.equals(b);
}
}
//#endif
public static class ChineseDateFormatHandler extends DateFormatHandler
{
String patterns[] = {

3
icu4j/src/com/ibm/icu/dev/test/serializable/SerializableTest.java
View File

@ -661,9 +661,12 @@ public class SerializableTest extends TestFmwk.TestGroup
map.put("com.ibm.icu.text.DateFormat", new FormatTests.DateFormatHandler());
map.put("com.ibm.icu.text.DateFormatSymbols", new FormatTests.DateFormatSymbolsHandler());
map.put("com.ibm.icu.util.DateInterval", new DateIntervalHandler());
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
map.put("com.ibm.icu.text.DateIntervalFormat", new FormatTests.DateIntervalFormatHandler());
map.put("com.ibm.icu.text.DateIntervalInfo", new FormatTests.DateIntervalInfoHandler());
map.put("com.ibm.icu.text.DateIntervalInfo$PatternInfo", new FormatTests.PatternInfoHandler());
//#endif
map.put("com.ibm.icu.text.SimpleDateFormat", new FormatTests.SimpleDateFormatHandler());
map.put("com.ibm.icu.text.ChineseDateFormat", new FormatTests.ChineseDateFormatHandler());
map.put("com.ibm.icu.text.ChineseDateFormatSymbols", new FormatTests.ChineseDateFormatSymbolsHandler());

52
icu4j/src/com/ibm/icu/text/DateFormat.java
View File

@ -1362,7 +1362,32 @@ public abstract class DateFormat extends UFormat {
return getInstance(cal, ULocale.getDefault());
}
/**
* Convenience overload
* @stable ICU 2.0
*/
static final public DateFormat getDateInstance(Calendar cal, int dateStyle) {
return getDateInstance(cal, dateStyle, ULocale.getDefault());
}
/**
* Convenience overload
* @stable ICU 2.0
*/
static final public DateFormat getTimeInstance(Calendar cal, int timeStyle) {
return getTimeInstance(cal, timeStyle, ULocale.getDefault());
}
/**
* Convenience overload
* @stable ICU 2.0
*/
static final public DateFormat getDateTimeInstance(Calendar cal, int dateStyle, int timeStyle) {
return getDateTimeInstance(cal, dateStyle, timeStyle, ULocale.getDefault());
}
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/**
* Create a date/time formatter from skeleton and a given locale.
@ -1402,33 +1427,6 @@ public abstract class DateFormat extends UFormat {
return dtfmt;
}
/**
* Convenience overload
* @stable ICU 2.0
*/
static final public DateFormat getDateInstance(Calendar cal, int dateStyle) {
return getDateInstance(cal, dateStyle, ULocale.getDefault());
}
/**
* Convenience overload
* @stable ICU 2.0
*/
static final public DateFormat getTimeInstance(Calendar cal, int timeStyle) {
return getTimeInstance(cal, timeStyle, ULocale.getDefault());
}
/**
* Convenience overload
* @stable ICU 2.0
*/
static final public DateFormat getDateTimeInstance(Calendar cal, int dateStyle, int timeStyle) {
return getDateTimeInstance(cal, dateStyle, timeStyle, ULocale.getDefault());
}
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/**
* Convenience overload
* @draft ICU 4.0

4
icu4j/src/com/ibm/icu/text/DateIntervalFormat.java
View File

@ -1,4 +1,6 @@
//##header J2SE15
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
* Copyright (C) 2008, International Business Machines
* Corporation and others. All Rights Reserved.
@ -2175,4 +2177,4 @@ public class DateIntervalFormat extends UFormat {
initializePattern();
}
}
//#endif

3
icu4j/src/com/ibm/icu/text/DateIntervalInfo.java
View File

@ -1,4 +1,6 @@
//##header J2SE15
//#if defined(FOUNDATION10) || defined(J2SE13)
//#else
/*
* Copyright (C) 2008, International Business Machines
* Corporation and others. All Rights Reserved.
@ -915,3 +917,4 @@ public class DateIntervalInfo implements Cloneable, Freezable, Serializable {
//}
}// end class DateIntervalInfo
//#endif