From 71fe3d234acd98fa65d4365a013e89933890acf4 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Fri, 27 Jun 2014 20:14:41 +0000 Subject: [PATCH] ICU-10843 Fixed a couple of coding problems detected by FindBugs. X-SVN-Rev: 35964 --- .../ibm/icu/impl/ICUResourceTableAccess.java | 8 +++-- .../com/ibm/icu/impl/RelativeDateFormat.java | 34 ++++++++++--------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/ICUResourceTableAccess.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/ICUResourceTableAccess.java index 14f6a27f0e6..0887265a694 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/ICUResourceTableAccess.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/ICUResourceTableAccess.java @@ -64,9 +64,11 @@ public class ICUResourceTableAccess { } else if (tableName.equals("Languages")) { currentName = LocaleIDs.getCurrentLanguageID(item); } - result = table.findStringWithFallback(currentName); - if (result != null) { - break; // possible real exception + if (currentName != null) { + result = table.findStringWithFallback(currentName); + if (result != null) { + break; // possible real exception + } } } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/RelativeDateFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/RelativeDateFormat.java index bd26e17ad5a..c2e7287612c 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/RelativeDateFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/RelativeDateFormat.java @@ -118,24 +118,26 @@ public class RelativeDateFormat extends DateFormat { relativeDayString = getStringForDay(dayDiff); } - if ( relativeDayString != null && fDatePattern != null && - (fTimePattern == null || fCombinedFormat == null || combinedFormatHasDateAtStart) ) { - // capitalize relativeDayString according to context for relative, set formatter no context - if ( relativeDayString.length() > 0 && UCharacter.isLowerCase(relativeDayString.codePointAt(0)) && - (capitalizationContext == DisplayContext.CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE || - (capitalizationContext == DisplayContext.CAPITALIZATION_FOR_UI_LIST_OR_MENU && capitalizationOfRelativeUnitsForListOrMenu) || - (capitalizationContext == DisplayContext.CAPITALIZATION_FOR_STANDALONE && capitalizationOfRelativeUnitsForStandAlone) )) { - if (capitalizationBrkIter == null) { - // should only happen when deserializing, etc. - capitalizationBrkIter = BreakIterator.getSentenceInstance(fLocale); + if (fDateTimeFormat != null) { + if (relativeDayString != null && fDatePattern != null && + (fTimePattern == null || fCombinedFormat == null || combinedFormatHasDateAtStart) ) { + // capitalize relativeDayString according to context for relative, set formatter no context + if ( relativeDayString.length() > 0 && UCharacter.isLowerCase(relativeDayString.codePointAt(0)) && + (capitalizationContext == DisplayContext.CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE || + (capitalizationContext == DisplayContext.CAPITALIZATION_FOR_UI_LIST_OR_MENU && capitalizationOfRelativeUnitsForListOrMenu) || + (capitalizationContext == DisplayContext.CAPITALIZATION_FOR_STANDALONE && capitalizationOfRelativeUnitsForStandAlone) )) { + if (capitalizationBrkIter == null) { + // should only happen when deserializing, etc. + capitalizationBrkIter = BreakIterator.getSentenceInstance(fLocale); + } + relativeDayString = UCharacter.toTitleCase(fLocale, relativeDayString, capitalizationBrkIter, + UCharacter.TITLECASE_NO_LOWERCASE | UCharacter.TITLECASE_NO_BREAK_ADJUSTMENT); } - relativeDayString = UCharacter.toTitleCase(fLocale, relativeDayString, capitalizationBrkIter, - UCharacter.TITLECASE_NO_LOWERCASE | UCharacter.TITLECASE_NO_BREAK_ADJUSTMENT); + fDateTimeFormat.setContext(DisplayContext.CAPITALIZATION_NONE); + } else { + // set our context for the formatter + fDateTimeFormat.setContext(capitalizationContext); } - fDateTimeFormat.setContext(DisplayContext.CAPITALIZATION_NONE); - } else { - // set our context for the formatter - fDateTimeFormat.setContext(capitalizationContext); } if (fDateTimeFormat != null && (fDatePattern != null || fTimePattern != null)) { -- 2.40.0