From 24f423c0f85252160b91f81e05e9f8984602eb77 Mon Sep 17 00:00:00 2001
From: Abhinav Gupta <mail@abhinavg.net>
Date: Wed, 28 Sep 2011 20:29:47 +0000
Subject: [PATCH] ICU-8268 inefficient use of Long, Integer, Character
 constructors.

X-SVN-Rev: 30734
---
 .../classes/core/src/com/ibm/icu/impl/DateNumberFormat.java | 2 +-
 .../classes/core/src/com/ibm/icu/impl/PropsVectors.java     | 4 ++--
 .../classes/core/src/com/ibm/icu/text/DecimalFormat.java    | 2 +-
 .../classes/core/src/com/ibm/icu/text/MessageFormat.java    | 4 ++--
 icu4j/main/classes/core/src/com/ibm/icu/text/NFRule.java    | 4 ++--
 icu4j/main/classes/core/src/com/ibm/icu/text/NFRuleSet.java | 2 +-
 .../classes/core/src/com/ibm/icu/text/NFSubstitution.java   | 6 +++---
 .../core/src/com/ibm/icu/text/RuleBasedNumberFormat.java    | 2 +-
 .../classes/core/src/com/ibm/icu/text/SimpleDateFormat.java | 6 +++---
 .../classes/core/src/com/ibm/icu/text/TimeUnitFormat.java   | 2 +-
 .../main/classes/core/src/com/ibm/icu/util/VersionInfo.java | 2 +-
 11 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/DateNumberFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/DateNumberFormat.java
index 18927a14b8c..1635f7c365e 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/DateNumberFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/DateNumberFormat.java
@@ -226,7 +226,7 @@ public final class DateNumberFormat extends NumberFormat {
         Number result = null;
         if (sawNumber) {
             num = negative ? num * (-1) : num;
-            result = new Long(num);
+            result = Long.valueOf(num);
             parsePosition.setIndex(base + offset);
         }
         return result;
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/PropsVectors.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/PropsVectors.java
index 63784850a46..9f8b676455e 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/PropsVectors.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/PropsVectors.java
@@ -1,6 +1,6 @@
 /*
  ******************************************************************************
- * Copyright (C) 1996-2009, International Business Machines Corporation and   *
+ * Copyright (C) 1996-2011, International Business Machines Corporation and   *
  * others. All Rights Reserved.                                               *
  ******************************************************************************
  */
@@ -376,7 +376,7 @@ public class PropsVectors {
         // sort the properties vectors to find unique vector values
         Integer[] indexArray = new Integer[rows];
         for (int i = 0; i < rows; ++i) {
-            indexArray[i] = new Integer(columns * i);
+            indexArray[i] = Integer.valueOf(columns * i);
         }
 
         Arrays.sort(indexArray, new Comparator<Integer>() {
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java
index 4a41229e1be..3dbe12aa14d 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java
@@ -1759,7 +1759,7 @@ public class DecimalFormat extends NumberFormat {
                     n = new Long(l);
                 } else {
                     BigInteger big = digitList.getBigInteger(status[STATUS_POSITIVE]);
-                    n = (big.bitLength() < 64) ? (Number) new Long(big.longValue()) : (Number) big;
+                    n = (big.bitLength() < 64) ? (Number) Long.valueOf(big.longValue()) : (Number) big;
                 }
             }
             // Handle non-integral values or the case where parseBigDecimal is set
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java
index 8748c6f6257..d1424c0fef1 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/MessageFormat.java
@@ -1272,7 +1272,7 @@ public class MessageFormat extends UFormat {
             String key = null;
             if(args!=null) {
                 argNumber=part.getValue();  // ARG_NUMBER
-                argId = new Integer(argNumber);
+                argId = Integer.valueOf(argNumber);
             } else {
                 if(part.getType()==MessagePattern.Part.Type.ARG_NAME) {
                     key=msgPattern.getSubstring(part);
@@ -1617,7 +1617,7 @@ public class MessageFormat extends UFormat {
                 int argNumber=part.getValue();  // ARG_NUMBER
                 if (dest.attributes != null) {
                     // We only need argId if we add it into the attributes.
-                    argId = new Integer(argNumber);
+                    argId = Integer.valueOf(argNumber);
                 }
                 if(0<=argNumber && argNumber<args.length) {
                     arg=args[argNumber];
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/NFRule.java b/icu4j/main/classes/core/src/com/ibm/icu/text/NFRule.java
index bbbc74c00ed..ba910e2227e 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/NFRule.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/NFRule.java
@@ -865,7 +865,7 @@ final class NFRule {
 
         // return the result as a Long if possible, or as a Double
         if (result == (long)result) {
-            return new Long((long)result);
+            return Long.valueOf((long)result);
         } else {
             return new Double(result);
         }
@@ -1001,7 +1001,7 @@ final class NFRule {
             // "text" as possible.
         } else {
             ParsePosition tempPP = new ParsePosition(0);
-            Number result = new Long(0);
+            Number result = Long.valueOf(0);
             Number tempResult;
 
             // try to match the whole string against the substitution
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/NFRuleSet.java b/icu4j/main/classes/core/src/com/ibm/icu/text/NFRuleSet.java
index 1c2a8740f38..c8ca526e3ee 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/NFRuleSet.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/NFRuleSet.java
@@ -716,7 +716,7 @@ final class NFRuleSet {
         // that determines the value we return.
 
         ParsePosition highWaterMark = new ParsePosition(0);
-        Number result = new Long(0);
+        Number result = Long.valueOf(0);
         Number tempResult = null;
 
         // dump out if there's no text to parse
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/NFSubstitution.java b/icu4j/main/classes/core/src/com/ibm/icu/text/NFSubstitution.java
index 9f849abbd85..e9628e1101d 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/NFSubstitution.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/NFSubstitution.java
@@ -465,7 +465,7 @@ abstract class NFSubstitution {
             // the result.
             result = composeRuleValue(result, baseValue);
             if (result == (long)result) {
-                return new Long((long)result);
+                return Long.valueOf((long)result);
             } else {
                 return new Double(result);
             }
@@ -987,7 +987,7 @@ class ModulusSubstitution extends NFSubstitution {
 
                 result = composeRuleValue(result, baseValue);
                 if (result == (long)result) {
-                    return new Long((long)result);
+                    return Long.valueOf((long)result);
                 } else {
                     return new Double(result);
                 }
@@ -1817,7 +1817,7 @@ class NullSubstitution extends NFSubstitution {
     public Number doParse(String text, ParsePosition parsePosition, double baseValue,
                         double upperBound, boolean lenientParse) {
         if (baseValue == (long)baseValue) {
-            return new Long((long)baseValue);
+            return Long.valueOf((long)baseValue);
         } else {
             return new Double(baseValue);
         }
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java
index 970124ba128..e3f2c9714bd 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java
@@ -1196,7 +1196,7 @@ public class RuleBasedNumberFormat extends NumberFormat {
 
         // keep track of the largest number of characters consumed in
         // the various trials, and the result that corresponds to it
-        Number result = new Long(0);
+        Number result = Long.valueOf(0);
         ParsePosition highWaterMark = new ParsePosition(workingPos.getIndex());
 
         // iterate over the public rule sets (beginning with the default one)
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java
index 7c778807b1d..30d1c31afe3 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java
@@ -2232,7 +2232,7 @@ public class SimpleDateFormat extends DateFormat {
                     nDigits--;
                 }
                 pos.setIndex(oldPos + maxDigits);
-                number = new Integer((int)val);
+                number = Integer.valueOf((int)val);
             }
         }
         return number;
@@ -2816,7 +2816,7 @@ public class SimpleDateFormat extends DateFormat {
     protected NumberFormat getNumberFormat(char ch) {
 
        Character ovrField;
-       ovrField = new Character(ch);
+       ovrField = Character.valueOf(ch);
        if (overrideMap != null && overrideMap.containsKey(ovrField)) {
            String nsName = overrideMap.get(ovrField).toString();
            NumberFormat nf = numberFormatters.get(nsName);
@@ -2862,7 +2862,7 @@ public class SimpleDateFormat extends DateFormat {
                fullOverride = true;
             } else { // Field specific override string such as "y=hebrew"
                nsName = currentString.substring(equalSignPosition+1);
-               ovrField = new Character(currentString.charAt(0));
+               ovrField = Character.valueOf(currentString.charAt(0));
                overrideMap.put(ovrField,nsName);
                fullOverride = false;
             }
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/TimeUnitFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/TimeUnitFormat.java
index fd04a2b6cf2..d50ee8f2433 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/TimeUnitFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/TimeUnitFormat.java
@@ -298,7 +298,7 @@ public class TimeUnitFormat extends MeasureFormat {
             } else {
                 // should not happen.
                 // TODO: how to handle?
-                resultNumber = new Integer(3);
+                resultNumber = Integer.valueOf(3);
             }
         }
         if (longestParseDistance == 0) {
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
index 987802b28a0..9a66910c53c 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
@@ -246,7 +246,7 @@ public final class VersionInfo implements Comparable<VersionInfo>
             throw new IllegalArgumentException(INVALID_VERSION_NUMBER_);
         }
         int     version = getInt(major, minor, milli, micro);
-        Integer key     = new Integer(version);
+        Integer key     = Integer.valueOf(version);
         VersionInfo  result  = MAP_.get(key);
         if (result == null) {
             result = new VersionInfo(version);
-- 
2.40.0