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

ICU-6855 Better future-proof error checking; make toPattern more parallel to format

Browse Source 
X-SVN-Rev: 25836
This commit is contained in:
Peter Edberg 2009-04-19 18:33:04 +00:00
parent 767ce18023
commit 8e60e71d66
1 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
icu4c/source/i18n/reldtfmt.cpp
View File

@ -140,7 +140,7 @@ UnicodeString& RelativeDateFormat::format( Calendar& cal,
} else { } else {
if (dateString.length() == 0 && fDateFormat != NULL) { if (dateString.length() == 0 && fDateFormat != NULL) {
fDateFormat->format(cal,dateString,pos); fDateFormat->format(cal,dateString,pos);
} }
UnicodeString timeString(&emptyStr); UnicodeString timeString(&emptyStr);
FieldPosition timepos = pos; FieldPosition timepos = pos;
fTimeFormat->format(cal,timeString,timepos); fTimeFormat->format(cal,timeString,timepos);
@ -260,20 +260,23 @@ RelativeDateFormat::toPattern(UnicodeString& result, UErrorCode& status) const
{ {
if (!U_FAILURE(status)) { if (!U_FAILURE(status)) {
result.remove(); result.remove();
UnicodeString datePattern, timePattern; if (fTimeFormat == NULL || fCombinedFormat == 0) {
this->toPatternDate(datePattern, status); if (fDateFormat != NULL) {
this->toPatternTime(timePattern, status); UnicodeString datePattern;
if ( datePattern.length() > 0 ) { this->toPatternDate(datePattern, status);
if ( timePattern.length() > 0 && fCombinedFormat) { if (!U_FAILURE(status)) {
result.setTo(datePattern);
}
}
} else {
UnicodeString datePattern, timePattern;
this->toPatternDate(datePattern, status);
this->toPatternTime(timePattern, status);
if (!U_FAILURE(status)) {
Formattable timeDatePatterns[] = { timePattern, datePattern }; Formattable timeDatePatterns[] = { timePattern, datePattern };
FieldPosition pos; FieldPosition pos;
fCombinedFormat->format(timeDatePatterns, 2, result, pos, status); fCombinedFormat->format(timeDatePatterns, 2, result, pos, status);
} }
if ( result.length() == 0 ) {
result.setTo(datePattern);
}
} else {
result.setTo(timePattern);
} }
} }
return result; return result;
@ -284,8 +287,12 @@ RelativeDateFormat::toPatternDate(UnicodeString& result, UErrorCode& status) con
{ {
if (!U_FAILURE(status)) { if (!U_FAILURE(status)) {
result.remove(); result.remove();
if ( fDateFormat && fDateFormat->getDynamicClassID()==SimpleDateFormat::getStaticClassID() ) { if ( fDateFormat ) {
((SimpleDateFormat*)fDateFormat)->toPattern(result); if ( fDateFormat->getDynamicClassID()==SimpleDateFormat::getStaticClassID() ) {
((SimpleDateFormat*)fDateFormat)->toPattern(result);
} else {
status = U_UNSUPPORTED_ERROR;
}
} }
} }
return result; return result;
@ -296,8 +303,12 @@ RelativeDateFormat::toPatternTime(UnicodeString& result, UErrorCode& status) con
{ {
if (!U_FAILURE(status)) { if (!U_FAILURE(status)) {
result.remove(); result.remove();
if ( fTimeFormat && fTimeFormat->getDynamicClassID()==SimpleDateFormat::getStaticClassID() ) { if ( fTimeFormat ) {
((SimpleDateFormat*)fTimeFormat)->toPattern(result); if ( fTimeFormat->getDynamicClassID()==SimpleDateFormat::getStaticClassID() ) {
((SimpleDateFormat*)fTimeFormat)->toPattern(result);
} else {
status = U_UNSUPPORTED_ERROR;
}
} }
} }
return result; return result;
@ -307,10 +318,18 @@ void
RelativeDateFormat::applyPatterns(const UnicodeString& datePattern, const UnicodeString& timePattern, UErrorCode &status) RelativeDateFormat::applyPatterns(const UnicodeString& datePattern, const UnicodeString& timePattern, UErrorCode &status)
{ {
if (!U_FAILURE(status)) { if (!U_FAILURE(status)) {
if ( fDateFormat && fDateFormat->getDynamicClassID()==SimpleDateFormat::getStaticClassID() ) { if ( fDateFormat && fDateFormat->getDynamicClassID()!=SimpleDateFormat::getStaticClassID() ) {
status = U_UNSUPPORTED_ERROR;
return;
}
if ( fTimeFormat && fTimeFormat->getDynamicClassID()!=SimpleDateFormat::getStaticClassID() ) {
status = U_UNSUPPORTED_ERROR;
return;
}
if ( fDateFormat ) {
((SimpleDateFormat*)fDateFormat)->applyPattern(datePattern); ((SimpleDateFormat*)fDateFormat)->applyPattern(datePattern);
} }
if ( fTimeFormat && fTimeFormat->getDynamicClassID()==SimpleDateFormat::getStaticClassID() ) { if ( fTimeFormat ) {
((SimpleDateFormat*)fTimeFormat)->applyPattern(timePattern); ((SimpleDateFormat*)fTimeFormat)->applyPattern(timePattern);
} }
} }