ICU-21936 Make the internal units converters public

See #2021

diff --git a/icu4c/source/i18n/units_complexconverter.h b/icu4c/source/i18n/units_complexconverter.h
index 5c669b45ddd7df189b3b7b891ca854ddf88c1c96..d56ce8d4ce378f2e06fb75e938dfd9264213baef 100644 (file)
--- a/icu4c/source/i18n/units_complexconverter.h
+++ b/icu4c/source/i18n/units_complexconverter.h
@@ -108,13 +108,15 @@ class U_I18N_API ComplexUnitsConverter : public UMemory {
     MaybeStackVector<Measure>
     convert(double quantity, icu::number::impl::RoundingImpl *rounder, UErrorCode &status) const;
 
-  private:
+    // TODO(ICU-21937): Make it private after submitting the public units conversion API.
     MaybeStackVector<UnitsConverter> unitsConverters_;
 
+    // TODO(ICU-21937): Make it private after submitting the public units conversion API.
     // Individual units of mixed units, sorted big to small, with indices
     // indicating the requested output mixed unit order.
     MaybeStackVector<MeasureUnitImplWithIndex> units_;
 
+  private:
     // Sorts units_, which must be populated before calling this, and populates
     // unitsConverters_.
     void init(const MeasureUnitImpl &inputUnit, const ConversionRates &ratesInfo, UErrorCode &status);

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/units/ComplexUnitsConverter.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/units/ComplexUnitsConverter.java
index 853a63ca8f4bce96d9fbba560e28dc153a355576..af9843a276cc0a26f5f80204632b850d3e2303ac 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/units/ComplexUnitsConverter.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/units/ComplexUnitsConverter.java
@@ -24,12 +24,15 @@ import com.ibm.icu.util.Measure;
 public class ComplexUnitsConverter {
     public static final BigDecimal EPSILON = BigDecimal.valueOf(Math.ulp(1.0));
     public static final BigDecimal EPSILON_MULTIPLIER = BigDecimal.valueOf(1).add(EPSILON);
-    private ArrayList<UnitsConverter> unitsConverters_;
+
+    // TODO(ICU-21937): Make it private after submitting the public units conversion API.
+    public ArrayList<UnitsConverter> unitsConverters_;
     /**
      * Individual units of mixed units, sorted big to small, with indices
      * indicating the requested output mixed unit order.
      */
-    private List<MeasureUnitImpl.MeasureUnitImplWithIndex> units_;
+    // TODO(ICU-21937): Make it private after submitting the public units conversion API.
+    public List<MeasureUnitImpl.MeasureUnitImplWithIndex> units_;
     private MeasureUnitImpl inputUnit_;
 
     /**