1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

6801704: ChoiceFormat::applyPattern inconsistency for invalid patterns

Browse Source 
Reviewed-by: naoto
This commit is contained in:
Justin Lu 2024-03-05 22:37:58 +00:00
parent a7280d1b96
commit b665fe3ac1
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/java.base/share/classes/java/text/ChoiceFormat.java
View File

@ -134,6 +134,16 @@ import java.util.Objects;
* Use two single quotes in a row to produce a literal single quote. For example, * Use two single quotes in a row to produce a literal single quote. For example,
* {@code new ChoiceFormat("1# ''one'' ").format(1)} returns {@code " 'one' "}. * {@code new ChoiceFormat("1# ''one'' ").format(1)} returns {@code " 'one' "}.
* *
* @apiNote A subclass could perform more consistent pattern validation by
* throwing an {@code IllegalArgumentException} for all incorrect cases.
* @implNote Given an incorrect pattern, this implementation may either
* throw an exception or succeed and discard the incorrect portion. A {@code
* NumberFormatException} is thrown if a {@code limit} can not be
* parsed as a numeric value and an {@code IllegalArgumentException} is thrown
* if a {@code SubPattern} is missing, or the intervals are not ascending.
* Discarding the incorrect portion may result in a ChoiceFormat with
* empty {@code limits} and {@code formats}.
*
* <h2>Usage Information</h2> * <h2>Usage Information</h2>
* *
* <p> * <p>
@ -227,11 +237,12 @@ public class ChoiceFormat extends NumberFormat {
private static final long serialVersionUID = 1795184449645032964L; private static final long serialVersionUID = 1795184449645032964L;
/** /**
* Apply the given pattern to this ChoiceFormat object. The syntax * Apply the given pattern to this ChoiceFormat object. The syntax and error
* for the ChoiceFormat pattern can be seen in the {@linkplain ##patterns * related caveats for the ChoiceFormat pattern can be found in the
* Patterns} section. Unlike {@link #setChoices(double[], String[])} this * {@linkplain ##patterns Patterns} section. Unlike {@link #setChoices(double[],
* method will throw an {@code IllegalArgumentException} if the {@code * String[])}, this method will throw an {@code IllegalArgumentException} if
* limits} are not in ascending order. * the {@code limits} are not in ascending order.
*
* @param newPattern a pattern string * @param newPattern a pattern string
* @throws NullPointerException if {@code newPattern} * @throws NullPointerException if {@code newPattern}
* is {@code null} * is {@code null}
@ -399,9 +410,11 @@ public class ChoiceFormat extends NumberFormat {
/** /**
* Constructs a ChoiceFormat with limits and corresponding formats * Constructs a ChoiceFormat with limits and corresponding formats
* based on the pattern. * based on the pattern. The syntax and error related caveats for the
* The syntax for the ChoiceFormat pattern can be seen in the {@linkplain * ChoiceFormat pattern can be found in the {@linkplain ##patterns Patterns}
* ##patterns Patterns} section. * section. Unlike {@link #ChoiceFormat(double[], String[])}, this constructor will
* throw an {@code IllegalArgumentException} if the {@code limits} are not
* in ascending order.
* *
* @param newPattern the new pattern string * @param newPattern the new pattern string
* @throws NullPointerException if {@code newPattern} is * @throws NullPointerException if {@code newPattern} is