From 16ab588517ebbedf48beb4f65d834037de62b539 Mon Sep 17 00:00:00 2001 From: David Beaumont Date: Wed, 6 Nov 2019 11:50:51 +0000 Subject: [PATCH] ICU-20693 Quick tidy of some stale/broken comments See #908 --- .../java/org/unicode/icu/tool/cldrtoicu/PathMatcher.java | 2 +- .../unicode/icu/tool/cldrtoicu/mapper/LocaleMapper.java | 9 ++++----- .../unicode/icu/tool/cldrtoicu/mapper/RbnfMapper.java | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/PathMatcher.java b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/PathMatcher.java index bf21c029bf5..77f0d765b05 100644 --- a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/PathMatcher.java +++ b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/PathMatcher.java @@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableMap; * {@code "foo/*[@x="z"]/bar[@y=*]"}, where element names and attribute values can be wildcards. * *

Note that the path fragment represented by the specification does not include either leading - * or trailing {@code '/'}. This is because matching can occur at any point in a {@code CdlrPath}. + * or trailing {@code '/'}. This is because matching can occur at any point in a {@link CldrPath}. * The choice of where to match in the path is governed by the match method used (e.g. * {@link PathMatcher#matchesSuffixOf(CldrPath)}. */ diff --git a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/LocaleMapper.java b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/LocaleMapper.java index d3f39f64884..5c32fe65fc6 100644 --- a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/LocaleMapper.java +++ b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/LocaleMapper.java @@ -33,13 +33,12 @@ public final class LocaleMapper extends AbstractPathValueMapper { /** * Processes data from the given supplier to generate general locale data for the given locale. * - * @param localeId the locale ID to generate data for. - * @param src the CLDR data supplier to process. + * @param icuData the ICU data to be filled in. + * @param unresolved the unresolved CLDR source data (to determine which paths to add). + * @param resolved the resolved CLDR source data (from which the actual data is processed). * @param icuSpecialData additional ICU data (in the "icu:" namespace) * @param transformer the transformer to match and transform each CLDR path/value pair. - * @param supplementalData additional necessary data derived from - * {@link org.unicode.cldr.api.CldrDataType#SUPPLEMENTAL SUPPLEMENTAL} data. - * @return IcuData containing locale data for the given locale ID. + * @param defaultCalendar the default calendar (obtained separately from supplemental data). */ public static void process( IcuData icuData, diff --git a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/RbnfMapper.java b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/RbnfMapper.java index d6d89ffc98f..9377e8d78dc 100644 --- a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/RbnfMapper.java +++ b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/RbnfMapper.java @@ -77,8 +77,8 @@ public final class RbnfMapper { // This is rather hacky because the access attribute lives on the parent path // element, but we cannot use it until we visit the child values (because it's a - // value attribute and will not be in the prefix path. So we need to add the header - // only once, just before we start adding the values relating to the child + // value attribute and will not be in the prefix path). So we need to add the + // header only once, just before we start adding the values relating to the child // elements, so we need a flag. // // This cannot be a boolean field since it must be "effectively final".