ICU-10268 Incorporte Suggestions from Markus

X-SVN-Rev: 34766

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java
index ccf6fa2823864c2356c718c22327c076793de13f..45ae418b24eaea7b10512cdc99effa880b41b032 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java
@@ -641,7 +641,7 @@ public class MeasureFormat extends UFormat {
 
         public void writeExternal(ObjectOutput out) throws IOException {
             out.writeByte(0); // version
-            out.writeObject(locale);
+            out.writeUTF(locale.toLanguageTag());
             out.writeObject(length);
             out.writeObject(numberFormat);
             out.writeByte(subClass);
@@ -651,10 +651,7 @@ public class MeasureFormat extends UFormat {
         @SuppressWarnings("unchecked")
         public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
             in.readByte(); // version.
-            locale = (ULocale) in.readObject();
-            if (locale == null) {
-                throw new InvalidObjectException("Missing locale.");
-            }
+            locale = ULocale.forLanguageTag(in.readUTF());
             length = (FormatWidth) in.readObject();
             if (length == null) {
                 throw new InvalidObjectException("Missing width.");

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/Currency.java b/icu4j/main/classes/core/src/com/ibm/icu/util/Currency.java
index e2df269e90bf65e41cd07d3b2559913ce059ed60..bc331b39daedc9add9a9949e4d6f1f4f3a096bf9 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/Currency.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/Currency.java
@@ -396,7 +396,7 @@ public class Currency extends MeasureUnit {
      * @stable ICU 2.2
      */
     public String getCurrencyCode() {
-        return code;
+        return subType;
     }
 
     /**
@@ -414,7 +414,7 @@ public class Currency extends MeasureUnit {
                     "currencyNumericCodes",
                     ICUResourceBundle.ICU_DATA_CLASS_LOADER);
             UResourceBundle codeMap = bundle.get("codeMap");
-            UResourceBundle numCode = codeMap.get(code);
+            UResourceBundle numCode = codeMap.get(subType);
             result = numCode.getInt();
         } catch (MissingResourceException e) {
             // fall through
@@ -503,7 +503,7 @@ public class Currency extends MeasureUnit {
         }
 
         CurrencyDisplayNames names = CurrencyDisplayNames.getInstance(locale);
-        return nameStyle == SYMBOL_NAME ? names.getSymbol(code) : names.getName(code);
+        return nameStyle == SYMBOL_NAME ? names.getSymbol(subType) : names.getName(subType);
     }
 
     /**
@@ -552,7 +552,7 @@ public class Currency extends MeasureUnit {
         }
         
         CurrencyDisplayNames names = CurrencyDisplayNames.getInstance(locale);
-        return names.getPluralName(code, pluralCount);
+        return names.getPluralName(subType, pluralCount);
     }
 
     /**
@@ -729,7 +729,7 @@ public class Currency extends MeasureUnit {
      */
     public int getDefaultFractionDigits() {
         CurrencyMetaInfo info = CurrencyMetaInfo.getInstance();
-        CurrencyDigits digits = info.currencyDigits(code);
+        CurrencyDigits digits = info.currencyDigits(subType);
         return digits.fractionDigits;
     }
 
@@ -741,7 +741,7 @@ public class Currency extends MeasureUnit {
      */
     public double getRoundingIncrement() {
         CurrencyMetaInfo info = CurrencyMetaInfo.getInstance();
-        CurrencyDigits digits = info.currencyDigits(code);
+        CurrencyDigits digits = info.currencyDigits(subType);
 
         int data1 = digits.roundingIncrement;
 
@@ -768,7 +768,7 @@ public class Currency extends MeasureUnit {
      * @stable ICU 2.2
      */
     public String toString() {
-        return code;
+        return subType;
     }
 
     /**
@@ -903,7 +903,7 @@ public class Currency extends MeasureUnit {
     }
     
     private Object writeReplace() throws ObjectStreamException {
-        return new MeasureUnitProxy(type, code);
+        return new MeasureUnitProxy(type, subType);
     }
 
     // For backward compatibility only

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 595437a6e26b10eb692e7c7540530bfd59d3a1e9..9d26afa0ad63eab7fee41f0cb14e51e991687686 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
@@ -13,7 +13,7 @@ import java.io.ObjectOutput;
 import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -53,15 +53,15 @@ public class MeasureUnit implements Serializable {
      * @internal
      * @deprecated This API is ICU internal only.
      */
-    protected final String code;
+    protected final String subType;
     
     /**
      * @internal
      * @deprecated This API is ICU internal only.
      */
-    protected MeasureUnit(String type, String code) {
+    protected MeasureUnit(String type, String subType) {
         this.type = type;
-        this.code = code;
+        this.subType = subType;
     }
     
     /**
@@ -82,7 +82,7 @@ public class MeasureUnit implements Serializable {
      * @provisional
      */
     public String getSubtype() {
-        return code;
+        return subType;
     }
     
     
@@ -93,7 +93,7 @@ public class MeasureUnit implements Serializable {
      */
     @Override
     public int hashCode() {
-        return 31 * type.hashCode() + code.hashCode();
+        return 31 * type.hashCode() + subType.hashCode();
     }
     
     /**
@@ -109,7 +109,7 @@ public class MeasureUnit implements Serializable {
             return false;
         }
         MeasureUnit c = (MeasureUnit) rhs;
-        return type.equals(c.type) && code.equals(c.code);
+        return type.equals(c.type) && subType.equals(c.subType);
     }
     
     /**
@@ -118,7 +118,7 @@ public class MeasureUnit implements Serializable {
      */
     @Override
     public String toString() {
-        return type + "-" + code;
+        return type + "-" + subType;
     }
     
     /**
@@ -128,7 +128,7 @@ public class MeasureUnit implements Serializable {
      * @provisional
      */
     public synchronized static Set<String> getAvailableTypes() {
-        return new HashSet<String>(cache.keySet());
+        return Collections.unmodifiableSet(cache.keySet());
     }
 
     /**
@@ -138,9 +138,12 @@ public class MeasureUnit implements Serializable {
      * @draft ICU 53
      * @provisional
      */
-    public synchronized static Collection<MeasureUnit> getAvailable(String type) {
+    public synchronized static Set<MeasureUnit> getAvailable(String type) {
         Map<String, MeasureUnit> units = cache.get(type);
-        return units == null ? null : new ArrayList<MeasureUnit>(units.values());
+        // Train users not to modify returned set from the start giving us more
+        // flexibility for implementation.
+        return units == null ? Collections.<MeasureUnit>emptySet()
+                : Collections.unmodifiableSet(new HashSet<MeasureUnit>(units.values()));
     }
 
     /**
@@ -156,7 +159,9 @@ public class MeasureUnit implements Serializable {
                 result.add(unit);
             }
         }
-        return result;
+        // Train users not to modify returned set from the start giving us more
+        // flexibility for implementation.
+        return Collections.unmodifiableSet(result);
     }
 
     /**
@@ -169,13 +174,13 @@ public class MeasureUnit implements Serializable {
      * @internal
      * @deprecated This API is ICU internal only.
      */
-    public static MeasureUnit internalGetInstance(String type, String code) {
-        if (type == null || code == null) {
-            throw new NullPointerException("Type and code must be non-null");
+    public static MeasureUnit internalGetInstance(String type, String subType) {
+        if (type == null || subType == null) {
+            throw new NullPointerException("Type and subType must be non-null");
         }
         if (!"currency".equals(type)) {
-            if (!ASCII.containsAll(type) || !ASCII_HYPHEN.containsAll(code)) {
-                throw new IllegalArgumentException("The type or code are invalid.");
+            if (!ASCII.containsAll(type) || !ASCII_HYPHEN.containsAll(subType)) {
+                throw new IllegalArgumentException("The type or subType are invalid.");
             }
         }
         Factory factory;
@@ -186,7 +191,7 @@ public class MeasureUnit implements Serializable {
         } else {
             factory = UNIT_FACTORY;
         }
-        return MeasureUnit.addUnit(type, code, factory);
+        return MeasureUnit.addUnit(type, subType, factory);
     }
 
     static final UnicodeSet ASCII = new UnicodeSet('a', 'z').freeze();
@@ -201,44 +206,27 @@ public class MeasureUnit implements Serializable {
          * @internal
          * @deprecated This API is ICU internal only.
          */
-        MeasureUnit create(String type, String code);
+        MeasureUnit create(String type, String subType);
     }
 
     private static Factory UNIT_FACTORY = new Factory() {
-        public MeasureUnit create(String type, String code) {
-            return new MeasureUnit(type, code);
+        public MeasureUnit create(String type, String subType) {
+            return new MeasureUnit(type, subType);
         }
     };
 
     static Factory CURRENCY_FACTORY = new Factory() {
-        public MeasureUnit create(String unusedType, String code) {
-            return new Currency(code);
+        public MeasureUnit create(String unusedType, String subType) {
+            return new Currency(subType);
         }
     };
     
     static Factory TIMEUNIT_FACTORY = new Factory() {
-        public MeasureUnit create(String type, String code) {
-           return new TimeUnit(type, code);
+        public MeasureUnit create(String type, String subType) {
+           return new TimeUnit(type, subType);
         }
     };
 
-
-    //    /**
-    //     * Register a unit for later use
-    //     * @param type the type, such as "length"
-    //     * @param code the code, such as "meter"
-    //     * @return the unit.
-    //     * @draft ICU 52
-    //     * @provisional This API might change or be removed in a future release.
-    //     */
-    //    public static synchronized MeasureUnit registerUnit(String type, String code) {
-    //        MeasureUnit result = getInstance(type, code);
-    //        if (result == null) {
-    //            result = addUnit(type, code, MY_FACTORY);
-    //        }
-    //        return result;
-    //    }
-    //
     static {
         // load all of the units for English, since we know that that is a superset.
         /**
@@ -411,18 +399,18 @@ public class MeasureUnit implements Serializable {
     /** Private **/
 
     private Object writeReplace() throws ObjectStreamException {
-        return new MeasureUnitProxy(type, code);
+        return new MeasureUnitProxy(type, subType);
     }
 
     static final class MeasureUnitProxy implements Externalizable {
         private static final long serialVersionUID = -3910681415330989598L;
 
         private String type;
-        private String code;
+        private String subType;
 
-        public MeasureUnitProxy(String type, String code) {
+        public MeasureUnitProxy(String type, String subType) {
             this.type = type;
-            this.code = code;
+            this.subType = subType;
         }
 
         // Must have public constructor, to enable Externalizable
@@ -432,14 +420,14 @@ public class MeasureUnit implements Serializable {
         public void writeExternal(ObjectOutput out) throws IOException {
             out.writeByte(0); // version
             out.writeUTF(type);
-            out.writeUTF(code);
+            out.writeUTF(subType);
             out.writeShort(0); // allow for more data.
         }
 
         public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
             /* byte version = */ in.readByte(); // version
             type = in.readUTF();
-            code = in.readUTF();
+            subType = in.readUTF();
             // allow for more data from future version
             int extra = in.readShort();
             if (extra > 0) {
@@ -449,7 +437,7 @@ public class MeasureUnit implements Serializable {
         }
 
         private Object readResolve() throws ObjectStreamException {
-            return MeasureUnit.internalGetInstance(type, code);
+            return MeasureUnit.internalGetInstance(type, subType);
         }
     }
 }

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/TimeUnit.java b/icu4j/main/classes/core/src/com/ibm/icu/util/TimeUnit.java
index 036c7635982df067091164ddb332cb8e0c6ea764..01a032f7db813146ba23beafc5ea4511207f7144 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/TimeUnit.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/TimeUnit.java
@@ -46,7 +46,7 @@ public class TimeUnit extends MeasureUnit {
     }
     
     private Object writeReplace() throws ObjectStreamException {
-        return new MeasureUnitProxy(type, code);
+        return new MeasureUnitProxy(type, subType);
     }
     
     // For backward compatibility only