organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 00:43:32 +00:00
Code Issues1 Projects Releases Wiki Activity Actions3

ICU-3659 Koryaku era was in wrong place and handleGetLimit was broken

Browse source 
X-SVN-Rev: 15586
This commit is contained in:
Alan Liu 2004-05-27 20:39:23 +00:00
parent f8975eb469
commit 8be9a28c55
2 changed files with 13 additions and 8 deletions
icu4c/source/i18n
japancal.cpp
icu4j/src/com/ibm/icu/util
JapaneseCalendar.java

16
icu4c/source/i18n/japancal.cpp
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2003, International Business Machines Corporation and *
* Copyright (C) 2003-2004, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*
@ -18,6 +18,7 @@
#include "japancal.h"
#include "unicode/gregocal.h"
#include "mutex.h"
#include "uassert.h"
//#define U_DEBUG_JCAL
@ -200,10 +201,10 @@ static const struct {
{ 1370, 7, 24 }, // Kentoku 160
{ 1372, 4, 1 }, // Bunch\u0169
{ 1375, 5, 27 }, // Tenju
{ 1379, 3, 22 }, // Koryaku
{ 1381, 2, 10 }, // Kowa
{ 1384, 4, 28 }, // Gench\u0169
{ 1384, 2, 27 }, // Meitoku
{ 1379, 3, 22 }, // Koryaku
{ 1387, 8, 23 }, // Kakei
{ 1389, 2, 9 }, // Koo
{ 1390, 3, 26 }, // Meitoku
@ -470,7 +471,7 @@ int32_t JapaneseCalendar::defaultCenturyStartYear() const
static int32_t gJapanCalendarLimits[2][4] = {
// Minimum Greatest min Least max Greatest max
{ 0, 0, JapaneseCalendar::kCurrentEra, JapaneseCalendar::kCurrentEra }, // ERA
{ 1, 1, 0, 0 }, // YEAR
{ 1, 1, 0, 0 }, // YEAR least-max/greatest-max computed at runtime
};
static UBool gJapanYearLimitsKnown = FALSE;
@ -490,17 +491,20 @@ int32_t JapaneseCalendar::handleGetLimit(UCalendarDateFields field, ELimitType l
int32_t max = min;
for (uint32_t i=2; i<kEraCount; i++) { // counting by year, not field (3's)
int32_t d = kEraInfo[i].year - kEraInfo[i-1].year;
U_ASSERT(d >= 0);
if (d < min) {
min = d;
} else if (d > max) {
}
if (d > max) {
max = d;
}
}
U_ASSERT(min >= 0 && max > min);
{
Mutex m;
if(gJapanYearLimitsKnown==FALSE) {
gJapanCalendarLimits[field][UCAL_LEAST_MAXIMUM] = min;
gJapanCalendarLimits[field][UCAL_MAXIMUM] = max;
gJapanCalendarLimits[field][UCAL_LIMIT_LEAST_MAXIMUM] = min;
gJapanCalendarLimits[field][UCAL_LIMIT_MAXIMUM] = max;
gJapanYearLimitsKnown = TRUE;
}
}

5
icu4j/src/com/ibm/icu/util/JapaneseCalendar.java
View file

@ -408,10 +408,10 @@ public class JapaneseCalendar extends GregorianCalendar {
1370, 7, 24, // Kentoku
1372, 4, 1, // Bunch\u0169
1375, 5, 27, // Tenju
1379, 3, 22, // Koryaku
1381, 2, 10, // Kowa
1384, 4, 28, // Gench\u0169
1384, 2, 27, // Meitoku
1379, 3, 22, // Koryaku
1387, 8, 23, // Kakei
1389, 2, 9, // Koo
1390, 3, 26, // Meitoku
@ -548,7 +548,8 @@ public class JapaneseCalendar extends GregorianCalendar {
int d = ERAS[i] - ERAS[i-3];
if (d < min) {
min = d;
} else if (d > max) {
}
if (d > max) {
max = d;
}
}