ICU-11929 (J) Rename MeasureUnit constants GENERIC, REVOLUTION

X-SVN-Rev: 38010

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java b/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java
index 551d013a721bad947da4e39e4c455682fb840eff..c1fcc98e8e3c01a347ad55d92f789f85e016499c 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java
@@ -364,7 +364,7 @@ public class MeasureUnit implements Serializable {
      * @draft ICU 56
      * @provisional This API might change or be removed in a future release.
      */
-    public static final MeasureUnit REVOLUTION = MeasureUnit.internalGetInstance("angle", "revolution");
+    public static final MeasureUnit REVOLUTION_ANGLE = MeasureUnit.internalGetInstance("angle", "revolution");
 
     /**
      * Constant for unit of area: acre
@@ -948,10 +948,10 @@ public class MeasureUnit implements Serializable {
 
     /**
      * Constant for unit of temperature: generic
-     * @draft ICU 55
+     * @draft ICU 56
      * @provisional This API might change or be removed in a future release.
      */
-    public static final MeasureUnit GENERIC = MeasureUnit.internalGetInstance("temperature", "generic");
+    public static final MeasureUnit GENERIC_TEMPERATURE = MeasureUnit.internalGetInstance("temperature", "generic");
 
     /**
      * Constant for unit of temperature: kelvin

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java
index 0eb667b9044bb92cabfa352542ad98bdebdca870..390a27b3dd53a205f81d6d346b810bdc47de2a33 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java
@@ -195,8 +195,8 @@ public class MeasureUnitTest extends TestFmwk {
         {"QUART", "54"},
         {"TABLESPOON", "54"},
         {"TEASPOON", "54"},
-        {"GENERIC", "55"},
-        {"REVOLUTION", "56"},
+        {"GENERIC_TEMPERATURE", "56"},
+        {"REVOLUTION_ANGLE", "56"},
         {"LITER_PER_100KILOMETERS", "56"},
         {"CENTURY", "56"},
         {"MILE_SCANDINAVIAN", "56"},
@@ -516,7 +516,7 @@ public class MeasureUnitTest extends TestFmwk {
                 MeasureUnit.MILE_PER_HOUR,
                 MeasureUnit.CELSIUS,
                 MeasureUnit.FAHRENHEIT,
-                MeasureUnit.GENERIC,
+                MeasureUnit.GENERIC_TEMPERATURE,
                 MeasureUnit.KELVIN,
                 MeasureUnit.ACRE_FOOT,
                 MeasureUnit.BUSHEL,
@@ -552,7 +552,7 @@ public class MeasureUnitTest extends TestFmwk {
                 MeasureUnit.ARC_SECOND,
                 MeasureUnit.DEGREE,
                 MeasureUnit.RADIAN,
-                MeasureUnit.REVOLUTION,
+                MeasureUnit.REVOLUTION_ANGLE,
                 MeasureUnit.ACRE,
                 MeasureUnit.HECTARE,
                 MeasureUnit.SQUARE_CENTIMETER,
@@ -649,7 +649,7 @@ public class MeasureUnitTest extends TestFmwk {
                 MeasureUnit.MILE_PER_HOUR,
                 MeasureUnit.CELSIUS,
                 MeasureUnit.FAHRENHEIT,
-                MeasureUnit.GENERIC,
+                MeasureUnit.GENERIC_TEMPERATURE,
                 MeasureUnit.KELVIN,
                 MeasureUnit.ACRE_FOOT,
                 MeasureUnit.BUSHEL,