* [gentoo-commits] gentoo-x86 commit in dev-java/icu4j/files: icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-1.patch
@ 2014-01-12 20:28 Tom Wijsman (tomwij)
0 siblings, 0 replies; only message in thread
From: Tom Wijsman (tomwij) @ 2014-01-12 20:28 UTC (permalink / raw
To: gentoo-commits
tomwij 14/01/12 20:28:03
Added:
icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch
icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-1.patch
Log:
Version bump to 52.1; fixes bug #497930, proxied commit for Arfrever Frehtes Taifersar Arahesis whom also found a fix for a failing test.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.1 dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch?rev=1.1&content-type=text/plain
Index: icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch
===================================================================
Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java
===================================================================
--- /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java (revision 34867)
+++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java (revision 34868)
@@ -2820,5 +2820,5 @@
if ( override != null && (override.compareTo("hebr") == 0 || override.indexOf("y=hebr") >= 0) && value < 1000 ) {
value += HEBREW_CAL_CUR_MILLENIUM_START_YEAR;
- } else if (count == 2 && (pos.getIndex() - start) == 2 && !isChineseCalendar && !cal.getType().equals("japanese")
+ } else if (count == 2 && (pos.getIndex() - start) == 2 && cal.haveDefaultCentury()
&& UCharacter.isDigit(text.charAt(start))
&& UCharacter.isDigit(text.charAt(start+1)))
Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java
===================================================================
--- /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java (revision 34867)
+++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java (revision 34868)
@@ -1,5 +1,5 @@
/*
*******************************************************************************
- * Copyright (C) 1996-2010,2012, International Business Machines Corporation and *
+ * Copyright (C) 1996-2014, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
@@ -639,4 +639,13 @@
/**
* {@inheritDoc}
+ * @internal
+ * @deprecated This API is ICU internal only.
+ */
+ public boolean haveDefaultCentury() {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
* @stable ICU 4.0
*/
@@ -662,3 +671,4 @@
return super.getActualMaximum(field);
}
+
}
Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/Calendar.java
===================================================================
--- /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/Calendar.java (revision 34867)
+++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/Calendar.java (revision 34868)
@@ -1,4 +1,4 @@
/*
-* Copyright (C) 1996-2013, International Business Machines
+* Copyright (C) 1996-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*/
@@ -6081,4 +6081,19 @@
}
+ /**
+ * Returns if two digit representation of year in this calendar type
+ * customarily implies a default century (i.e. 03 -> 2003).
+ * The default implementation returns <code>true</code>. A subclass may
+ * return <code>false</code> if such practice is not applicable (for example,
+ * Chinese calendar and Japanese calendar).
+ *
+ * @return <code>true<code> if this calendar has a default century.
+ * @internal
+ * @deprecated This API is ICU internal only.
+ */
+ public boolean haveDefaultCentury() {
+ return true;
+ }
+
// -------- BEGIN ULocale boilerplate --------
Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java
===================================================================
--- /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java (revision 34867)
+++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java (revision 34868)
@@ -1,4 +1,4 @@
/*********************************************************************
- * Copyright (C) 2000-2012, International Business Machines
+ * Copyright (C) 2000-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*********************************************************************
@@ -1019,4 +1019,13 @@
/**
+ * {@inheritDoc}
+ * @internal
+ * @deprecated This API is ICU internal only.
+ */
+ public boolean haveDefaultCentury() {
+ return false;
+ }
+
+ /**
* Override readObject.
*/
1.1 dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-1.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-1.patch?rev=1.1&content-type=text/plain
Index: icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-1.patch
===================================================================
Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java
===================================================================
--- /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java (revision 34829)
+++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java (revision 34830)
@@ -1,5 +1,5 @@
/*
*******************************************************************************
- * Copyright (C) 1996-2013, International Business Machines Corporation and *
+ * Copyright (C) 1996-2014, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
@@ -2820,5 +2820,5 @@
if ( override != null && (override.compareTo("hebr") == 0 || override.indexOf("y=hebr") >= 0) && value < 1000 ) {
value += HEBREW_CAL_CUR_MILLENIUM_START_YEAR;
- } else if (count == 2 && (pos.getIndex() - start) == 2 && !isChineseCalendar
+ } else if (count == 2 && (pos.getIndex() - start) == 2 && !isChineseCalendar && !cal.getType().equals("japanese")
&& UCharacter.isDigit(text.charAt(start))
&& UCharacter.isDigit(text.charAt(start+1)))
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-01-12 20:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-12 20:28 [gentoo-commits] gentoo-x86 commit in dev-java/icu4j/files: icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-1.patch Tom Wijsman (tomwij)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox