Skip to content

Commit ee90520

Browse files
gvictormarkusicu
authored andcommitted
ICU-23081 Use String.replace on non-regex string queries
https://unicode-org.atlassian.net/browse/ICU-23081
1 parent 1bf6bf7 commit ee90520

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/InternalLocaleBuilder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public InternalLocaleBuilder setVariant(String variant) throws LocaleSyntaxExcep
7575
_variant = "";
7676
} else {
7777
// normalize separators to "_"
78-
String var = variant.replaceAll(LanguageTag.SEP, BaseLocale.SEP);
78+
String var = variant.replace(LanguageTag.SEP, BaseLocale.SEP);
7979
int errIdx = checkVariants(var, BaseLocale.SEP);
8080
if (errIdx != -1) {
8181
throw new LocaleSyntaxException("Ill-formed variant: " + variant, errIdx);
@@ -121,7 +121,7 @@ public InternalLocaleBuilder setUnicodeLocaleKeyword(String key, String type) th
121121
} else {
122122
if (type.length() != 0) {
123123
// normalize separator to "-"
124-
String tp = type.replaceAll(BaseLocale.SEP, LanguageTag.SEP);
124+
String tp = type.replace(BaseLocale.SEP, LanguageTag.SEP);
125125
// validate
126126
StringTokenIterator itr = new StringTokenIterator(tp, LanguageTag.SEP);
127127
while (!itr.isDone()) {
@@ -166,7 +166,7 @@ public InternalLocaleBuilder setExtension(char singleton, String value) throws L
166166
}
167167
} else {
168168
// validate value
169-
String val = value.replaceAll(BaseLocale.SEP, LanguageTag.SEP);
169+
String val = value.replace(BaseLocale.SEP, LanguageTag.SEP);
170170
StringTokenIterator itr = new StringTokenIterator(val, LanguageTag.SEP);
171171
while (!itr.isDone()) {
172172
String s = itr.current();
@@ -202,7 +202,7 @@ public InternalLocaleBuilder setExtensions(String subtags) throws LocaleSyntaxEx
202202
clearExtensions();
203203
return this;
204204
}
205-
subtags = subtags.replaceAll(BaseLocale.SEP, LanguageTag.SEP);
205+
subtags = subtags.replace(BaseLocale.SEP, LanguageTag.SEP);
206206
StringTokenIterator itr = new StringTokenIterator(subtags, LanguageTag.SEP);
207207

208208
List<String> extensions = null;
@@ -485,7 +485,7 @@ public BaseLocale getBaseLocale() {
485485
if (sb.length() != 0) {
486486
sb.append(BaseLocale.SEP);
487487
}
488-
sb.append(privuse.substring(privVarStart).replaceAll(LanguageTag.SEP, BaseLocale.SEP));
488+
sb.append(privuse.substring(privVarStart).replace(LanguageTag.SEP, BaseLocale.SEP));
489489
variant = sb.toString();
490490
}
491491
}

icu4j/main/core/src/main/java/com/ibm/icu/impl/units/ConversionRates.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public void put(UResource.Key key, UResource.Value value, boolean noFallback) {
183183

184184

185185
String keyString = key.toString();
186-
String valueString = value.toString().replaceAll(" ", "");
186+
String valueString = value.toString().replace(" ", "");
187187
if ("target".equals(keyString)) {
188188
target = valueString;
189189
} else if ("factor".equals(keyString)) {

icu4j/main/core/src/main/java/com/ibm/icu/text/DateFormatSymbols.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2244,7 +2244,7 @@ public DateFormatSymbols(Class<? extends Calendar> calendarClass, ULocale locale
22442244
}
22452245
}
22462246
if (calType == null) {
2247-
calType = className.replaceAll("Calendar", "").toLowerCase(Locale.ENGLISH);
2247+
calType = className.replace("Calendar", "").toLowerCase(Locale.ENGLISH);
22482248
}
22492249

22502250
initializeData(locale, calType);

0 commit comments

Comments
 (0)