Skip to content

Commit 0dab0d0

Browse files
committed
Clean utils > LC UP strings > use ignored words
1 parent 1da3d68 commit 0dab0d0

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/main/java/org/mtransit/commons/CleanUtils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.jetbrains.annotations.NotNull;
1616
import org.jetbrains.annotations.Nullable;
1717

18+
import java.util.Arrays;
1819
import java.util.Locale;
1920
import java.util.regex.Matcher;
2021
import java.util.regex.Pattern;
@@ -548,8 +549,9 @@ public static String fixMcXCase(@NotNull String string) { // Mccowan -> McCowan
548549
Pattern.CASE_INSENSITIVE | RegexUtils.fUNICODE_CHARACTER_CLASS() | RegexUtils.fCANON_EQ());
549550

550551
@NotNull
551-
public static String toLowerCaseUpperCaseStrings(@NotNull Locale locale, @NotNull String string) {
552+
public static String toLowerCaseUpperCaseStrings(@NotNull Locale locale, @NotNull String string, @NotNull String... ignoreWords) {
552553
if (string.isEmpty()) return string;
554+
if (Arrays.asList(ignoreWords).contains(string)) return string;
553555
if (CharUtils.isUppercaseOnly(string, true, true)) {
554556
return string.toLowerCase(locale);
555557
}

src/main/java/org/mtransit/commons/StringsCleaner.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ object StringsCleaner {
7070
if (lowerUCWords) {
7171
string = CleanUtils.toLowerCaseUpperCaseWords(language, string, *ignoredUCWords)
7272
} else if (lowerUCStrings) {
73-
string = CleanUtils.toLowerCaseUpperCaseStrings(language, string)
73+
string = CleanUtils.toLowerCaseUpperCaseStrings(language, string, *ignoredUCWords)
7474
}
7575
}
7676
if (!short) {

0 commit comments

Comments
 (0)