From 02328c1edc0d62c58c95116782a696cf33c5aa92 Mon Sep 17 00:00:00 2001
From: Yoshito Umaoka <y.umaoka@gmail.com>
Date: Fri, 18 Dec 2009 19:54:01 +0000
Subject: [PATCH] ICU-7286 Also fixed unnecessary String construction in
 various codes.

X-SVN-Rev: 27105
---
 .../core/src/com/ibm/icu/text/Bidi.java        |  4 ++--
 .../core/src/com/ibm/icu/text/BidiWriter.java  |  6 +++---
 .../com/ibm/icu/text/CanonicalIterator.java    |  6 +-----
 .../com/ibm/icu/text/DateFormatSymbols.java    |  2 +-
 .../ibm/icu/text/DateTimePatternGenerator.java | 18 +++++++++---------
 .../core/src/com/ibm/icu/text/NFRule.java      |  3 +--
 .../src/com/ibm/icu/text/NFSubstitution.java   |  4 ++--
 .../src/com/ibm/icu/text/SimpleDateFormat.java |  8 ++++----
 .../com/ibm/icu/text/ThaiBreakIterator.java    |  4 ++--
 9 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/Bidi.java b/icu4j/main/classes/core/src/com/ibm/icu/text/Bidi.java
index 2a582192602..35620d7d60e 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/Bidi.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/Bidi.java
@@ -4790,7 +4790,7 @@ public class Bidi {
         verifyValidParaOrLine();
         if (length == 0) {
             /* nothing to do */
-            return new String("");
+            return "";
         }
 
         return BidiWriter.writeReordered(this, options);
@@ -4844,7 +4844,7 @@ public class Bidi {
             return BidiWriter.writeReverse(src, options);
         } else {
             /* nothing to do */
-            return new String("");
+            return "";
         }
     }
 
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/BidiWriter.java b/icu4j/main/classes/core/src/com/ibm/icu/text/BidiWriter.java
index 8fc54ff2756..172738630b2 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/BidiWriter.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/BidiWriter.java
@@ -1,6 +1,6 @@
 /*
 *******************************************************************************
-*   Copyright (C) 2001-2007, International Business Machines
+*   Copyright (C) 2001-2009, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 */
@@ -42,8 +42,8 @@ final class BidiWriter {
         /* optimize for several combinations of options */
         switch(options&(Bidi.REMOVE_BIDI_CONTROLS|Bidi.DO_MIRRORING)) {
         case 0: {
-            /* simply copy the LTR run to the destination */
-            return new String(src);
+            /* simply return the LTR run */
+            return src;
         }
         case Bidi.DO_MIRRORING: {
             StringBuffer dest = new StringBuffer(src.length());
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/CanonicalIterator.java b/icu4j/main/classes/core/src/com/ibm/icu/text/CanonicalIterator.java
index 1ffefcdb66e..6434c7bc3a8 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/CanonicalIterator.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/CanonicalIterator.java
@@ -316,12 +316,8 @@ public final class CanonicalIterator {
                     // there were some matches, so add all the possibilities to the set.
                     String prefix= segment.substring(0,i);
                     prefix += UTF16.valueOf(cp2);
-                    //int el = -1;
                     for (String item : remainder) {
-                        String toAdd = new String(prefix);
-                        toAdd += item;
-                        result.add(toAdd);
-                        //if (PROGRESS) printf("Adding: %s\n", UToS(Tr(*toAdd)));
+                        result.add(prefix + item);
                     }
                 }
             }
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DateFormatSymbols.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DateFormatSymbols.java
index 0a2166bc962..92de58bab61 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/DateFormatSymbols.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DateFormatSymbols.java
@@ -893,7 +893,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      * @stable ICU 2.0
      */
     public String getLocalPatternChars() {
-        return new String(localPatternChars);
+        return localPatternChars;
     }
 
     /**
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java
index 43cb7dd72b4..9619aef71bc 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java
@@ -254,26 +254,26 @@ public class DateTimePatternGenerator implements Freezable<DateTimePatternGenera
 
     private static void hackTimes(DateTimePatternGenerator result, PatternInfo returnInfo, String hackPattern) {
         result.fp.set(hackPattern);
-        String mmss = new String();
+        StringBuilder mmss = new StringBuilder();
         // to get mm:ss, we strip all but mm literal ss
         boolean gotMm = false;
         for (int i = 0; i < result.fp.items.size(); ++i) {
             Object item = result.fp.items.get(i);
             if (item instanceof String) {
                 if (gotMm) {
-                    mmss += result.fp.quoteLiteral(item.toString());
+                    mmss.append(result.fp.quoteLiteral(item.toString()));
                 }
             } else {
                 char ch = item.toString().charAt(0);
                 if (ch == 'm') {
                     gotMm = true;
-                    mmss += item;
+                    mmss.append(item);
                 } else if (ch == 's') {
                     if (!gotMm) {
                         break; // failed
                     }
-                    mmss += item;
-                    result.addPattern(mmss, false, returnInfo);
+                    mmss.append(item);
+                    result.addPattern(mmss.toString(), false, returnInfo);
                     break;
                 } else if (gotMm || ch == 'z' || ch == 'Z' || ch == 'v' || ch == 'V') {
                     break; // failed
@@ -303,17 +303,17 @@ public class DateTimePatternGenerator implements Freezable<DateTimePatternGenera
     }
 
     private static String getFilteredPattern(FormatParser fp, BitSet nuke) {
-        String result = new String();
+        StringBuilder result = new StringBuilder();
         for (int i = 0; i < fp.items.size(); ++i) {
             if (nuke.get(i)) continue;
             Object item = fp.items.get(i);
             if (item instanceof String) {
-                result += fp.quoteLiteral(item.toString());
+                result.append(fp.quoteLiteral(item.toString()));
             } else {
-                result += item.toString();
+                result.append(item.toString());
             }
         }
-        return result;
+        return result.toString();
     }
 
     /*private static int getAppendNameNumber(String string) {
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 78974aac7c6..a63ff6dc352 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
@@ -737,13 +737,12 @@ final class NFRule {
         // internally we operate on a copy of the string being parsed
         // (because we're going to change it) and use our own ParsePosition
         ParsePosition pp = new ParsePosition(0);
-        String workText = new String(text);
 
         // check to see whether the text before the first substitution
         // matches the text at the beginning of the string being
         // parsed.  If it does, strip that off the front of workText;
         // otherwise, dump out with a mismatch
-        workText = stripPrefix(workText, ruleText.substring(0, sub1.getPos()), pp);
+        String workText = stripPrefix(text, ruleText.substring(0, sub1.getPos()), pp);
         int prefixLength = text.length() - workText.length();
 
         if (pp.getIndex() == 0 && sub1.getPos() != 0) {
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 6bb48b07768..385c0f37d2d 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
@@ -1317,7 +1317,7 @@ class FractionalPartSubstitution extends NFSubstitution {
         // upperBound to 10 when calling doParse() ) until we reach
         // nonmatching text
         } else {
-            String workText = new String(text);
+            String workText = text;
             ParsePosition workPos = new ParsePosition(1);
             double result = 0;
         int digit;
@@ -1645,7 +1645,7 @@ class NumeratorSubstitution extends NFSubstitution {
         // and use that to adjust the parse result
         int zeroCount = 0;
         if (withZeros) {
-            String workText = new String(text);
+            String workText = text;
             ParsePosition workPos = new ParsePosition(1);
             //int digit;
 
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 0b38ef52987..213c5fe2d9b 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
@@ -835,7 +835,7 @@ public class SimpleDateFormat extends DateFormat {
         if (patternCharIndex == -1) {
             throw new IllegalArgumentException("Illegal pattern character " +
                                                "'" + ch + "' in \"" +
-                                               new String(pattern) + '"');
+                                               pattern + '"');
         }
 
         final int field = PATTERN_INDEX_TO_CALENDAR_FIELD[patternCharIndex];
@@ -2918,7 +2918,7 @@ public class SimpleDateFormat extends DateFormat {
             if (patternCharIndex == -1) {
                 throw new IllegalArgumentException("Illegal pattern character " +
                                                    "'" + ch + "' in \"" +
-                                                   new String(pattern) + '"');
+                                                   pattern + '"');
             }
     
             if ( patternCharIndex < highestLevel ) {
@@ -3028,7 +3028,7 @@ public class SimpleDateFormat extends DateFormat {
         if (patternCharIndex == -1) {
             throw new IllegalArgumentException("Illegal pattern character " +
                                                "'" + ch + "' in \"" +
-                                               new String(pattern) + '"');
+                                               pattern + '"');
         }
   
         final int field = PATTERN_INDEX_TO_CALENDAR_FIELD[patternCharIndex];
@@ -3070,7 +3070,7 @@ public class SimpleDateFormat extends DateFormat {
         if (patternCharIndex == -1) {
             throw new IllegalArgumentException("Illegal pattern character " +
                                                "'" + ch + "' in \"" +
-                                               new String(pattern) + '"');
+                                               pattern + '"');
         }
     
         if ( patternCharIndex >= level ) {
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/ThaiBreakIterator.java b/icu4j/main/classes/core/src/com/ibm/icu/text/ThaiBreakIterator.java
index b525fe33bf4..ae6da615665 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/ThaiBreakIterator.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/ThaiBreakIterator.java
@@ -115,10 +115,10 @@ class ThaiBreakIterator extends DictionaryBasedBreakIterator {
         fBeginWordSet = new UnicodeSet();
         fSuffixSet = new UnicodeSet();
 
-        fThaiWordSet.applyPattern(new String("[[:Thai:]&[:LineBreak=SA:]]"));
+        fThaiWordSet.applyPattern("[[:Thai:]&[:LineBreak=SA:]]");
         fThaiWordSet.compact();
 
-        fMarkSet.applyPattern(new String("[[:Thai:]&[:LineBreak=SA:]&[:M:]]"));
+        fMarkSet.applyPattern("[[:Thai:]&[:LineBreak=SA:]&[:M:]]");
         fMarkSet.add(0x0020);
         fEndWordSet = fThaiWordSet;
         fEndWordSet.remove(0x0E31); // MAI HAN-AKAT