From e587589cdae3602587d5001e8d71071c236a82a7 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Sat, 15 Oct 2022 21:33:27 -0700 Subject: [PATCH] Fix errorprone warnings that should be errors This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: I9393ceac22201e2bde4d5af7ec13e90d94956ed7 --- tools/image_generator/ImageGenerator.java | 76 +++++++++++------------ 1 file changed, 36 insertions(+), 40 deletions(-) diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java index 6c5ea4b5..00264b1d 100644 --- a/tools/image_generator/ImageGenerator.java +++ b/tools/image_generator/ImageGenerator.java @@ -16,6 +16,8 @@ package com.android.recovery.tools; +import static java.util.Map.entry; + import com.ibm.icu.text.BreakIterator; import org.apache.commons.cli.CommandLine; @@ -111,49 +113,43 @@ public class ImageGenerator { // https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry private static final String DEFAULT_FONT_NAME = "Roboto-Regular"; private static final Map LANGUAGE_TO_FONT_MAP = - new TreeMap() { - { - put("am", "NotoSansEthiopic-VF"); - put("ar", "NotoNaskhArabicUI-Regular"); - put("as", "NotoSansBengaliUI-VF"); - put("bn", "NotoSansBengaliUI-VF"); - put("fa", "NotoNaskhArabicUI-Regular"); - put("gu", "NotoSansGujaratiUI-Regular"); - put("hi", "NotoSansDevanagariUI-VF"); - put("hy", "NotoSansArmenian-VF"); - put("iw", "NotoSansHebrew-Regular"); - put("ja", "NotoSansCJK-Regular"); - put("ka", "NotoSansGeorgian-VF"); - put("ko", "NotoSansCJK-Regular"); - put("km", "NotoSansKhmerUI-Regular"); - put("kn", "NotoSansKannadaUI-VF"); - put("lo", "NotoSansLaoUI-Regular"); - put("ml", "NotoSansMalayalamUI-VF"); - put("mr", "NotoSansDevanagariUI-VF"); - put("my", "NotoSansMyanmarUI-Regular"); - put("ne", "NotoSansDevanagariUI-VF"); - put("or", "NotoSansOriya-Regular"); - put("pa", "NotoSansGurmukhiUI-VF"); - put("si", "NotoSansSinhalaUI-VF"); - put("ta", "NotoSansTamilUI-VF"); - put("te", "NotoSansTeluguUI-VF"); - put("th", "NotoSansThaiUI-Regular"); - put("ur", "NotoNaskhArabicUI-Regular"); - put("zh", "NotoSansCJK-Regular"); - } - }; + Map.ofEntries( + entry("am", "NotoSansEthiopic-VF"), + entry("ar", "NotoNaskhArabicUI-Regular"), + entry("as", "NotoSansBengaliUI-VF"), + entry("bn", "NotoSansBengaliUI-VF"), + entry("fa", "NotoNaskhArabicUI-Regular"), + entry("gu", "NotoSansGujaratiUI-Regular"), + entry("hi", "NotoSansDevanagariUI-VF"), + entry("hy", "NotoSansArmenian-VF"), + entry("iw", "NotoSansHebrew-Regular"), + entry("ja", "NotoSansCJK-Regular"), + entry("ka", "NotoSansGeorgian-VF"), + entry("ko", "NotoSansCJK-Regular"), + entry("km", "NotoSansKhmerUI-Regular"), + entry("kn", "NotoSansKannadaUI-VF"), + entry("lo", "NotoSansLaoUI-Regular"), + entry("ml", "NotoSansMalayalamUI-VF"), + entry("mr", "NotoSansDevanagariUI-VF"), + entry("my", "NotoSansMyanmarUI-Regular"), + entry("ne", "NotoSansDevanagariUI-VF"), + entry("or", "NotoSansOriya-Regular"), + entry("pa", "NotoSansGurmukhiUI-VF"), + entry("si", "NotoSansSinhalaUI-VF"), + entry("ta", "NotoSansTamilUI-VF"), + entry("te", "NotoSansTeluguUI-VF"), + entry("th", "NotoSansThaiUI-Regular"), + entry("ur", "NotoNaskhArabicUI-Regular"), + entry("zh", "NotoSansCJK-Regular")); // Languages that write from right to left. private static final Set RTL_LANGUAGE = - new HashSet() { - { - add("ar"); // Arabic - add("fa"); // Persian - add("he"); // Hebrew - add("iw"); // Hebrew - add("ur"); // Urdu - } - }; + Set.of( + "ar", // Arabic + "fa", // Persian + "he", // Hebrew + "iw", // Hebrew + "ur"); // Urdu /** Exception to indicate the failure to find the translated text strings. */ public static class LocalizedStringNotFoundException extends Exception {