--- old/src/java.base/share/classes/java/util/Formatter.java 2017-05-03 14:00:47.729453369 -0700 +++ new/src/java.base/share/classes/java/util/Formatter.java 2017-05-03 14:00:47.597447660 -0700 @@ -290,12 +290,14 @@ *
* out.toUpperCase(Locale.getDefault(Locale.Category.FORMAT))* - *
Conversion * | Argument Category * | Description - * + * | ||
---|---|---|---|---|
{@code 'b'}, {@code 'B'} * | general * | If the argument arg is {@code null}, then the result is @@ -365,6 +367,7 @@ * | line separator * | The result is the platform-specific line separator * + * |
Any characters not explicitly defined as conversions are illegal and are @@ -381,8 +384,9 @@ * *
The following conversion characters are used for formatting times: * - *
{@code 'H'} * | Hour of the day for the 24-hour clock, formatted as two digits with * a leading zero as necessary i.e. {@code 00 - 23}. @@ -446,11 +450,14 @@ * 1970 {@code 00:00:00} UTC, i.e. {@code Long.MIN_VALUE} to * {@code Long.MAX_VALUE}. * + * |
The following conversion characters are used for formatting dates: * - *
{@code 'B'} * | Locale-specific {@linkplain java.text.DateFormatSymbols#getMonths @@ -502,12 +509,15 @@ * |
{@code 'e'} * | Day of month, formatted as two digits, i.e. {@code 1 - 31}. * + * |
The following conversion characters are used for formatting common * date/time compositions. * - *
{@code 'R'} * | Time formatted for the 24-hour clock as {@code "%tH:%tM"} @@ -530,7 +540,8 @@ * |
{@code 'c'} * | Date and time formatted as {@code "%ta %tb %td %tT %tZ %tY"}, * e.g. {@code "Sun Jul 20 16:17:00 EDT 1969"}. - * + * + * |
Any characters not explicitly defined as date/time conversion suffixes @@ -541,14 +552,16 @@ *
The following table summarizes the supported flags. y means the * flag is supported for the indicated argument types. * - *
Flag | General * | Character | Integral * | Floating Point * | Date/Time * | Description - * + * |
---|---|---|---|---|---|---|
'-' | y * | y * | y @@ -599,6 +612,7 @@ * | - * | The result will enclose negative numbers in parentheses * + * |
1 Depends on the definition of {@link Formattable}. @@ -705,7 +719,9 @@ * *
The following general conversions may be applied to any argument type: * - *
{@code 'b'} * | '\u0062'
@@ -756,11 +772,14 @@
* | '\u0053'
* | The upper-case variant of {@code 's'}. * + * |
The following flags apply to general conversions: * - *
{@code '-'} * | '\u002d'
@@ -775,6 +794,7 @@
* | Requires the output use an alternate form. The definition of the * form is specified by the conversion. * + * |
The width is the minimum number of characters to @@ -801,7 +821,9 @@ * {@code false} then an {@link IllegalFormatCodePointException} will be * thrown. * - *
{@code 'c'} * | '\u0063'
@@ -817,6 +839,7 @@
* | '\u0043'
* | The upper-case variant of {@code 'c'}. * + * |
The {@code '-'} flag defined for General @@ -902,7 +925,9 @@ * {@code short}, {@link Short}, {@code int} and {@link Integer}, * {@code long}, and {@link Long}. * - *
{@code 'd'} * | '\u0064'
@@ -968,6 +993,7 @@
* all hexadecimal digits {@code 'a'} - {@code 'f'}
* ('\u0061' - '\u0066' ).
*
+ * |
If the conversion is {@code 'o'}, {@code 'x'}, or {@code 'X'} and @@ -982,7 +1008,9 @@ *
The following flags apply to numeric integral * conversions: * - *
{@code '+'} * | '\u002b'
@@ -1025,6 +1053,7 @@
* ('\u0028' ) and append a {@code ')'}
* ('\u0029' ) to negative values.
*
+ * |
If no flags are given the default formatting is @@ -1060,7 +1089,9 @@ *
The following conversions may be applied to {@link * java.math.BigInteger}. * - *
{@code 'd'} * | '\u0064'
@@ -1125,6 +1156,7 @@
* all hexadecimal digits {@code 'a'} - {@code 'f'}
* ('\u0061' - '\u0066' ).
*
+ * |
If the conversion is {@code 'o'}, {@code 'x'}, or {@code 'X'} and @@ -1154,7 +1186,9 @@ *
The following conversions may be applied to {@code float}, {@link * Float}, {@code double} and {@link Double}. * - *
{@code 'e'} * | '\u0065'
@@ -1331,6 +1365,7 @@
* ('\u0070' and all hexadecimal digits {@code 'a'} -
* {@code 'f'} ('\u0061' - '\u0066' ).
*
+ * |
All flags defined for Byte, Short, Integer, and @@ -1388,7 +1423,9 @@ *
The following conversions may be applied {@link java.math.BigDecimal * BigDecimal}. * - *
{@code 'e'} * | '\u0065'
@@ -1492,6 +1529,7 @@
* For a canonical representation of the value, use {@link
* BigDecimal#toString()}.
*
+ * |
All flags defined for Byte, Short, Integer, and @@ -1512,7 +1550,9 @@ *
This conversion may be applied to {@code long}, {@link Long}, {@link * Calendar}, {@link Date} and {@link TemporalAccessor TemporalAccessor} * - *
{@code 't'} * | '\u0074'
@@ -1521,6 +1561,7 @@
* | '\u0054'
* | The upper-case variant of {@code 't'}. * + * |
The following date and time conversion character suffixes are defined @@ -1532,7 +1573,9 @@ * *
The following conversion characters are used for formatting times: * - *
{@code 'H'} * | '\u0048'
@@ -1620,11 +1663,14 @@
* {@code Long.MAX_VALUE}. The precision of this value is limited by
* the resolution of the underlying operating system or hardware.
*
+ * |
The following conversion characters are used for formatting dates: * - *
{@code 'B'} * | '\u0042'
@@ -1692,12 +1738,15 @@
* | Day of month, formatted as two digits, i.e. {@code 1 - 31} where * "{@code 1}" is the first day of the month. * + * |
The following conversion characters are used for formatting common * date/time compositions. * - *
{@code 'R'} * | '\u0052'
@@ -1727,6 +1776,7 @@
* | Date and time formatted as {@code "%ta %tb %td %tT %tZ %tY"}, * e.g. {@code "Sun Jul 20 16:17:00 EDT 1969"}. * + * |
The {@code '-'} flag defined for General
@@ -1748,7 +1798,9 @@
*
* The conversion does not correspond to any argument.
*
- *
{@code '%'} * | The result is a literal {@code '%'} ('\u0025' )
@@ -1767,18 +1819,22 @@
* The precision is not applicable. If the precision is specified an * {@link IllegalFormatPrecisionException} will be thrown. * + * |
The conversion does not correspond to any argument. * - *
{@code 'n'} * | the platform-specific line separator as returned by {@link * System#lineSeparator()}. * + * |
Flags, width, and precision are not applicable. If any are provided an