archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8267670: Update java.io, java.math, and java.text to use switch expressions

Browse source 
Reviewed-by: darcy, chegar, naoto, iris, dfuchs, lancea, vtewari
This commit is contained in:
Patrick Concannon 2021-06-01 10:14:56 +00:00
parent f5634fe39d
commit 4eb216824f
11 changed files with 161 additions and 349 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/java.base/share/classes/java/text/BreakIterator.java
View file

@ -560,22 +560,13 @@ public abstract class BreakIterator implements Cloneable
private static BreakIterator createBreakInstance(LocaleProviderAdapter adapter, Locale locale, int type) {
BreakIteratorProvider breakIteratorProvider = adapter.getBreakIteratorProvider();
BreakIterator iterator = null;
switch (type) {
case CHARACTER_INDEX:
iterator = breakIteratorProvider.getCharacterInstance(locale);
break;
case WORD_INDEX:
iterator = breakIteratorProvider.getWordInstance(locale);
break;
case LINE_INDEX:
iterator = breakIteratorProvider.getLineInstance(locale);
break;
case SENTENCE_INDEX:
iterator = breakIteratorProvider.getSentenceInstance(locale);
break;
}
return iterator;
return switch (type) {
case CHARACTER_INDEX -> breakIteratorProvider.getCharacterInstance(locale);
case WORD_INDEX -> breakIteratorProvider.getWordInstance(locale);
case LINE_INDEX -> breakIteratorProvider.getLineInstance(locale);
case SENTENCE_INDEX -> breakIteratorProvider.getSentenceInstance(locale);
default -> null;
};
}
/**

27
src/java.base/share/classes/java/text/NumberFormat.java
View file

@ -972,25 +972,14 @@ public abstract class NumberFormat extends Format {
Locale locale, Style formatStyle,
int choice) {
NumberFormatProvider provider = adapter.getNumberFormatProvider();
NumberFormat numberFormat = null;
switch (choice) {
case NUMBERSTYLE:
numberFormat = provider.getNumberInstance(locale);
break;
case PERCENTSTYLE:
numberFormat = provider.getPercentInstance(locale);
break;
case CURRENCYSTYLE:
numberFormat = provider.getCurrencyInstance(locale);
break;
case INTEGERSTYLE:
numberFormat = provider.getIntegerInstance(locale);
break;
case COMPACTSTYLE:
numberFormat = provider.getCompactNumberInstance(locale, formatStyle);
break;
}
return numberFormat;
return switch (choice) {
case NUMBERSTYLE -> provider.getNumberInstance(locale);
case PERCENTSTYLE -> provider.getPercentInstance(locale);
case CURRENCYSTYLE -> provider.getCurrencyInstance(locale);
case INTEGERSTYLE -> provider.getIntegerInstance(locale);
case COMPACTSTYLE -> provider.getCompactNumberInstance(locale, formatStyle);
default -> null;
};
}
/**

20
src/java.base/share/classes/java/text/PatternEntry.java
View file

@ -130,14 +130,18 @@ class PatternEntry {
if (showWhiteSpace)
toAddTo.append(' ');
}
switch (strength) {
case Collator.IDENTICAL: toAddTo.append('='); break;
case Collator.TERTIARY: toAddTo.append(','); break;
case Collator.SECONDARY: toAddTo.append(';'); break;
case Collator.PRIMARY: toAddTo.append('<'); break;
case RESET: toAddTo.append('&'); break;
case UNSET: toAddTo.append('?'); break;
}
var c = switch (strength) {
case Collator.IDENTICAL -> '=';
case Collator.TERTIARY -> ',';
case Collator.SECONDARY -> ';';
case Collator.PRIMARY -> '<';
case RESET -> '&';
case UNSET -> '?';
default -> throw new IllegalStateException("Unexpected value: " + strength);
};
toAddTo.append(c);
if (showWhiteSpace)
toAddTo.append(' ');
appendQuoted(chars,toAddTo);