From 111a79ab31811598a7a912b5f86b1a0da809077f Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Tue, 8 Mar 2016 00:16:56 +0000 Subject: [PATCH] ICU-12186 Fixed a couple of API status problems and regenerated API change report. Updated/corrected version and year strings in some files. X-SVN-Rev: 38501 --- icu4j/APIChangeReport.html | 6 +----- icu4j/eclipse-build/build.properties | 8 ++++---- icu4j/eclipse-build/misc/about_icu.html | 4 ++-- icu4j/eclipse-build/misc/about_icu_base.html | 4 ++-- .../core/src/com/ibm/icu/text/CompactDecimalFormat.java | 1 + .../core/src/com/ibm/icu/text/SimpleDateFormat.java | 3 +++ icu4j/main/shared/build/common.properties | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/icu4j/APIChangeReport.html b/icu4j/APIChangeReport.html index 357f94a459a..dcc1ed04348 100644 --- a/icu4j/APIChangeReport.html +++ b/icu4j/APIChangeReport.html @@ -111,10 +111,6 @@ RelativeDateTimeFormatter.RelativeDateTimeUnit

(draft) public static final RelativeDateTimeFormatter.RelativeDateTimeUnit WEEK

(draft) public static final RelativeDateTimeFormatter.RelativeDateTimeUnit YEAR

-SimpleDateFormat -

(draft) protected int matchDayPeriodString(java.lang.String, int, java.lang.String[], int, Output<DayPeriodRules.DayPeriod>)

Package com.ibm.icu.util

@@ -130,6 +126,6 @@ MeasureUnit

Contents generated by ReportAPI tool on Wed Mar 02 22:57:30 EST 2016
Copyright (C) 2016, International Business Machines Corporation, All Rights Reserved.

Contents generated by ReportAPI tool on Mon Mar 07 18:43:09 EST 2016
Copyright (C) 2016, International Business Machines Corporation, All Rights Reserved.

diff --git a/icu4j/eclipse-build/build.properties b/icu4j/eclipse-build/build.properties index f892e1bde4d..2279e062690 100644 --- a/icu4j/eclipse-build/build.properties +++ b/icu4j/eclipse-build/build.properties @@ -1,7 +1,7 @@ #******************************************************************************* -#* Copyright (C) 2010-2015, International Business Machines Corporation and * +#* Copyright (C) 2010-2016, International Business Machines Corporation and * #* others. All Rights Reserved. * #******************************************************************************* -icu4j.plugin.impl.version.string=56.1.0 -copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2015. All Rights Reserved. \n IBM is a registered trademark of IBM Corp. -icu4j.data.version.number=56 +icu4j.plugin.impl.version.string=57.1.0 +copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2016. All Rights Reserved. \n IBM is a registered trademark of IBM Corp. +icu4j.data.version.number=57 diff --git a/icu4j/eclipse-build/misc/about_icu.html b/icu4j/eclipse-build/misc/about_icu.html index 075e33fc6ac..7e781689e5e 100644 --- a/icu4j/eclipse-build/misc/about_icu.html +++ b/icu4j/eclipse-build/misc/about_icu.html @@ -8,7 +8,7 @@

About This Content

XXXX XX, 2015

XXXX XX, 2016

License

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise @@ -31,7 +31,7 @@ and such source code may be obtained at http:/ for informational purposes only, and you should look to the Redistributor's license for terms and conditions of use.

ICU4J 55.X.X.v2015XXXX plug-in

+

ICU4J 57.X.X.v2016XXXX plug-in

The plug-in includes software ("ICU4J") developed by International Business Machines Corporation and others.

diff --git a/icu4j/eclipse-build/misc/about_icu_base.html b/icu4j/eclipse-build/misc/about_icu_base.html index 19781952462..3b86633f6d0 100644 --- a/icu4j/eclipse-build/misc/about_icu_base.html +++ b/icu4j/eclipse-build/misc/about_icu_base.html @@ -8,7 +8,7 @@

About This Content

XXXX XX, 2015

XXXX XX, 2016

License

ICU4J 55.X.X.v2015XXXX base plug-in

+

ICU4J 57.X.X.v2016XXXX base plug-in

The plug-in includes software ("ICU4J") developed by International Business Machines Corporation and others.

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormat.java index 9751f3a9295..603ade8db53 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormat.java @@ -306,6 +306,7 @@ public class CompactDecimalFormat extends DecimalFormat { * @deprecated This API might change or be removed in a future release. */ @Override + @Deprecated public StringBuffer format(CurrencyAmount currAmt, StringBuffer toAppendTo, FieldPosition pos) { return format(currAmt.getNumber().doubleValue(), currAmt.getCurrency(), toAppendTo, pos); } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java index 439fd78c21a..c2643ac2d46 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java @@ -2983,7 +2983,10 @@ public class SimpleDateFormat extends DateFormat { /** * Similar to matchQuarterString but customized for day periods. + * @internal + * @deprecated This API is ICU internal only. */ + @Deprecated protected int matchDayPeriodString(String text, int start, String[] data, int dataLength, Output dayPeriod) { diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties index 4f103254b30..3bb14b9c067 100644 --- a/icu4j/main/shared/build/common.properties +++ b/icu4j/main/shared/build/common.properties @@ -5,7 +5,7 @@ # Version numbers, etc. icu4j.spec.version = 57 -icu4j.impl.version = 57.1.0 +icu4j.impl.version = 57.1 icu4j.data.version = 57 current.year = 2016 default.exec.env = JavaSE-1.6 -- 2.40.0