ICU-21349 ICU4J units cleanup: eclipse warnings, unsuppress one warning

toString() now uses category, so @SuppressWarnings("unused") is no
longer needed.

diff --git a/icu4c/source/i18n/units_complexconverter.h b/icu4c/source/i18n/units_complexconverter.h
index 21f3d9b49b9786eea83cd4b258bed14af978d9f8..5c669b45ddd7df189b3b7b891ca854ddf88c1c96 100644 (file)
--- a/icu4c/source/i18n/units_complexconverter.h
+++ b/icu4c/source/i18n/units_complexconverter.h
@@ -86,7 +86,7 @@ class U_I18N_API ComplexUnitsConverter : public UMemory {
      *
      * @param inputUnit represents the source unit. (should be single or compound unit).
      * @param outputUnits represents the output unit. could be any type. (single, compound or mixed).
-     * @param ratesInfo
+     * @param ratesInfo a ConversionRates instance containing the unit conversion rates.
      * @param status
      */
     ComplexUnitsConverter(const MeasureUnitImpl &inputUnit, const MeasureUnitImpl &outputUnits,

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/UnitConversionHandler.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/UnitConversionHandler.java
index 84a77ad865f99940373f4bbe1341bc5993f2d5c7..2803b5992dc0b982584a0a18387bf40959fd229c 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/UnitConversionHandler.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/UnitConversionHandler.java
@@ -2,12 +2,9 @@
 // License & terms of use: http://www.unicode.org/copyright.html
 package com.ibm.icu.impl.number;
 
-import java.util.List;
-
 import com.ibm.icu.impl.units.ComplexUnitsConverter;
 import com.ibm.icu.impl.units.ConversionRates;
 import com.ibm.icu.impl.units.MeasureUnitImpl;
-import com.ibm.icu.util.Measure;
 import com.ibm.icu.util.MeasureUnit;
 
 /**

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 8a2b2f27f755879fe10a12d01682c50d3c0b4749..853a63ca8f4bce96d9fbba560e28dc153a355576 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
@@ -86,6 +86,7 @@ public class ComplexUnitsConverter {
      * @param outputUnits
      *            represents the output unit. could be any type. (single, compound or mixed).
      * @param conversionRates
+     *            a ConversionRates instance containing the unit conversion rates.
      */
     public ComplexUnitsConverter(MeasureUnitImpl inputUnit, MeasureUnitImpl outputUnits,
             ConversionRates conversionRates) {

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/units/UnitsRouter.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/units/UnitsRouter.java
index cfb6fa0bca9829430c899fa111851fadb3cb91ce..0c38fcb0d0d2f271b9bf4419893e8bfb201bb32d 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/units/UnitsRouter.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/units/UnitsRouter.java
@@ -9,7 +9,6 @@ import java.util.List;
 import com.ibm.icu.impl.IllegalIcuArgumentException;
 import com.ibm.icu.impl.number.MicroProps;
 import com.ibm.icu.number.Precision;
-import com.ibm.icu.util.Measure;
 import com.ibm.icu.util.MeasureUnit;
 
 /**

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/impl/UnitsTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/impl/UnitsTest.java
index 30d82edff4caadb636b758d797218543576ec09d..646856669e9f83bf12d71c7703479ded62da39ea 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/impl/UnitsTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/impl/UnitsTest.java
@@ -64,7 +64,7 @@ public class UnitsTest {
                 for (Measure measure : measures) {
                     double accuracy = 0.0;
                     if (i == expected.length - 1) {
-                        accuracy = accuracy;
+                        accuracy = this.accuracy;
                     }
                     assertTrue("input " + value + ", output measure " + i + ": expected " +
                                     expected[i] + ", expected unit " +
@@ -572,7 +572,6 @@ public class UnitsTest {
             /**
              * Test Case Data
              */
-            @SuppressWarnings("unused")
             String category;
             String usage;
             String region;
@@ -622,6 +621,7 @@ public class UnitsTest {
                 }
             }
 
+            @Override
             public String toString() {
                 ArrayList<MeasureUnitImpl> outputUnits = new ArrayList<>();
                 for (Pair<String, MeasureUnitImpl> unit : outputUnitInOrder) {