Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce some more local variables to make the code better readable

This commit is contained in:
Benedikt Ritter 2017-04-17 12:40:58 +02:00
parent f059e5f7fa
commit dfecbe9709
No known key found for this signature in database
GPG Key ID: 9DAADC1C9FCC82D0
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/apache/commons/lang3/LocaleUtils.java
View File

@ -139,18 +139,20 @@ private static Locale parseLocale(final String str) {
}
final String[] segments = str.split("_", -1);
final int segmentCount = segments.length -1;
final String language = segments[0];
if (segmentCount == 1) {
if (isISO639LanguageCode(language) && isISO3166CountryCode(segments[1]) ||
isNumericAreaCode(segments[1])) {
return new Locale(language, segments[1]);
if (segments.length == 2) {
final String country = segments[1];
if (isISO639LanguageCode(language) && isISO3166CountryCode(country) ||
isNumericAreaCode(country)) {
return new Locale(language, country);
}
} else if (segmentCount == 2) {
} else if (segments.length == 3) {
final String country = segments[1];
final String variant = segments[2];
if (isISO639LanguageCode(language) &&
(segments[1].length() == 0 || isISO3166CountryCode(segments[1])) &&
segments[2].length() > 0) {
return new Locale(language, segments[1], segments[2]);
(country.length() == 0 || isISO3166CountryCode(country)) &&
variant.length() > 0) {
return new Locale(language, country, variant);
}
}
throw new IllegalArgumentException("Invalid locale format: " + str);